Merge branch 'main' of github.com:instadeepai/og-marl

README.md

@@ -129,25 +129,27 @@ We include the following datasets from prior works.
 | [Wang et al. (2023)](https://papers.nips.cc/paper_files/paper/2023/hash/a46c84276e3a4249ab7dbf3e069baf7f-Abstract-Conference.html) | 🔫SMAC v1 | 5m_vs_6m <br/> 6h_vs_8z <br/> 2c_vs_64zg <br/> corridor| [source](https://github.com/ZhengYinan-AIR/OMIGA) |
 | [Wang et al. (2023)](https://papers.nips.cc/paper_files/paper/2023/hash/a46c84276e3a4249ab7dbf3e069baf7f-Abstract-Conference.html) | 🐜MAMuJoCo | 6x1 HalfCheetah <br/> 3x1 Hopper <br/> 2x4 Ant| [source](https://github.com/ZhengYinan-AIR/OMIGA) |
 
-# Installing MAMuJoCo 🐆
+## Installing MAMuJoCo 🐆
 
 The OG-MARL datasets use the latest version of MuJoCo (210). While the OMIGA and OMAR datasets use an older version (200). They each have different instalation instructions and should be installed in seperate virtual environments.
 
 #### MAMuJoCo 210
 
 `bash install_environments/mujoco210.sh`
 
-`pip install -r install_environments/mujoco.txt`
+`pip install -r install_environments/requirements/mujoco.txt`
 
-`pip install -r install_environments/mamujoco210.txt`
+`pip install -r install_environments/requirements/mamujoco210.txt`
 
 #### MAMuJoCo 200
 
 `bash install_environments/mujoco200.sh`
 
-`pip install -r install_environments/mujoco.txt`
+`pip install -r install_environments/requirements/mujoco.txt`
 
-`pip install -r install_environments/mamujoco200.txt`
+`export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:~/.mujoco/mujoco200/bin`
+
+`pip install -r install_environments/requirements/mamujoco200.txt`
 
 
 ## See Also 🔎

og_marl/vault_utils/analyse_vault.py

@@ -12,15 +12,14 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from typing import Dict, List, Tuple
+from typing import Dict, List, Tuple, Optional
 
 import jax
 import jax.numpy as jnp
 import matplotlib.pyplot as plt
 import seaborn as sns
 from chex import Array
 from flashbax.vault import Vault
-from git import Optional
 import numpy as np
 from og_marl.vault_utils.download_vault import get_available_uids
 from tabulate import tabulate

og_marl/vault_utils/combine_vaults.py

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from git import Optional
+from typing import Optional
 
 import jax
 import pickle

og_marl/vault_utils/subsample_smaller.py

@@ -11,7 +11,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-from git import Optional
+from typing import Optional
 
 import jax
 import pickle