Merge branch 'python3.7' into disentangling_only_py3.7disentangling_only_py3.7

# Conflicts:
#	models/model.py
#	utils/configuration.py

2 files changed, 2 insertions, 73 deletions

diff --git a/utils/configuration.py b/utils/configuration.py
deleted file mode 100644
index 340815b..0000000
--- a/utils/configuration.py
+++ /dev/null
@@ -1,70 +0,0 @@
-from typing import TypedDict, Optional, Union, Tuple, Dict
-
-from utils.dataset import ClipClasses, ClipConditions, ClipViews
-
-
-class SystemConfiguration(TypedDict):
-    disable_acc: bool
-    CUDA_VISIBLE_DEVICES: str
-    save_dir: str
-    image_log_on: bool
-
-
-class DatasetConfiguration(TypedDict):
-    name: str
-    root_dir: str
-    train_size: int
-    num_sampled_frames: int
-    truncate_threshold: int
-    discard_threshold: int
-    selector: Optional[Dict[str, Union[ClipClasses, ClipConditions, ClipViews]]]
-    num_input_channels: int
-    frame_size: Tuple[int, int]
-    cache_on: bool
-
-
-class DataloaderConfiguration(TypedDict):
-    batch_size: Tuple[int, int]
-    num_workers: int
-    pin_memory: bool
-
-
-class ModelHPConfiguration(TypedDict):
-    ae_feature_channels: int
-    f_a_c_p_dims: tuple[int, int, int]
-
-
-class OptimizerHPConfiguration(TypedDict):
-    start_iter: int
-    lr: int
-    betas: Tuple[float, float]
-    eps: float
-    weight_decay: float
-    amsgrad: bool
-
-
-class SchedulerHPConfiguration(TypedDict):
-    step_size: int
-    gamma: float
-
-
-class HyperparameterConfiguration(TypedDict):
-    model: ModelHPConfiguration
-    optimizer: OptimizerHPConfiguration
-    scheduler: SchedulerHPConfiguration
-
-
-class ModelConfiguration(TypedDict):
-    name: str
-    restore_iter: int
-    total_iter: int
-    restore_iters: Tuple[int, ...]
-    total_iters: Tuple[int, ...]
-
-
-class Configuration(TypedDict):
-    system: SystemConfiguration
-    dataset: DatasetConfiguration
-    dataloader: DataloaderConfiguration
-    hyperparameter: HyperparameterConfiguration
-    model: ModelConfiguration
diff --git a/utils/misc.py b/utils/misc.py
index b850830..c047618 100644
--- a/utils/misc.py
+++ b/utils/misc.py
@@ -1,9 +1,8 @@
 import os
+from typing import Dict
 
-from utils.configuration import SystemConfiguration
 
-
-def set_visible_cuda(config: SystemConfiguration):
+def set_visible_cuda(config: Dict):
     """Set environment variable CUDA device(s)"""
     CUDA_VISIBLE_DEVICES = config.get('CUDA_VISIBLE_DEVICES', None)
     if CUDA_VISIBLE_DEVICES: