rename some files in scripts/ (#589)

ronuchit · web-flow · commit 386077981a6b · 2022-03-14T11:37:54.000-04:00
* rename some files in scripts/

* a bunch more movement

* feedback
diff --git a/launch_slack_bot.py b/launch_slack_bot.py
@@ -14,7 +14,7 @@
 
 REPO_NAME = "Learning-and-Intelligent-Systems/predicators"
 ANALYSIS_CMD = "python scripts/analyze_results_directory.py"
-LAUNCH_CMD = "./scripts/run_supercloud_experiments.sh"
+LAUNCH_CMD = "./scripts/supercloud/run_nightly_experiments.sh"
 MAX_CHARS_PER_MESSAGE = 3500  # actual limit is 4000, but we keep a buffer
 GITHUB_SEARCH_RESPONSE_MAX_FILE_MATCHES = 3
 SUPERCLOUD_LOGIN_SERVER = "login-2"  # can also use login-3 or login-4
@@ -344,8 +344,8 @@ def _supercloud_get_message_chunks(self) -> List[str]:
     def _supercloud_get_filename(self) -> Optional[str]:
         if not self._generated_csv:
             return None
-        self._scp_filename("supercloud_analysis.csv")
-        return "supercloud_analysis.csv"
+        self._scp_filename("results_summary.csv")
+        return "results_summary.csv"
 
 
 def _get_response_object(query: str, inquirer: str) -> Response:
diff --git a/scripts/analyze_results_directory.py b/scripts/analyze_results_directory.py
@@ -157,8 +157,8 @@ def _main() -> None:
     pd.set_option("expand_frame_repr", False)
     print("\n\nAGGREGATED DATA OVER SEEDS:")
     print(means)
-    means.to_csv("supercloud_analysis.csv")
-    print("\n\nWrote out table to supercloud_analysis.csv")
+    means.to_csv("results_summary.csv")
+    print("\n\nWrote out table to results_summary.csv")
 
 
 if __name__ == "__main__":
diff --git a/scripts/supercloud/run_active_learning_baseline.sh b/scripts/supercloud/run_active_learning_baseline.sh
@@ -3,7 +3,7 @@
 START_SEED=456
 NUM_SEEDS=10
 CYCLES=100
-FILE="scripts/submit.py"
+FILE="scripts/supercloud/submit_supercloud_job.py"
 
 for SEED in $(seq $START_SEED $((NUM_SEEDS+START_SEED-1))); do
     python $FILE --env cover --approach interactive_learning --seed $SEED --excluded_predicates Covers --interactive_query_policy nonstrict_best_seen --interactive_score_function trivial --num_online_learning_cycles $CYCLES --max_initial_demos 1
diff --git a/scripts/supercloud/run_entropy_experiments.sh b/scripts/supercloud/run_entropy_experiments.sh
@@ -6,7 +6,7 @@ START_THRESH=0.1
 INCREMENT=0.1
 END_THRESH=0.9
 CYCLES=100
-FILE="scripts/submit.py"
+FILE="scripts/supercloud/submit_supercloud_job.py"
 
 # to find an appropriate threshold
 for SEED in $(seq $START_THRESH $((NUM_SEEDS+START_THRESH-1))); do
diff --git a/scripts/supercloud/run_nightly_experiments.sh b/scripts/supercloud/run_nightly_experiments.sh
@@ -2,7 +2,7 @@
 
 START_SEED=456
 NUM_SEEDS=10
-FILE="scripts/submit.py"
+FILE="scripts/supercloud/submit_supercloud_job.py"
 
 for SEED in $(seq $START_SEED $((NUM_SEEDS+START_SEED-1))); do
     # cover
diff --git a/scripts/supercloud/run_playroom_experiments.sh b/scripts/supercloud/run_playroom_experiments.sh
@@ -2,7 +2,7 @@
 
 START_SEED=456
 NUM_SEEDS=5
-FILE="scripts/submit.py"
+FILE="scripts/supercloud/submit_supercloud_job.py"
 MAX_RATIO=1.0
 MIN_RATIO=0.8
 INCREMENT=-0.1
diff --git a/scripts/supercloud/run_predicators_main_experiments.sh b/scripts/supercloud/run_predicators_main_experiments.sh
@@ -2,7 +2,7 @@
 
 START_SEED=456
 NUM_SEEDS=10
-FILE="scripts/submit.py"
+FILE="scripts/supercloud/submit_supercloud_job.py"
 NUM_TRAIN_TASKS="200"
 ALL_ENVS=(
     "cover"
diff --git a/scripts/supercloud/run_predicators_num_demos_experiments.sh b/scripts/supercloud/run_predicators_num_demos_experiments.sh
@@ -2,7 +2,7 @@
 
 START_SEED=456
 NUM_SEEDS=10
-FILE="scripts/submit.py"
+FILE="scripts/supercloud/submit_supercloud_job.py"
 ALL_NUM_TRAIN_TASKS=(
     "25"
     "50"
diff --git a/scripts/supercloud/run_score_function_experiments.sh b/scripts/supercloud/run_score_function_experiments.sh
@@ -3,7 +3,7 @@
 START_SEED=456
 NUM_SEEDS=10
 CYCLES=100
-FILE="scripts/submit.py"
+FILE="scripts/supercloud/submit_supercloud_job.py"
 
 for SEED in $(seq $START_SEED $((NUM_SEEDS+START_SEED-1))); do
     # section kid
diff --git a/scripts/supercloud/submit_supercloud_job.py b/scripts/supercloud/submit_supercloud_job.py
diff --git a/src/datasets/demo_only.py b/src/datasets/demo_only.py
@@ -48,8 +48,7 @@ def create_demo_data(env: BaseEnv, train_tasks: List[Task]) -> Dataset:
                 "Oracle failed on training task"
         except (ApproachTimeout, ApproachFailure, AssertionError) as e:
             # This should be extremely rare, so we only allow the script
-            # to continue on supercloud, when running batch experiments
-            # with scripts/submit.py.
+            # to continue on supercloud, when running batch experiments.
             logging.warning("WARNING: Approach failed to solve with error: "
                             f"{e}")
             if not os.getcwd().startswith("/home/gridsan"):
diff --git a/supercloud.md b/supercloud.md
@@ -59,7 +59,7 @@ Before running any experiments, it is good practice to make sure that you have a
 
 To run our default suite of experiments (will take many hours to complete, we recommend letting it run overnight):
 ```
-./scripts/run_supercloud_experiments.sh
+./scripts/supercloud/run_nightly_experiments.sh
 ```
 
 Upon running that script, you should see many printouts, such as:
