From dcdfcf04ebc1e1100a622073e59d2c3a4ead0b84 Mon Sep 17 00:00:00 2001
From: dlpbc <17943860+dlpbc@users.noreply.github.com>
Date: Wed, 20 Jul 2022 13:04:20 +0100
Subject: [PATCH 1/2] added support for metaworld v2 environment. replaced the
original v1 environments with v2 environments.
also updated the installation process in README.md
---
README.md | 5 +++--
continualworld/tasks.py | 20 ++++++++++----------
setup.py | 5 +++--
3 files changed, 16 insertions(+), 14 deletions(-)
diff --git a/README.md b/README.md
index d505528..2849eb0 100644
--- a/README.md
+++ b/README.md
@@ -22,8 +22,9 @@ You can either install directly in Python environment
First, you'll need [MuJoCo](http://www.mujoco.org/) simulator. Please follow
the [instructions](https://github.com/openai/mujoco-py#install-mujoco)
-from `mujoco_py` package. As MuJoCo has been made freely available, you can obtain a free
-license [here](https://www.roboti.us/license.html).
+from `mujoco_py` package. As MuJoCo has been made freely available, you can obtain a free
+license [here](https://www.roboti.us/license.html). No need for a license from mujoco210
+and above.
Next, go to the main directory of this repo and run
diff --git a/continualworld/tasks.py b/continualworld/tasks.py
index 9a34208..b7ad279 100644
--- a/continualworld/tasks.py
+++ b/continualworld/tasks.py
@@ -1,15 +1,15 @@
TASK_SEQS = {
"CW10": [
- "hammer-v1",
- "push-wall-v1",
- "faucet-close-v1",
- "push-back-v1",
- "stick-pull-v1",
- "handle-press-side-v1",
- "push-v1",
- "shelf-place-v1",
- "window-close-v1",
- "peg-unplug-side-v1",
+ "hammer-v2",
+ "push-wall-v2",
+ "faucet-close-v2",
+ "push-back-v2",
+ "stick-pull-v2",
+ "handle-press-side-v2",
+ "push-v2",
+ "shelf-place-v2",
+ "window-close-v2",
+ "peg-unplug-side-v2",
],
}
diff --git a/setup.py b/setup.py
index 1257059..cae2da4 100644
--- a/setup.py
+++ b/setup.py
@@ -3,8 +3,8 @@
# Required dependencies
required = [
"tensorflow>=2.0",
- "mujoco-py<2.1,>=2.0",
- "metaworld @ git+https://github.com/rlworkgroup/metaworld.git@0875192baaa91c43523708f55866d98eaf3facaf#egg=metaworld",
+ "mujoco-py<2.2,>=2.1",
+ "metaworld @ git+https://github.com/rlworkgroup/metaworld.git@18118a28c06893da0f363786696cc792457b062b#egg=metaworld",
"pandas",
"matplotlib",
"seaborn",
@@ -16,4 +16,5 @@
packages=find_packages(),
include_package_data=True,
install_requires=required,
+ version='0.0.1',
)
From be20661af0af1731ca3906f3885a913622ac7621 Mon Sep 17 00:00:00 2001
From: dlpbc <17943860+dlpbc@users.noreply.github.com>
Date: Wed, 20 Jul 2022 13:08:07 +0100
Subject: [PATCH 2/2] On branch v2_env_support Your branch is up to date with
'origin/v2_env_support'.
Changes to be committed:
modified: README.md
---
README.md | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/README.md b/README.md
index 2849eb0..4f867ee 100644
--- a/README.md
+++ b/README.md
@@ -22,8 +22,8 @@ You can either install directly in Python environment
First, you'll need [MuJoCo](http://www.mujoco.org/) simulator. Please follow
the [instructions](https://github.com/openai/mujoco-py#install-mujoco)
-from `mujoco_py` package. As MuJoCo has been made freely available, you can obtain a free
-license [here](https://www.roboti.us/license.html). No need for a license from mujoco210
+from `mujoco_py` package. ~~As MuJoCo has been made freely available, you can obtain a free
+license [here](https://www.roboti.us/license.html)~~. No need for a license from mujoco210
and above.
Next, go to the main directory of this repo and run