From 71cd97e8c9d65395f579c450cc3815f910efedff Mon Sep 17 00:00:00 2001 From: Matteo Bettini Date: Thu, 5 Dec 2024 10:38:46 -0800 Subject: [PATCH 1/3] ci --- docs/source/index.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/source/index.rst b/docs/source/index.rst index c6cefe5b..109661f3 100644 --- a/docs/source/index.rst +++ b/docs/source/index.rst @@ -38,6 +38,7 @@ Why would I BenchMARL 🤔? ^^^^^^^^^^^^^^^^^^^^^^^^^ Why would you BenchMARL, I see you ask. + Well, you can BenchMARL to compare different algorithms, environments, models, to check how your new research compares to existing ones, or if you just want to approach the domain and want to easily take a picture of the landscape. From 862fc6b7cb24c2e1d9e4721d1487d9522bae0c84 Mon Sep 17 00:00:00 2001 From: Matteo Bettini Date: Thu, 5 Dec 2024 10:41:04 -0800 Subject: [PATCH 2/3] ci --- docs/source/index.rst | 1 - test/test_magent.py | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/docs/source/index.rst b/docs/source/index.rst index 109661f3..c6cefe5b 100644 --- a/docs/source/index.rst +++ b/docs/source/index.rst @@ -38,7 +38,6 @@ Why would I BenchMARL 🤔? ^^^^^^^^^^^^^^^^^^^^^^^^^ Why would you BenchMARL, I see you ask. - Well, you can BenchMARL to compare different algorithms, environments, models, to check how your new research compares to existing ones, or if you just want to approach the domain and want to easily take a picture of the landscape. diff --git a/test/test_magent.py b/test/test_magent.py index 9be8240c..3db33220 100644 --- a/test/test_magent.py +++ b/test/test_magent.py @@ -113,7 +113,7 @@ def test_reloading_trainer( task=task.get_from_yaml(), ) - @pytest.mark.parametrize("algo_config", [QmixConfig, IppoConfig, MasacConfig]) + @pytest.mark.parametrize("algo_config", [QmixConfig, MasacConfig]) @pytest.mark.parametrize("task", [MAgentTask.ADVERSARIAL_PURSUIT]) @pytest.mark.parametrize("share_params", [True, False]) def test_share_policy_params( From 59b015292dff65584ac592f2d07d37c45a7d369a Mon Sep 17 00:00:00 2001 From: Matteo Bettini Date: Thu, 5 Dec 2024 11:14:54 -0800 Subject: [PATCH 3/3] ci --- .github/unittest/install_dependencies.sh | 2 +- .github/unittest/install_dependencies_nightly.sh | 2 +- docs/source/usage/installation.rst | 2 +- setup.py | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/unittest/install_dependencies.sh b/.github/unittest/install_dependencies.sh index aeef298d..581f0361 100644 --- a/.github/unittest/install_dependencies.sh +++ b/.github/unittest/install_dependencies.sh @@ -1,7 +1,7 @@ python -m pip install --upgrade pip -python -m pip install flake8 pytest pytest-cov hydra-core tqdm torch torch_geometric torchvision av +python -m pip install flake8 pytest pytest-cov hydra-core tqdm torch torch_geometric torchvision "av<14" if [ -f requirements.txt ]; then pip install -r requirements.txt; fi diff --git a/.github/unittest/install_dependencies_nightly.sh b/.github/unittest/install_dependencies_nightly.sh index bd71bb8d..c53a5f6c 100644 --- a/.github/unittest/install_dependencies_nightly.sh +++ b/.github/unittest/install_dependencies_nightly.sh @@ -5,7 +5,7 @@ python -m pip install flake8 pytest pytest-cov hydra-core tqdm torch_geometric if [ -f requirements.txt ]; then pip install -r requirements.txt; fi -python -m pip install torch torchvision av +python -m pip install torch torchvision "av<14" # Not using nightly torch # python -m pip install --pre torch --extra-index-url https://download.pytorch.org/whl/nightly/cpu --force-reinstall diff --git a/docs/source/usage/installation.rst b/docs/source/usage/installation.rst index 492b42ba..d9e6ff30 100644 --- a/docs/source/usage/installation.rst +++ b/docs/source/usage/installation.rst @@ -43,7 +43,7 @@ You may want to install the following rendering and logging tools .. code-block:: console - pip install wandb moviepy torchvision av + pip install wandb moviepy torchvision "av<14" Install environments -------------------- diff --git a/setup.py b/setup.py index d8c0c27c..1a5ff528 100644 --- a/setup.py +++ b/setup.py @@ -52,7 +52,7 @@ def get_version(): "pettingzoo": ["pettingzoo[all]>=1.24.3"], "meltingpot": ["dm-meltingpot"], "gnn": ["torch_geometric"], - "logging": ["moviepy", "wandb", "torchvision"], + "logging": ["moviepy", "wandb", "torchvision", "av<14"], }, packages=find_packages(), include_package_data=True,