Merge pull request #4 from IvLabs/embeddings

Embeddings branch merge
IvLabs · Jan 15, 2022 · ffb5c09 · ffb5c09
2 parents c43a7d4 + b78b8c6
commit ffb5c09
Show file tree

Hide file tree

Showing 15 changed files with 986 additions and 1,520 deletions.
diff --git a/.gitignore b/.gitignore
@@ -6,10 +6,13 @@ weights/
 */*.pyc
 model/
 wandb/
-run1/
+protoruns/
 **/__pycache__/
+**/**/__pycache__/
 logs/
 *.npy
 centroids
 *.pyc
 model/
+OfficeHomeDataset_10072016.zip
+dalib/domainbed/__pycache__/*
diff --git a/OfficeHome_testrun/done b/OfficeHome_testrun/done
diff --git a/OfficeHome_testrun/err.txt b/OfficeHome_testrun/err.txt
diff --git a/OfficeHome_testrun/out.txt b/OfficeHome_testrun/out.txt
diff --git a/OfficeHome_testrun/proto_results.jsonl b/OfficeHome_testrun/proto_results.jsonl
diff --git a/OfficeHome_testrun/results.jsonl b/OfficeHome_testrun/results.jsonl
diff --git a/common/vision/datasets/officehome.py b/common/vision/datasets/officehome.py
@@ -51,9 +51,11 @@ class OfficeHome(ImageList):
                'Fan', 'Ruler', 'Pan', 'Screwdriver', 'Trash_Can', 'Printer', 'Speaker', 'Eraser', 'Bucket', 'Chair',
                'Calendar', 'Calculator', 'Flowers', 'Lamp_Shade', 'Spoon', 'Candles', 'Clipboards', 'Scissors', 'TV',
                'Curtains', 'Fork', 'Soda', 'Table', 'Knives', 'Oven', 'Refrigerator', 'Marker']
+    CLASSES = sorted(CLASSES)
 
     def __init__(self, root: str, task: str, download: Optional[bool] = False, **kwargs):
         assert task in self.image_list
+        self.domain_index = sorted(list(self.image_list.keys())).index(task)
         data_list_file = os.path.join(root, self.image_list[task])
 
         if download:

diff --git a/dalib/adaptation/degaa.py b/dalib/adaptation/degaa.py
@@ -98,7 +98,7 @@ def __init__(self, input_dim: int, num_classes: int, gnn_layers: int, num_heads:
 
     #self.final_proj = nn.Conv1d(self.input_dim, self.input_dim, kernel_size = 1, bias = True)
     self.final_proj = nn.Linear(self.input_dim, self.input_dim)
-    self.head = nn.Linear(self.input_dim, self.num_classes)
+    # self.head = nn.Linear(self.input_dim, self.num_classes)
 
   def forward(self, src, tgt):
     #src = data['source'].double()
@@ -107,7 +107,7 @@ def forward(self, src, tgt):
     src, tgt = self.gnn(src, tgt)
 
     m_src, m_tgt = self.final_proj(src), self.final_proj(tgt)
-    y_src, y_tgt = self.head(m_src), self.head(m_tgt)
+    # y_src, y_tgt = self.head(m_src), self.head(m_tgt)
 
-    return m_src, m_tgt, y_src, y_tgt # To classification head
+    return m_src, m_tgt#, y_src, y_tgt # To classification head