From ee4fba5e60174cec0e2da8b7b10e35ace69a79ec Mon Sep 17 00:00:00 2001 From: Vincent Moens Date: Tue, 13 Aug 2024 11:36:37 -0700 Subject: [PATCH 1/2] init --- .github/unittest/linux/scripts/environment.yml | 4 ++-- .github/unittest/linux/scripts/run_all.sh | 2 +- .github/unittest/linux_distributed/scripts/environment.yml | 4 ++-- .github/unittest/linux_examples/scripts/environment.yml | 4 ++-- .github/unittest/linux_libs/scripts_envpool/environment.yml | 4 ++-- .../unittest/linux_olddeps/scripts_gym_0_13/environment.yml | 2 +- .github/workflows/benchmarks.yml | 4 ++-- .github/workflows/benchmarks_pr.yml | 4 ++-- docs/requirements.txt | 4 ++-- 9 files changed, 16 insertions(+), 16 deletions(-) diff --git a/.github/unittest/linux/scripts/environment.yml b/.github/unittest/linux/scripts/environment.yml index 2dca2a6e9ad..2234683a497 100644 --- a/.github/unittest/linux/scripts/environment.yml +++ b/.github/unittest/linux/scripts/environment.yml @@ -24,8 +24,8 @@ dependencies: - tensorboard - imageio==2.26.0 - wandb - - dm_control<1.0.21 - - mujoco<3.2.1 + - dm_control + - mujoco - mlflow - av - coverage diff --git a/.github/unittest/linux/scripts/run_all.sh b/.github/unittest/linux/scripts/run_all.sh index 17a53648f8c..3257adf8c63 100755 --- a/.github/unittest/linux/scripts/run_all.sh +++ b/.github/unittest/linux/scripts/run_all.sh @@ -91,7 +91,7 @@ echo "installing gymnasium" pip3 install "gymnasium" pip3 install ale_py pip3 install mo-gymnasium[mujoco] # requires here bc needs mujoco-py -pip3 install "mujoco<3.2.1" -U +pip3 install "mujoco" -U # sanity check: remove? python3 -c """ diff --git a/.github/unittest/linux_distributed/scripts/environment.yml b/.github/unittest/linux_distributed/scripts/environment.yml index d7eabcdea4f..76160f7a16a 100644 --- a/.github/unittest/linux_distributed/scripts/environment.yml +++ b/.github/unittest/linux_distributed/scripts/environment.yml @@ -23,8 +23,8 @@ dependencies: - tensorboard - imageio==2.26.0 - wandb - - dm_control<1.0.21 - - mujoco<3.2.1 + - dm_control + - mujoco - mlflow - av - coverage diff --git a/.github/unittest/linux_examples/scripts/environment.yml b/.github/unittest/linux_examples/scripts/environment.yml index e99d6133963..f7dddbc5e3c 100644 --- a/.github/unittest/linux_examples/scripts/environment.yml +++ b/.github/unittest/linux_examples/scripts/environment.yml @@ -21,8 +21,8 @@ dependencies: - scipy - hydra-core - imageio==2.26.0 - - dm_control<1.0.21 - - mujoco<3.2.1 + - dm_control + - mujoco - mlflow - av - coverage diff --git a/.github/unittest/linux_libs/scripts_envpool/environment.yml b/.github/unittest/linux_libs/scripts_envpool/environment.yml index 9ff3396056b..74a3c91cf06 100644 --- a/.github/unittest/linux_libs/scripts_envpool/environment.yml +++ b/.github/unittest/linux_libs/scripts_envpool/environment.yml @@ -18,6 +18,6 @@ dependencies: - expecttest - pyyaml - scipy - - dm_control<1.0.21 - - mujoco<3.2.1 + - dm_control + - mujoco - coverage diff --git a/.github/unittest/linux_olddeps/scripts_gym_0_13/environment.yml b/.github/unittest/linux_olddeps/scripts_gym_0_13/environment.yml index ba8567450c9..06c4a112933 100644 --- a/.github/unittest/linux_olddeps/scripts_gym_0_13/environment.yml +++ b/.github/unittest/linux_olddeps/scripts_gym_0_13/environment.yml @@ -22,7 +22,7 @@ dependencies: - scipy - hydra-core - dm_control -e git+https://github.com/deepmind/dm_control.git@c053360edea6170acfd9c8f65446703307d9d352#egg={dm_control} - - mujoco<3.2.1 + - mujoco - patchelf - pyopengl==3.1.4 - ray diff --git a/.github/workflows/benchmarks.yml b/.github/workflows/benchmarks.yml index f698f67763f..4c557496cc0 100644 --- a/.github/workflows/benchmarks.yml +++ b/.github/workflows/benchmarks.yml @@ -35,7 +35,7 @@ jobs: python3 setup.py develop python3 -m pip install pytest pytest-benchmark python3 -m pip install "gym[accept-rom-license,atari]" - python3 -m pip install "dm_control<1.0.21" "mujoco<3.2.1" + python3 -m pip install "dm_control" "mujoco" export TD_GET_DEFAULTS_TO_NONE=1 - name: Run benchmarks run: | @@ -97,7 +97,7 @@ jobs: python3 setup.py develop python3 -m pip install pytest pytest-benchmark python3 -m pip install "gym[accept-rom-license,atari]" - python3 -m pip install "dm_control<1.0.21" "mujoco<3.2.1" + python3 -m pip install "dm_control" "mujoco" export TD_GET_DEFAULTS_TO_NONE=1 - name: check GPU presence run: | diff --git a/.github/workflows/benchmarks_pr.yml b/.github/workflows/benchmarks_pr.yml index 5bec0f23d1e..4896a5fab00 100644 --- a/.github/workflows/benchmarks_pr.yml +++ b/.github/workflows/benchmarks_pr.yml @@ -34,7 +34,7 @@ jobs: python3 setup.py develop python3 -m pip install pytest pytest-benchmark python3 -m pip install "gym[accept-rom-license,atari]" - python3 -m pip install "dm_control<1.0.21" "mujoco<3.2.1" + python3 -m pip install "dm_control" "mujoco" export TD_GET_DEFAULTS_TO_NONE=1 - name: Setup benchmarks run: | @@ -108,7 +108,7 @@ jobs: python3 setup.py develop python3 -m pip install pytest pytest-benchmark python3 -m pip install "gym[accept-rom-license,atari]" - python3 -m pip install "dm_control<1.0.21" "mujoco<3.2.1" + python3 -m pip install "dm_control" "mujoco" export TD_GET_DEFAULTS_TO_NONE=1 - name: check GPU presence run: | diff --git a/docs/requirements.txt b/docs/requirements.txt index 60c94749ee7..258cff086ed 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -14,8 +14,8 @@ docutils sphinx_design torchvision -dm_control<1.0.21 -mujoco<3.2.1 +dm_control +mujoco atari-py ale-py gym[classic_control,accept-rom-license] From 6bc10470e9587a61303b25f7a8177b0c57de6f35 Mon Sep 17 00:00:00 2001 From: Vincent Moens Date: Tue, 13 Aug 2024 12:54:18 -0700 Subject: [PATCH 2/2] amend --- sota-implementations/cql/cql_offline.py | 9 +++------ test/test_transforms.py | 13 +++++++------ 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/sota-implementations/cql/cql_offline.py b/sota-implementations/cql/cql_offline.py index 5ca70f83b53..73155d9fa1a 100644 --- a/sota-implementations/cql/cql_offline.py +++ b/sota-implementations/cql/cql_offline.py @@ -58,14 +58,14 @@ def main(cfg: "DictConfig"): # noqa: F821 device = "cpu" device = torch.device(device) + # Create replay buffer + replay_buffer = make_offline_replay_buffer(cfg.replay_buffer) + # Create env train_env, eval_env = make_environment( cfg, train_num_envs=1, eval_num_envs=cfg.logger.eval_envs, logger=logger ) - # Create replay buffer - replay_buffer = make_offline_replay_buffer(cfg.replay_buffer) - # Create agent model = make_cql_model(cfg, train_env, eval_env, device) del train_env @@ -107,9 +107,6 @@ def main(cfg: "DictConfig"): # noqa: F821 q_loss = q_loss + cql_loss - alpha_loss = loss_vals["loss_alpha"] - alpha_prime_loss = loss_vals["loss_alpha_prime"] - # update model alpha_loss = loss_vals["loss_alpha"] alpha_prime_loss = loss_vals["loss_alpha_prime"] diff --git a/test/test_transforms.py b/test/test_transforms.py index 60968ad0975..948e6db7f5c 100644 --- a/test/test_transforms.py +++ b/test/test_transforms.py @@ -10423,17 +10423,18 @@ def test_transform_no_env(self, batch): reason="EndOfLifeTransform can only be tested when Gym is present.", ) class TestEndOfLife(TransformBase): + pytest.mark.filterwarnings("ignore:The base_env is not a gym env") + def test_trans_parallel_env_check(self, maybe_fork_ParallelEnv): def make(): with set_gym_backend("gymnasium"): return GymEnv(BREAKOUT_VERSIONED()) - with pytest.warns(UserWarning, match="The base_env is not a gym env"): - with pytest.raises(AttributeError): - env = TransformedEnv( - maybe_fork_ParallelEnv(2, make), transform=EndOfLifeTransform() - ) - check_env_specs(env) + with pytest.raises(AttributeError): + env = TransformedEnv( + maybe_fork_ParallelEnv(2, make), transform=EndOfLifeTransform() + ) + check_env_specs(env) def test_trans_serial_env_check(self): def make():