Fix ICLR2024 paths

ustunb · Jun 16, 2024 · e60d62b · e60d62b
1 parent 54b3640
commit e60d62b
Show file tree

Hide file tree

Showing 15 changed files with 17 additions and 30 deletions.
diff --git a/research/iclr2024/.gitignore b/research/iclr2024/.gitignore
@@ -0,0 +1 @@
+runs
diff --git a/research/iclr2024/README.md b/research/iclr2024/README.md
@@ -0,0 +1,4 @@
+Example run:
+```
+python scripts/run_experiment_pipeline.py --data_name=german --action_set=simple_1D
+```
diff --git a/research/iclr2024/scripts/compute_stats.py b/research/iclr2024/scripts/compute_stats.py
@@ -3,8 +3,6 @@
 import sys
 import psutil
 
-sys.path.append(os.path.join(os.getcwd(), "iclr2024"))
-
 import pandas as pd
 import argparse
 

diff --git a/research/iclr2024/scripts/generate_reachable_sets.py b/research/iclr2024/scripts/generate_reachable_sets.py
@@ -3,8 +3,6 @@
 import psutil
 import argparse
 
-sys.path.append(os.path.join(os.getcwd(), "iclr2024"))
-
 settings = {
     "data_name": "german",
     "action_set_name": "complex_1D",

diff --git a/research/iclr2024/scripts/get_model_stats.py b/research/iclr2024/scripts/get_model_stats.py
@@ -4,8 +4,6 @@
 import psutil
 import rich
 
-sys.path.append(os.path.join(os.getcwd(), "iclr2024"))
-
 import numpy as np
 import pandas as pd
 import argparse

diff --git a/research/iclr2024/scripts/merge_stats.py b/research/iclr2024/scripts/merge_stats.py
@@ -2,10 +2,8 @@
 import sys
 import itertools
 
-sys.path.append(os.path.join(os.getcwd(), "iclr2024"))
-
 import pandas as pd
-from iclr2024.src.paths import *
+from src.paths import *
 from src import fileutils
 from src.data import BinaryClassificationDataset
 

diff --git a/research/iclr2024/scripts/print_actionset.py b/research/iclr2024/scripts/print_actionset.py
@@ -3,7 +3,6 @@
 import psutil
 import argparse
 
-sys.path.append(os.path.join(os.getcwd(), "iclr2024"))
 from src.paths import *
 from src import fileutils
 from pathlib import Path

diff --git a/research/iclr2024/scripts/run_ar.py b/research/iclr2024/scripts/run_ar.py
@@ -8,15 +8,13 @@
 
 warnings.simplefilter(action="ignore", category=FutureWarning)
 
-sys.path.append(os.path.join(os.getcwd(), "iclr2024"))
-
 import numpy as np
 import pandas as pd
 from sklearn.preprocessing import StandardScaler
 import recourse as rs
 from tqdm.auto import tqdm
 
-from iclr2024.src.paths import *
+from src.paths import *
 from src import fileutils
 
 

diff --git a/research/iclr2024/scripts/run_dice.py b/research/iclr2024/scripts/run_dice.py
@@ -8,8 +8,6 @@
 
 warnings.simplefilter(action="ignore", category=UserWarning)
 
-sys.path.append(os.path.join(os.getcwd(), "iclr2024"))
-
 import numpy as np
 import pandas as pd
 from tqdm.auto import tqdm

diff --git a/research/iclr2024/scripts/run_experiment_pipeline.py b/research/iclr2024/scripts/run_experiment_pipeline.py
@@ -30,19 +30,19 @@ def main():
 
     pipeline = []
     if "setup" in args.stages:
-        pipeline.append(f"python iclr2024/scripts/setup_dataset_actionset_{args.data_name}.py")
-        #todo: pipeline.append(f"python scripts/setup_dataset_actionset_{args.data_name}.py")
+        pipeline.append(f"python scripts/setup_dataset_actionset_{args.data_name}.py")
+        # todo: pipeline.append(f"python scripts/setup_dataset_actionset_{args.data_name}.py")
 
     if "db" in args.stages:
         if args.action_set_name == GEN_DB_ACTION_SET:
             pipeline.append(
-                f"python iclr2024/scripts/generate_reachable_sets.py --data_name={args.data_name} --action_set_name={args.action_set_name} {'--overwrite' if args.overwrite else ''}"
+                f"python scripts/generate_reachable_sets.py --data_name={args.data_name} --action_set_name={args.action_set_name} {'--overwrite' if args.overwrite else ''}"
             )
 
     if "train" in args.stages:
         for model in args.models:
             pipeline.append(
-                f"python iclr2024/scripts/train_models.py --data_name={args.data_name} --action_set_name={args.action_set_name} --model_type={model}"
+                f"python scripts/train_models.py --data_name={args.data_name} --action_set_name={args.action_set_name} --model_type={model}"
             )
 
     if "baselines" in args.stages:
@@ -53,7 +53,7 @@ def main():
                     continue
                 else:
                     pipeline.append(
-                        f"python iclr2024/scripts/run_{method}.py --data_name={args.data_name} --action_set_name={args.action_set_name} --model_type={model}"
+                        f"python scripts/run_{method}.py --data_name={args.data_name} --action_set_name={args.action_set_name} --model_type={model}"
                     )
 
     if "audit" in args.stages:
@@ -62,7 +62,7 @@ def main():
                 continue
             else:
                 pipeline.append(
-                    f"python iclr2024/scripts/run_audit.py --data_name={args.data_name} --action_set_name={args.action_set_name} --model_type={model} --method_name={method}",
+                    f"python scripts/run_audit.py --data_name={args.data_name} --action_set_name={args.action_set_name} --model_type={model} --method_name={method}",
                 )
 
     if "stats" in args.stages:
@@ -71,7 +71,7 @@ def main():
                 continue
             else:
                 pipeline.append(
-                    f"python iclr2024/scripts/compute_stats.py --data_name={args.data_name} --action_set_name={args.action_set_name} --model_type={model} --method_name={method}",
+                    f"python scripts/compute_stats.py --data_name={args.data_name} --action_set_name={args.action_set_name} --model_type={model} --method_name={method}",
                 )
 
     # Run each command in the list

diff --git a/research/iclr2024/scripts/setup_dataset_actionset_fico.py b/research/iclr2024/scripts/setup_dataset_actionset_fico.py
@@ -1,8 +1,6 @@
 import os
 import sys
 
-sys.path.append(os.path.join(os.getcwd(), "iclr2024"))
-
 import pandas as pd
 import numpy as np
 import itertools

diff --git a/research/iclr2024/scripts/setup_dataset_actionset_german.py b/research/iclr2024/scripts/setup_dataset_actionset_german.py
@@ -1,7 +1,6 @@
 # fmt: off
 import os
 import sys
-sys.path.append(os.path.join(os.getcwd(), "iclr2024"))
 
 import numpy as np
 import pandas as pd
@@ -10,7 +9,7 @@
 pd.set_option('display.max_columns', 500)
 
 
-from iclr2024.src.paths import *
+from src.paths import *
 from src import fileutils
 from src.data import BinaryClassificationDataset
 from reachml import ActionSet, ReachableSetDatabase

diff --git a/research/iclr2024/scripts/setup_dataset_actionset_givemecredit.py b/research/iclr2024/scripts/setup_dataset_actionset_givemecredit.py
@@ -2,10 +2,9 @@
 import sys
 
 # fmt:off
-sys.path.append(os.path.join(os.getcwd(), "iclr2024"))
 import numpy as np
 import pandas as pd
-from iclr2024.src.paths import *
+from src.paths import *
 from src import fileutils
 from src.data import BinaryClassificationDataset
 from reachml import ActionSet, ReachableSetDatabase

diff --git a/research/iclr2024/scripts/train_models.py b/research/iclr2024/scripts/train_models.py
@@ -1,7 +1,6 @@
 import sys
 import os
 
-sys.path.append(os.path.join(os.getcwd(), "iclr2024"))
 import psutil
 import argparse
 from src import fileutils

diff --git a/research/iclr2024/src/paths.py b/research/iclr2024/src/paths.py
@@ -10,7 +10,7 @@
 # Directories
 
 # path to the GitHub repository
-paper_dir = Path(os.path.join(os.getcwd(), 'iclr2024')).resolve()
+paper_dir = Path(os.path.join(os.getcwd(), "")).resolve()
 repo_dir = Path(os.getcwd()).resolve()
 
 # directory where we store datasets