From b2d8f8ad95c093808956d47f95c81ea17e0c6c94 Mon Sep 17 00:00:00 2001 From: vmoens Date: Tue, 3 Jan 2023 09:05:06 +0000 Subject: [PATCH 1/2] init --- .circleci/unittest/linux/scripts/install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/unittest/linux/scripts/install.sh b/.circleci/unittest/linux/scripts/install.sh index 4f68f6b06..3162f59a6 100755 --- a/.circleci/unittest/linux/scripts/install.sh +++ b/.circleci/unittest/linux/scripts/install.sh @@ -54,7 +54,7 @@ python -c "import functorch" # mj_envs #git clone -c submodule.mj_envs/sims/neuromuscular_sim.update=none --branch v0.4dev --recursive https://github.com/vikashplus/mj_envs.git third_party/mj_envs -git clone -c submodule.mj_envs/sims/neuromuscular_sim.update=none --branch add_all_xmls --recursive https://github.com/vmoens/mj_envs.git third_party/mj_envs +git clone -c submodule.mj_envs/sims/neuromuscular_sim.update=none --branch v0.3dev_standalone --recursive https://github.com/vmoens/mj_envs.git third_party/mj_envs cd third_party/mj_envs pip install . cd ../.. From c8cd7ce7c9061d3284dce4dc8761060d0417fff4 Mon Sep 17 00:00:00 2001 From: vmoens Date: Tue, 3 Jan 2023 12:03:08 +0000 Subject: [PATCH 2/2] mujoco --- .circleci/unittest/linux/scripts/setup_env.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.circleci/unittest/linux/scripts/setup_env.sh b/.circleci/unittest/linux/scripts/setup_env.sh index 41e1297dc..58a1f7aee 100755 --- a/.circleci/unittest/linux/scripts/setup_env.sh +++ b/.circleci/unittest/linux/scripts/setup_env.sh @@ -63,11 +63,11 @@ PRIVATE_MUJOCO_GL=egl export MUJOCO_GL=$PRIVATE_MUJOCO_GL conda env config vars set \ -# MUJOCO_PY_MUJOCO_PATH=$root_dir/.mujoco/mujoco210 \ + MUJOCO_PY_MUJOCO_PATH=$root_dir/.mujoco/mujoco210 \ DISPLAY=unix:0.0 \ -# MJLIB_PATH=$root_dir/.mujoco/mujoco-2.1.1/lib/libmujoco.so.2.1.1 \ -# LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$root_dir/.mujoco/mujoco210/bin \ -# SDL_VIDEODRIVER=dummy \ + MJLIB_PATH=$root_dir/.mujoco/mujoco-2.1.1/lib/libmujoco.so.2.1.1 \ + LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$root_dir/.mujoco/mujoco210/bin \ + SDL_VIDEODRIVER=dummy \ MUJOCO_GL=$PRIVATE_MUJOCO_GL \ PYOPENGL_PLATFORM=$PRIVATE_MUJOCO_GL