Support Latest Pytorch (1.11)

corenel · Apr 12, 2022 · 0f98f5d · 0f98f5d
1 parent 96f2689
commit 0f98f5d
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 13 deletions.
diff --git a/core/adapt.py b/core/adapt.py
@@ -107,9 +107,9 @@ def train_tgt(src_encoder, tgt_encoder, critic,
                               params.num_epochs,
                               step + 1,
                               len_data_loader,
-                              loss_critic.data[0],
-                              loss_tgt.data[0],
-                              acc.data[0]))
+                              loss_critic.item(),
+                              loss_tgt.item(),
+                              acc.item()))
 
         #############################
         # 2.4 save model parameters #

diff --git a/core/pretrain.py b/core/pretrain.py
@@ -52,7 +52,7 @@ def train_src(encoder, classifier, data_loader):
                               params.num_epochs_pre,
                               step + 1,
                               len(data_loader),
-                              loss.data[0]))
+                              loss.item()))
 
         # eval model on test set
         if ((epoch + 1) % params.eval_step_pre == 0):
@@ -78,8 +78,8 @@ def eval_src(encoder, classifier, data_loader):
     classifier.eval()
 
     # init loss and accuracy
-    loss = 0
-    acc = 0
+    loss = 0.
+    acc = 0.
 
     # set loss function
     criterion = nn.CrossEntropyLoss()
@@ -90,7 +90,7 @@ def eval_src(encoder, classifier, data_loader):
         labels = make_variable(labels)
 
         preds = classifier(encoder(images))
-        loss += criterion(preds, labels).data[0]
+        loss += criterion(preds, labels).item()
 
         pred_cls = preds.data.max(1)[1]
         acc += pred_cls.eq(labels.data).cpu().sum()

diff --git a/core/test.py b/core/test.py
@@ -13,8 +13,8 @@ def eval_tgt(encoder, classifier, data_loader):
     classifier.eval()
 
     # init loss and accuracy
-    loss = 0
-    acc = 0
+    loss = 0.
+    acc = 0.
 
     # set loss function
     criterion = nn.CrossEntropyLoss()
@@ -25,7 +25,7 @@ def eval_tgt(encoder, classifier, data_loader):
         labels = make_variable(labels).squeeze_()
 
         preds = classifier(encoder(images))
-        loss += criterion(preds, labels).data[0]
+        loss += criterion(preds, labels).item()
 
         pred_cls = preds.data.max(1)[1]
         acc += pred_cls.eq(labels.data).cpu().sum()

diff --git a/params.py b/params.py
@@ -4,8 +4,8 @@
 data_root = "data"
 dataset_mean_value = 0.5
 dataset_std_value = 0.5
-dataset_mean = (dataset_mean_value, dataset_mean_value, dataset_mean_value)
-dataset_std = (dataset_std_value, dataset_std_value, dataset_std_value)
+dataset_mean = dataset_mean_value
+dataset_std = dataset_std_value
 batch_size = 50
 image_size = 64
 

diff --git a/utils.py b/utils.py
@@ -15,7 +15,7 @@ def make_variable(tensor, volatile=False):
     """Convert Tensor to Variable."""
     if torch.cuda.is_available():
         tensor = tensor.cuda()
-    return Variable(tensor, volatile=volatile)
+    return tensor
 
 
 def make_cuda(tensor):