Feature/resolve issues (#19)

* Resolve issues * Formatting * Resolve comments * Fix check
azoz01 · Dec 18, 2023 · 079d4c0 · 079d4c0
1 parent d70e2e6
commit 079d4c0
Show file tree

Hide file tree

Showing 22 changed files with 202 additions and 239 deletions.
diff --git a/.github/workflows/code_check.yml b/.github/workflows/code_check.yml
@@ -27,18 +27,12 @@ jobs:
       - name: Check black test code
         run: black test --line-length=100
 
-      - name: Check black bin code
-        run: black bin --line-length=100
-
       - name: Check flake8 source code
         run: flake8 liltab --max-line-length=100
 
       - name: Check flake8 test code
         run: flake8 test --max-line-length=100
 
-      - name: Check flake8 bin code
-        run: flake8 bin --max-line-length=100
-
       - name: Run test
         run: |
           export PYTHONPATH=`pwd`

diff --git a/README.md b/README.md
@@ -79,7 +79,7 @@ HeterogenousAttributesNetworkTrainer(
     gradient_clipping=False,
     learning_rate=1e-3,
     weight_decay=1e-4,
-    early_stopping=True,
+    early_stopping_intervals=100,
     file_logger=True,
     tb_logger=True,
     model_checkpoints=True,

diff --git a/bin/train.py b/bin/train.py
diff --git a/config/01_synthetic_data_experiment_config.yaml b/config/01_synthetic_data_experiment_config.yaml
@@ -4,7 +4,7 @@ learning_rate: 0.001
 weight_decay: 0
 batch_size: 256
 gradient_clipping: False
-early_stopping: True
+early_stopping_intervals: 100
 
 support_size: 5
 query_size: 27

diff --git a/config/02_openml_data_experiment_config.yaml b/config/02_openml_data_experiment_config.yaml
@@ -4,7 +4,7 @@ learning_rate: 0.001
 weight_decay: 0.0
 batch_size: 37
 gradient_clipping: False
-early_stopping: True
+early_stopping_intervals: 100
 
 support_size: 3
 query_size: 29

diff --git a/config/03_openml_clf_data_experiment_config.yaml b/config/03_openml_clf_data_experiment_config.yaml
@@ -4,7 +4,7 @@ learning_rate: 0.001
 weight_decay: 0
 batch_size: 37
 gradient_clipping: False
-early_stopping: True
+early_stopping_intervals: 100
 
 support_size: 3
 query_size: 29

diff --git a/config/04_same_domain_experiment_config.yaml b/config/04_same_domain_experiment_config.yaml
@@ -4,7 +4,7 @@ learning_rate: 0.001
 weight_decay: 0.0001
 batch_size: 37
 gradient_clipping: False
-early_stopping: True
+early_stopping_intervals: 100
 
 support_size: 3
 query_size: 29

diff --git a/config/05_new_classes_experiment_config.yaml b/config/05_new_classes_experiment_config.yaml
@@ -4,7 +4,7 @@ learning_rate: 0.0001
 weight_decay: 0
 batch_size: 16
 gradient_clipping: False
-early_stopping: True
+early_stopping_intervals: 100
 
 support_size: 3
 query_size: 29

diff --git a/config/06_big_data_experiment_config.yaml b/config/06_big_data_experiment_config.yaml
@@ -5,7 +5,7 @@ learning_rate: 0.001
 weight_decay: 0
 batch_size: 16
 gradient_clipping: False
-early_stopping: True
+early_stopping_intervals: 100
 
 support_size: 3
 query_size: 29

diff --git a/experiments/01_synthetic.py b/experiments/01_synthetic.py
@@ -71,7 +71,7 @@ def main():
         gradient_clipping=config["gradient_clipping"],
         learning_rate=config["learning_rate"],
         weight_decay=config["weight_decay"],
-        early_stopping=config["early_stopping"],
+        early_stopping_intervals=config["early_stopping_intervals"],
         file_logger=True,
         tb_logger=True,
         model_checkpoints=True,

diff --git a/experiments/02_openml.py b/experiments/02_openml.py
@@ -74,7 +74,7 @@ def main():
         gradient_clipping=config["gradient_clipping"],
         learning_rate=config["learning_rate"],
         weight_decay=config["weight_decay"],
-        early_stopping=config["early_stopping"],
+        early_stopping_intervals=config["early_stopping_intervals"],
         file_logger=True,
         tb_logger=True,
         model_checkpoints=True,

diff --git a/experiments/03_openml_clf.py b/experiments/03_openml_clf.py
@@ -34,7 +34,7 @@ def main():
     train_loader = ComposedDataLoaderFactory.create_composed_dataloader_from_path(
         Path(config["train_data_path"]),
         PandasDataset,
-        {"encode_categorical_target": True},
+        {"encode_categorical_response": True},
         FewShotDataLoader,
         {"support_size": config["support_size"], "query_size": config["query_size"]},
         ComposedDataLoader,
@@ -43,7 +43,7 @@ def main():
     val_loader = ComposedDataLoaderFactory.create_composed_dataloader_from_path(
         Path(config["val_data_path"]),
         PandasDataset,
-        {"encode_categorical_target": True},
+        {"encode_categorical_response": True},
         FewShotDataLoader,
         {"support_size": config["support_size"], "query_size": config["query_size"]},
         RepeatableOutputComposedDataLoader,
@@ -52,7 +52,7 @@ def main():
     test_loader = ComposedDataLoaderFactory.create_composed_dataloader_from_path(
         Path(config["test_data_path"]),
         PandasDataset,
-        {"encode_categorical_target": True},
+        {"encode_categorical_response": True},
         FewShotDataLoader,
         {"support_size": config["support_size"], "query_size": config["query_size"]},
         RepeatableOutputComposedDataLoader,
@@ -75,7 +75,7 @@ def main():
         gradient_clipping=config["gradient_clipping"],
         learning_rate=config["learning_rate"],
         weight_decay=config["weight_decay"],
-        early_stopping=config["early_stopping"],
+        early_stopping_intervals=config["early_stopping_intervals"],
         loss=nn.CrossEntropyLoss(),
         file_logger=True,
         tb_logger=True,

diff --git a/experiments/04_same_domain.py b/experiments/04_same_domain.py
@@ -30,7 +30,7 @@ def main():
     train_loader = ComposedDataLoaderFactory.create_composed_dataloader_from_path(
         Path(config["train_data_path"]),
         PandasDataset,
-        {"encode_categorical_target": True},
+        {"encode_categorical_response": True},
         FewShotDataLoader,
         {"support_size": config["support_size"], "query_size": config["query_size"]},
         ComposedDataLoader,
@@ -39,7 +39,7 @@ def main():
     val_loader = ComposedDataLoaderFactory.create_composed_dataloader_from_path(
         Path(config["val_data_path"]),
         PandasDataset,
-        {"encode_categorical_target": True},
+        {"encode_categorical_response": True},
         FewShotDataLoader,
         {"support_size": config["support_size"], "query_size": config["query_size"]},
         RepeatableOutputComposedDataLoader,
@@ -48,7 +48,7 @@ def main():
     test_loader = ComposedDataLoaderFactory.create_composed_dataloader_from_path(
         Path(config["test_data_path"]),
         PandasDataset,
-        {"encode_categorical_target": True},
+        {"encode_categorical_response": True},
         FewShotDataLoader,
         {"support_size": config["support_size"], "query_size": config["query_size"]},
         RepeatableOutputComposedDataLoader,
@@ -71,7 +71,7 @@ def main():
         gradient_clipping=config["gradient_clipping"],
         learning_rate=config["learning_rate"],
         weight_decay=config["weight_decay"],
-        early_stopping=config["early_stopping"],
+        early_stopping_intervals=config["early_stopping_intervals"],
         file_logger=True,
         tb_logger=True,
         model_checkpoints=True,

diff --git a/experiments/05_new_classes.py b/experiments/05_new_classes.py
@@ -31,7 +31,7 @@ def main():
     train_loader = ComposedDataLoaderFactory.create_composed_dataloader_from_path(
         Path(config["train_data_path"]),
         PandasDataset,
-        {"encode_categorical_target": True},
+        {"encode_categorical_response": True},
         FewShotDataLoader,
         {"support_size": config["support_size"], "query_size": config["query_size"]},
         ComposedDataLoader,
@@ -40,7 +40,7 @@ def main():
     val_loader = ComposedDataLoaderFactory.create_composed_dataloader_from_path(
         Path(config["val_data_path"]),
         PandasDataset,
-        {"encode_categorical_target": True},
+        {"encode_categorical_response": True},
         FewShotDataLoader,
         {"support_size": config["support_size"], "query_size": config["query_size"]},
         RepeatableOutputComposedDataLoader,
@@ -49,7 +49,7 @@ def main():
     test_loader = ComposedDataLoaderFactory.create_composed_dataloader_from_path(
         Path(config["test_data_path"]),
         PandasDataset,
-        {"encode_categorical_target": True},
+        {"encode_categorical_response": True},
         FewShotDataLoader,
         {"support_size": config["support_size"], "query_size": config["query_size"]},
         RepeatableOutputComposedDataLoader,
@@ -72,7 +72,7 @@ def main():
         gradient_clipping=config["gradient_clipping"],
         learning_rate=config["learning_rate"],
         weight_decay=config["weight_decay"],
-        early_stopping=config["early_stopping"],
+        early_stopping_intervals=config["early_stopping_intervals"],
         loss=nn.CrossEntropyLoss(),
         file_logger=True,
         tb_logger=True,

diff --git a/experiments/06_big_data.py b/experiments/06_big_data.py
@@ -31,7 +31,7 @@ def main():
     train_loader = ComposedDataLoaderFactory.create_composed_dataloader_from_path(
         Path(config["train_data_path"]),
         PandasDataset,
-        {"encode_categorical_target": True},
+        {"encode_categorical_response": True},
         FewShotDataLoader,
         {"support_size": config["support_size"], "query_size": config["query_size"]},
         ComposedDataLoader,
@@ -40,7 +40,7 @@ def main():
     val_loader = ComposedDataLoaderFactory.create_composed_dataloader_from_path(
         Path(config["val_data_path"]),
         PandasDataset,
-        {"encode_categorical_target": True},
+        {"encode_categorical_response": True},
         FewShotDataLoader,
         {"support_size": config["support_size"], "query_size": config["query_size"]},
         RepeatableOutputComposedDataLoader,
@@ -49,7 +49,7 @@ def main():
     test_loader = ComposedDataLoaderFactory.create_composed_dataloader_from_path(
         Path(config["test_data_path"]),
         PandasDataset,
-        {"encode_categorical_target": True},
+        {"encode_categorical_response": True},
         FewShotDataLoader,
         {"support_size": config["support_size"], "query_size": config["query_size"]},
         RepeatableOutputComposedDataLoader,
@@ -72,7 +72,7 @@ def main():
         gradient_clipping=config["gradient_clipping"],
         learning_rate=config["learning_rate"],
         weight_decay=config["weight_decay"],
-        early_stopping=config["early_stopping"],
+        early_stopping_intervals=config["early_stopping_intervals"],
         loss=nn.CrossEntropyLoss(),
         file_logger=True,
         tb_logger=True,