Added fixes to systems to work with new vault directory struct.

instadeepai · Aug 23, 2024 · b72435f · b72435f
1 parent be0a652
commit b72435f
Show file tree

Hide file tree

Showing 36 changed files with 77 additions and 403 deletions.
diff --git a/examples/download_dataset.py b/examples/download_dataset.py
@@ -16,13 +16,14 @@
 from og_marl.vault_utils.download_vault import download_and_unzip_vault
 
 FLAGS = flags.FLAGS
+flags.DEFINE_string("dataset_source", "og_marl", "Source of dataset.")
 flags.DEFINE_string("env_name", "smac_v1", "Environment name.")
 flags.DEFINE_string("scenario_name", "3m", "Environment scenario name.")
 
 
 def main(_):
     # Download vault
-    download_and_unzip_vault(FLAGS.daset_source, FLAGS.env, FLAGS.scenario)
+    download_and_unzip_vault(FLAGS.dataset_source, FLAGS.env_name, FLAGS.scenario_name)
 
     # NEXT STEPS: See `examples/dataset_api_demo.ipynb`
 

diff --git a/examples/jax/main.py b/examples/jax/main.py
diff --git a/examples/plot_marl_eval.py b/examples/plot_marl_eval.py
diff --git a/examples/tf2/online/iddpg_mamujoco.py b/examples/tf2/online/iddpg_mamujoco.py
diff --git a/examples/tf2/online/idrqn_smacv1.py b/examples/tf2/online/idrqn_smacv1.py
diff --git a/examples/tf2/online/idrqn_smax.py b/examples/tf2/online/idrqn_smax.py
diff --git a/examples/tf2/online/qmix_pursuit.py b/examples/tf2/online/qmix_pursuit.py
diff --git a/examples/tf2/online/qmix_smacv1.py b/examples/tf2/online/qmix_smacv1.py
diff --git a/examples/tf2/online/qmix_smacv2.py b/examples/tf2/online/qmix_smacv2.py
diff --git a/examples/tf2/run_all_baselines.py b/examples/tf2/run_all_baselines.py
diff --git a/install_environments/mamujoco.sh → install_environments/mujoco210.sh b/install_environments/mamujoco.sh → install_environments/mujoco210.sh
@@ -10,11 +10,8 @@ mkdir -p $MUJOCOPATH \
     && tar -xf mujoco.tar.gz -C $MUJOCOPATH \
     && rm mujoco.tar.gz
 
-# Install MA Mujoco
-pip install -r install_environments/requirements/mamujoco.txt
-
 # IMPORTANT!!!!
 # You will need to set these environment variables every time you start a new terminal
 # or add them to your .bashrc file
-# export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/lib/x86_64-linux-gnu/:$MUJOCOPATH/mujoco210/bin:/usr/lib/nvidia
-# export LD_PRELOAD=$LD_PRELOAD:/usr/lib/x86_64-linux-gnu/libGLEW.so
+export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/lib/x86_64-linux-gnu/:$MUJOCOPATH/mujoco210/bin:/usr/lib/nvidia
+export LD_PRELOAD=$LD_PRELOAD:/usr/lib/x86_64-linux-gnu/libGLEW.so