From d30cf2cb280e83e4a4abe1e9c2abdbba17d903a3 Mon Sep 17 00:00:00 2001
From: Jordan Gong <jordan.gong@protonmail.com>
Date: Sun, 10 Jan 2021 19:54:42 +0800
Subject: Make predict function transform samples different conditions in a
 single shot

---
 train.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'train.py')

diff --git a/train.py b/train.py
index d921839..cdb2fb0 100644
--- a/train.py
+++ b/train.py
@@ -12,12 +12,12 @@ if CUDA_VISIBLE_DEVICES:
 model = Model(config['system'], config['model'], config['hyperparameter'])
 
 # 3 models for different conditions
-dataset_selectors = [
-    {'conditions': ClipConditions({r'nm-0\d'})},
-    {'conditions': ClipConditions({r'nm-0\d', r'bg-0\d'})},
-    {'conditions': ClipConditions({r'nm-0\d', r'cl-0\d'})},
-]
-for selector in dataset_selectors:
+dataset_selectors = {
+    'nm': {'conditions': ClipConditions({r'nm-0\d'})},
+    'bg': {'conditions': ClipConditions({r'nm-0\d', r'bg-0\d'})},
+    'cl': {'conditions': ClipConditions({r'nm-0\d', r'cl-0\d'})},
+}
+for selector in dataset_selectors.values():
     model.fit(
         dict(**config['dataset'], **{'selector': selector}),
         config['dataloader']
-- 
cgit v1.2.3


From 72a53806746bc7ffa2f3939721e34b5cfdb7330a Mon Sep 17 00:00:00 2001
From: Jordan Gong <jordan.gong@protonmail.com>
Date: Mon, 11 Jan 2021 23:59:30 +0800
Subject: Add evaluation script, code review and fix some bugs

1. Add new `train_all` method for one shot calling
2. Print time used in 1k iterations
3. Correct label dimension in predict function
4. Transpose distance matrix for convenient indexing
5. Sort dictionary before generate signature
6. Extract visible CUDA setting function
---
 train.py | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

(limited to 'train.py')

diff --git a/train.py b/train.py
index cdb2fb0..d91dcd0 100644
--- a/train.py
+++ b/train.py
@@ -1,14 +1,9 @@
-import os
-
 from config import config
 from models import Model
 from utils.dataset import ClipConditions
+from utils.misc import set_visible_cuda
 
-# Set environment variable CUDA device(s)
-CUDA_VISIBLE_DEVICES = config['system'].get('CUDA_VISIBLE_DEVICES', None)
-if CUDA_VISIBLE_DEVICES:
-    os.environ['CUDA_VISIBLE_DEVICES'] = CUDA_VISIBLE_DEVICES
-
+set_visible_cuda(config['system'])
 model = Model(config['system'], config['model'], config['hyperparameter'])
 
 # 3 models for different conditions
@@ -17,8 +12,5 @@ dataset_selectors = {
     'bg': {'conditions': ClipConditions({r'nm-0\d', r'bg-0\d'})},
     'cl': {'conditions': ClipConditions({r'nm-0\d', r'cl-0\d'})},
 }
-for selector in dataset_selectors.values():
-    model.fit(
-        dict(**config['dataset'], **{'selector': selector}),
-        config['dataloader']
-    )
+
+model.fit_all(config['dataset'], dataset_selectors, config['dataloader'])
-- 
cgit v1.2.3