better visualization

saeid93 · May 13, 2023 · 0c4fcb0 · 0c4fcb0
1 parent dd831d0
commit 0c4fcb0
Show file tree

Hide file tree

Showing 14 changed files with 105 additions and 77 deletions.
diff --git a/experiments/analysis/analysis_test.ipynb b/experiments/analysis/analysis_test.ipynb
diff --git a/experiments/analysis/analysis_train.ipynb b/experiments/analysis/analysis_train.ipynb
diff --git a/experiments/analysis/check_env.py b/experiments/analysis/check_env.py
@@ -104,15 +104,9 @@ def check_env(*, config: Dict[str, Any], type_env: str,
               type=click.Choice(['sim-scheduler', 'sim-binpacking',
                                  'kube-scheduler', 'kube-binpacking',
                                  'CartPole-v0', 'Pendulum-v0']),
-<<<<<<< HEAD
               default='sim-scheduler')
 @click.option('--cluster-id', required=True, type=int, default=21)
 @click.option('--workload-id', required=True, type=int, default=2)
-=======
-              default='kube-scheduler')
-@click.option('--cluster-id', required=True, type=int, default=23)
-@click.option('--workload-id', required=True, type=int, default=0)
->>>>>>> 62114a178315d4000d53500c7103dac6fdf52cc4
 def main(type_env: str, cluster_id: int, workload_id: int):
     """[summary]
 

diff --git a/experiments/analysis/episode_reward_mean.pdf b/experiments/analysis/episode_reward_mean.pdf
diff --git a/experiments/analysis/num_consolidation.pdf b/experiments/analysis/num_consolidation.pdf
diff --git a/experiments/analysis/reward_consolidation.pdf b/experiments/analysis/reward_consolidation.pdf
diff --git a/experiments/analysis/reward_g.pdf b/experiments/analysis/reward_g.pdf
diff --git a/experiments/analysis/test-average-consolidation.pdf b/experiments/analysis/test-average-consolidation.pdf
diff --git a/experiments/analysis/test-average-g.pdf b/experiments/analysis/test-average-g.pdf
diff --git a/experiments/analysis/utilization.pdf b/experiments/analysis/utilization.pdf
diff --git a/experiments/utils/__init__.py b/experiments/utils/__init__.py
@@ -1,8 +1,9 @@
 from .path_finder import add_path_to_config
 from .printers import action_pretty_print
 from .class_builders import make_env_class
-from .callbacks import CloudCallback
-from .callbacks_update import CloudCallbackUpdate
+# TEMP
+# from .callbacks import CloudCallback
+# from .callbacks_update import CloudCallbackUpdate
 from .check_configs import (
     config_check_env_check,
     config_cluster_generation_check,

diff --git a/experiments/utils/callbacks.py b/experiments/utils/callbacks.py
@@ -7,10 +7,10 @@
     from ray.rllib.algorithms.callbacks import DefaultCallbacks
 else:
     from ray.rllib.algorithms.callbacks import DefaultCallbacks
-from ray.rllib.env import BaseEnv
+# from ray.rllib.env import BaseEnv
 from typing import Dict, Optional, TYPE_CHECKING
 
-from ray.rllib.env import BaseEnv
+# from ray.rllib.env import BaseEnv
 from ray.rllib.policy import Policy
 from ray.rllib.policy.sample_batch import SampleBatch
 from ray.rllib.evaluation import MultiAgentEpisode, RolloutWorker

diff --git a/experiments/utils/constants.py b/experiments/utils/constants.py
@@ -4,8 +4,8 @@
     KubeSchedulerEnv,
 )
 # dfined by the user
-# DATA_PATH = "/homes/sg324/smart-scheduler/data/"
-DATA_PATH = "/home/user/smart-scheduler/data"
+DATA_PATH = "/homes/sg324/smart-scheduler/data/"
+# DATA_PATH = "/home/user/smart-scheduler/data"
 
 # generated baesd on the users' path
 CLUSTERS_PATH = os.path.join(DATA_PATH, "clusters")
@@ -35,7 +35,7 @@ def _create_dirs():
     if not os.path.exists(PLOTS_PATH):
         os.makedirs(PLOTS_PATH)
 
-_create_dirs()
+# _create_dirs()
 
 ENVS = {
     'sim-scheduler': SimSchedulerEnv,

diff --git a/requirements.txt b/requirements.txt
@@ -14,4 +14,4 @@ colorama==0.4.4
 wget
 ipykernel
 ray
-ray[rllib]
+ray[rllib]==1.8.0