Rename package

PTG-Kitware · Sep 19, 2023 · a733f91 · a733f91
1 parent 6aa4e73
commit a733f91
Show file tree

Hide file tree

Showing 23 changed files with 6 additions and 2 deletions.
diff --git a/src/__init__.py → tcn_hpl/__init__.py b/src/__init__.py → tcn_hpl/__init__.py
diff --git a/src/data/__init__.py → tcn_hpl/data/__init__.py b/src/data/__init__.py → tcn_hpl/data/__init__.py
diff --git a/src/data/components/PTG_dataset.py → tcn_hpl/data/components/PTG_dataset.py b/src/data/components/PTG_dataset.py → tcn_hpl/data/components/PTG_dataset.py
diff --git a/src/data/components/__init__.py → tcn_hpl/data/components/__init__.py b/src/data/components/__init__.py → tcn_hpl/data/components/__init__.py
diff --git a/src/data/components/augmentations.py → tcn_hpl/data/components/augmentations.py b/src/data/components/augmentations.py → tcn_hpl/data/components/augmentations.py
diff --git a/src/data/mnist_datamodule.py → tcn_hpl/data/mnist_datamodule.py b/src/data/mnist_datamodule.py → tcn_hpl/data/mnist_datamodule.py
diff --git a/src/data/ptg_datamodule.py → tcn_hpl/data/ptg_datamodule.py b/src/data/ptg_datamodule.py → tcn_hpl/data/ptg_datamodule.py
diff --git a/src/data/utils/ptg_datagenerator.py → tcn_hpl/data/utils/ptg_datagenerator.py b/src/data/utils/ptg_datagenerator.py → tcn_hpl/data/utils/ptg_datagenerator.py
@@ -43,12 +43,12 @@
     "test": [f"all_activities_{x}" for x in [20, 33, 39, 50, 51, 52, 53, 54]],
 }  # Coffee specific
 
-feat_version = 2
+feat_version = 4
 
 #####################
 # Output
 #####################
-exp_name = f"coffee_conf_10_all_hands_feat_v{str(feat_version)}_fixed"
+exp_name = f"coffee_conf_10_all_hands_feat_v{str(feat_version)}"
 output_data_dir = f"{data_dir}/TCN_data/{exp_name}"
 if not os.path.exists(output_data_dir):
     os.makedirs(output_data_dir)

diff --git a/src/eval.py → tcn_hpl/eval.py b/src/eval.py → tcn_hpl/eval.py
diff --git a/src/models/__init__.py → tcn_hpl/models/__init__.py b/src/models/__init__.py → tcn_hpl/models/__init__.py
diff --git a/src/models/components/__init__.py → tcn_hpl/models/components/__init__.py b/src/models/components/__init__.py → tcn_hpl/models/components/__init__.py
diff --git a/src/models/components/focal_loss.py → tcn_hpl/models/components/focal_loss.py b/src/models/components/focal_loss.py → tcn_hpl/models/components/focal_loss.py
diff --git a/src/models/components/ms_tcs_net.py → tcn_hpl/models/components/ms_tcs_net.py b/src/models/components/ms_tcs_net.py → tcn_hpl/models/components/ms_tcs_net.py
diff --git a/src/models/components/simple_dense_net.py → ...hpl/models/components/simple_dense_net.py b/src/models/components/simple_dense_net.py → ...hpl/models/components/simple_dense_net.py
diff --git a/src/models/mnist_module.py → tcn_hpl/models/mnist_module.py b/src/models/mnist_module.py → tcn_hpl/models/mnist_module.py
diff --git a/src/models/ptg_module.py → tcn_hpl/models/ptg_module.py b/src/models/ptg_module.py → tcn_hpl/models/ptg_module.py
@@ -247,6 +247,8 @@ def on_validation_epoch_end(self) -> None:
 
         self.logger.experiment.track(Image(fig), name=f'CM Validation Epoch')
 
+        plt.close(fig)
+
         self.validation_step_outputs_target.clear()
         self.validation_step_outputs_pred.clear()
 
@@ -296,6 +298,8 @@ def on_test_epoch_end(self) -> None:
 
         self.logger.experiment.track(Image(fig), name=f'CM Test Epoch')
 
+        plt.close(fig)
+
         self.validation_step_outputs_target.clear()
         self.validation_step_outputs_pred.clear()
 

diff --git a/src/train.py → tcn_hpl/train.py b/src/train.py → tcn_hpl/train.py
diff --git a/src/utils/__init__.py → tcn_hpl/utils/__init__.py b/src/utils/__init__.py → tcn_hpl/utils/__init__.py
diff --git a/src/utils/instantiators.py → tcn_hpl/utils/instantiators.py b/src/utils/instantiators.py → tcn_hpl/utils/instantiators.py
diff --git a/src/utils/logging_utils.py → tcn_hpl/utils/logging_utils.py b/src/utils/logging_utils.py → tcn_hpl/utils/logging_utils.py
diff --git a/src/utils/pylogger.py → tcn_hpl/utils/pylogger.py b/src/utils/pylogger.py → tcn_hpl/utils/pylogger.py
diff --git a/src/utils/rich_utils.py → tcn_hpl/utils/rich_utils.py b/src/utils/rich_utils.py → tcn_hpl/utils/rich_utils.py
diff --git a/src/utils/utils.py → tcn_hpl/utils/utils.py b/src/utils/utils.py → tcn_hpl/utils/utils.py