From a816d0cd7f6ddd39c711f8aba36e9a958eb59ba9 Mon Sep 17 00:00:00 2001 From: Tony Tong Date: Wed, 3 Aug 2022 00:32:54 -0400 Subject: [PATCH 01/44] update linux setup_env to include libosmesa6 and libgl1-mesa-glx --- .circleci/unittest/linux/scripts/setup_env.sh | 3 +++ .circleci/unittest/linux_stable/scripts/setup_env.sh | 3 +++ 2 files changed, 6 insertions(+) diff --git a/.circleci/unittest/linux/scripts/setup_env.sh b/.circleci/unittest/linux/scripts/setup_env.sh index b0cf2b465b1..d77c031af80 100755 --- a/.circleci/unittest/linux/scripts/setup_env.sh +++ b/.circleci/unittest/linux/scripts/setup_env.sh @@ -56,6 +56,9 @@ cat "${this_dir}/environment.yml" if [[ $OSTYPE == 'darwin'* ]]; then PRIVATE_MUJOCO_GL=glfw else + # Software rendering requires GLX and OSMesa. + apt-get update + apt-get install -y libgl1-mesa-glx libosmesa6 conda install -y -c conda-forge mesa conda install -y -c conda-forge mesalib PRIVATE_MUJOCO_GL=osmesa diff --git a/.circleci/unittest/linux_stable/scripts/setup_env.sh b/.circleci/unittest/linux_stable/scripts/setup_env.sh index c9c6e45acc2..fabe91930c9 100755 --- a/.circleci/unittest/linux_stable/scripts/setup_env.sh +++ b/.circleci/unittest/linux_stable/scripts/setup_env.sh @@ -57,6 +57,9 @@ cat "${this_dir}/environment.yml" if [[ $OSTYPE == 'darwin'* ]]; then PRIVATE_MUJOCO_GL=glfw else + # Software rendering requires GLX and OSMesa. + apt-get update + apt-get install -y libgl1-mesa-glx libosmesa6 conda install -y -c conda-forge mesa conda install -y -c conda-forge mesalib PRIVATE_MUJOCO_GL=osmesa From b714c34fcac118a6620601d5ff82ec73e9fbd0b1 Mon Sep 17 00:00:00 2001 From: Tony Tong Date: Wed, 3 Aug 2022 00:51:58 -0400 Subject: [PATCH 02/44] try just apt --- .circleci/unittest/linux/scripts/setup_env.sh | 4 ++-- .circleci/unittest/linux_stable/scripts/setup_env.sh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.circleci/unittest/linux/scripts/setup_env.sh b/.circleci/unittest/linux/scripts/setup_env.sh index d77c031af80..5d704b43e84 100755 --- a/.circleci/unittest/linux/scripts/setup_env.sh +++ b/.circleci/unittest/linux/scripts/setup_env.sh @@ -57,8 +57,8 @@ if [[ $OSTYPE == 'darwin'* ]]; then PRIVATE_MUJOCO_GL=glfw else # Software rendering requires GLX and OSMesa. - apt-get update - apt-get install -y libgl1-mesa-glx libosmesa6 + apt update + apt install -y libgl1-mesa-glx libosmesa6 conda install -y -c conda-forge mesa conda install -y -c conda-forge mesalib PRIVATE_MUJOCO_GL=osmesa diff --git a/.circleci/unittest/linux_stable/scripts/setup_env.sh b/.circleci/unittest/linux_stable/scripts/setup_env.sh index fabe91930c9..78e007fd505 100755 --- a/.circleci/unittest/linux_stable/scripts/setup_env.sh +++ b/.circleci/unittest/linux_stable/scripts/setup_env.sh @@ -58,8 +58,8 @@ if [[ $OSTYPE == 'darwin'* ]]; then PRIVATE_MUJOCO_GL=glfw else # Software rendering requires GLX and OSMesa. - apt-get update - apt-get install -y libgl1-mesa-glx libosmesa6 + apt update + apt install -y libgl1-mesa-glx libosmesa6 conda install -y -c conda-forge mesa conda install -y -c conda-forge mesalib PRIVATE_MUJOCO_GL=osmesa From a77c0b523dcd479620d240db4781db6596ca363e Mon Sep 17 00:00:00 2001 From: Tony Tong Date: Wed, 3 Aug 2022 09:02:03 -0400 Subject: [PATCH 03/44] try yum --- .circleci/unittest/linux/scripts/setup_env.sh | 4 ++-- .circleci/unittest/linux_stable/scripts/setup_env.sh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.circleci/unittest/linux/scripts/setup_env.sh b/.circleci/unittest/linux/scripts/setup_env.sh index 5d704b43e84..92bb8b2b622 100755 --- a/.circleci/unittest/linux/scripts/setup_env.sh +++ b/.circleci/unittest/linux/scripts/setup_env.sh @@ -57,8 +57,8 @@ if [[ $OSTYPE == 'darwin'* ]]; then PRIVATE_MUJOCO_GL=glfw else # Software rendering requires GLX and OSMesa. - apt update - apt install -y libgl1-mesa-glx libosmesa6 + yum install -y libosmesa6 + yum install -y libgl1-mesa-glx conda install -y -c conda-forge mesa conda install -y -c conda-forge mesalib PRIVATE_MUJOCO_GL=osmesa diff --git a/.circleci/unittest/linux_stable/scripts/setup_env.sh b/.circleci/unittest/linux_stable/scripts/setup_env.sh index 78e007fd505..8d1862af6d8 100755 --- a/.circleci/unittest/linux_stable/scripts/setup_env.sh +++ b/.circleci/unittest/linux_stable/scripts/setup_env.sh @@ -58,8 +58,8 @@ if [[ $OSTYPE == 'darwin'* ]]; then PRIVATE_MUJOCO_GL=glfw else # Software rendering requires GLX and OSMesa. - apt update - apt install -y libgl1-mesa-glx libosmesa6 + yum install -y libosmesa6 + yum install -y libgl1-mesa-glx conda install -y -c conda-forge mesa conda install -y -c conda-forge mesalib PRIVATE_MUJOCO_GL=osmesa From 3424edd85627e476a4784d2f402b330271cb3f35 Mon Sep 17 00:00:00 2001 From: Tony Tong Date: Wed, 3 Aug 2022 09:10:50 -0400 Subject: [PATCH 04/44] try yum again --- .circleci/unittest/linux/scripts/setup_env.sh | 5 +++-- .circleci/unittest/linux_stable/scripts/setup_env.sh | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.circleci/unittest/linux/scripts/setup_env.sh b/.circleci/unittest/linux/scripts/setup_env.sh index 92bb8b2b622..5459ba31d64 100755 --- a/.circleci/unittest/linux/scripts/setup_env.sh +++ b/.circleci/unittest/linux/scripts/setup_env.sh @@ -57,8 +57,9 @@ if [[ $OSTYPE == 'darwin'* ]]; then PRIVATE_MUJOCO_GL=glfw else # Software rendering requires GLX and OSMesa. - yum install -y libosmesa6 - yum install -y libgl1-mesa-glx + yum install -y mesa-libOSMesa-devel.x86_64 + yum install -y mesa-libGL-devel.x86_64 + yum install -y mesa-libGLU-devel.x86_64 conda install -y -c conda-forge mesa conda install -y -c conda-forge mesalib PRIVATE_MUJOCO_GL=osmesa diff --git a/.circleci/unittest/linux_stable/scripts/setup_env.sh b/.circleci/unittest/linux_stable/scripts/setup_env.sh index 8d1862af6d8..fc88980992b 100755 --- a/.circleci/unittest/linux_stable/scripts/setup_env.sh +++ b/.circleci/unittest/linux_stable/scripts/setup_env.sh @@ -58,8 +58,9 @@ if [[ $OSTYPE == 'darwin'* ]]; then PRIVATE_MUJOCO_GL=glfw else # Software rendering requires GLX and OSMesa. - yum install -y libosmesa6 - yum install -y libgl1-mesa-glx + yum install -y mesa-libOSMesa-devel.x86_64 + yum install -y mesa-libGL-devel.x86_64 + yum install -y mesa-libGLU-devel.x86_64 conda install -y -c conda-forge mesa conda install -y -c conda-forge mesalib PRIVATE_MUJOCO_GL=osmesa From 7aabc857b66441ca5b23dd32fec4f50c594f89a8 Mon Sep 17 00:00:00 2001 From: Tony Tong Date: Wed, 3 Aug 2022 09:39:14 -0400 Subject: [PATCH 05/44] well it is functorch now --- .circleci/unittest/linux/scripts/setup_env.sh | 4 +--- .circleci/unittest/linux_stable/scripts/setup_env.sh | 4 +--- setup.py | 7 ++++++- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/.circleci/unittest/linux/scripts/setup_env.sh b/.circleci/unittest/linux/scripts/setup_env.sh index 5459ba31d64..0cec1e711ca 100755 --- a/.circleci/unittest/linux/scripts/setup_env.sh +++ b/.circleci/unittest/linux/scripts/setup_env.sh @@ -57,9 +57,7 @@ if [[ $OSTYPE == 'darwin'* ]]; then PRIVATE_MUJOCO_GL=glfw else # Software rendering requires GLX and OSMesa. - yum install -y mesa-libOSMesa-devel.x86_64 - yum install -y mesa-libGL-devel.x86_64 - yum install -y mesa-libGLU-devel.x86_64 + yum install -y mesa-libOSMesa-devel.x86_64 mesa-libGL-devel.x86_64 mesa-libGLU-devel.x86_64 conda install -y -c conda-forge mesa conda install -y -c conda-forge mesalib PRIVATE_MUJOCO_GL=osmesa diff --git a/.circleci/unittest/linux_stable/scripts/setup_env.sh b/.circleci/unittest/linux_stable/scripts/setup_env.sh index fc88980992b..fa7eeda1e0d 100755 --- a/.circleci/unittest/linux_stable/scripts/setup_env.sh +++ b/.circleci/unittest/linux_stable/scripts/setup_env.sh @@ -58,9 +58,7 @@ if [[ $OSTYPE == 'darwin'* ]]; then PRIVATE_MUJOCO_GL=glfw else # Software rendering requires GLX and OSMesa. - yum install -y mesa-libOSMesa-devel.x86_64 - yum install -y mesa-libGL-devel.x86_64 - yum install -y mesa-libGLU-devel.x86_64 + yum install -y mesa-libOSMesa-devel.x86_64 mesa-libGL-devel.x86_64 mesa-libGLU-devel.x86_64 conda install -y -c conda-forge mesa conda install -y -c conda-forge mesalib PRIVATE_MUJOCO_GL=osmesa diff --git a/setup.py b/setup.py index 70a8165571e..65171ff0abb 100644 --- a/setup.py +++ b/setup.py @@ -168,7 +168,12 @@ def _main(): "build_ext": BuildExtension.with_options(no_python_abi_suffix=True), "clean": clean, }, - install_requires=[pytorch_package_dep, "numpy", "packaging"], + install_requires=[ + pytorch_package_dep, + "numpy", + "packaging", + "functorch @ git+https://github.com/pytorch/functorch@v0.2.0", + ], extras_require={ "atari": [ "gym<=0.24", From f7692ee3ee9a02724b1a43da4d8098ef0ab22d2b Mon Sep 17 00:00:00 2001 From: Tony Tong Date: Wed, 3 Aug 2022 09:52:09 -0400 Subject: [PATCH 06/44] remove install from git --- .idea/workspace.xml | 46 +++++++++++++++++++++++++++++++++++++++++++++ setup.py | 1 - 2 files changed, 46 insertions(+), 1 deletion(-) create mode 100644 .idea/workspace.xml diff --git a/.idea/workspace.xml b/.idea/workspace.xml new file mode 100644 index 00000000000..916ea8b2148 --- /dev/null +++ b/.idea/workspace.xml @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + + + + + + + + 1659499114932 + + + + \ No newline at end of file diff --git a/setup.py b/setup.py index 65171ff0abb..fb3146eee84 100644 --- a/setup.py +++ b/setup.py @@ -172,7 +172,6 @@ def _main(): pytorch_package_dep, "numpy", "packaging", - "functorch @ git+https://github.com/pytorch/functorch@v0.2.0", ], extras_require={ "atari": [ From 567c00fad1c11769e1dfa902902433f51513d9ce Mon Sep 17 00:00:00 2001 From: Tony Tong Date: Wed, 3 Aug 2022 15:48:55 -0400 Subject: [PATCH 07/44] remove --- .idea/workspace.xml | 46 --------------------------------------------- 1 file changed, 46 deletions(-) delete mode 100644 .idea/workspace.xml diff --git a/.idea/workspace.xml b/.idea/workspace.xml deleted file mode 100644 index 916ea8b2148..00000000000 --- a/.idea/workspace.xml +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - 1659499114932 - - - - \ No newline at end of file From 2f131c93a0a8adc91ba4d0d6cba50e76476b10a0 Mon Sep 17 00:00:00 2001 From: Tony Tong Date: Wed, 3 Aug 2022 16:00:39 -0400 Subject: [PATCH 08/44] revert format --- setup.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/setup.py b/setup.py index fb3146eee84..70a8165571e 100644 --- a/setup.py +++ b/setup.py @@ -168,11 +168,7 @@ def _main(): "build_ext": BuildExtension.with_options(no_python_abi_suffix=True), "clean": clean, }, - install_requires=[ - pytorch_package_dep, - "numpy", - "packaging", - ], + install_requires=[pytorch_package_dep, "numpy", "packaging"], extras_require={ "atari": [ "gym<=0.24", From 69f436cfc4a63fb5d2833e123e55dda474a83e6b Mon Sep 17 00:00:00 2001 From: Tony Tong Date: Wed, 3 Aug 2022 16:03:30 -0400 Subject: [PATCH 09/44] remove conda install --- .circleci/unittest/linux/scripts/setup_env.sh | 4 +--- .circleci/unittest/linux_stable/scripts/setup_env.sh | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/.circleci/unittest/linux/scripts/setup_env.sh b/.circleci/unittest/linux/scripts/setup_env.sh index 0cec1e711ca..93a5815070e 100755 --- a/.circleci/unittest/linux/scripts/setup_env.sh +++ b/.circleci/unittest/linux/scripts/setup_env.sh @@ -58,9 +58,7 @@ if [[ $OSTYPE == 'darwin'* ]]; then else # Software rendering requires GLX and OSMesa. yum install -y mesa-libOSMesa-devel.x86_64 mesa-libGL-devel.x86_64 mesa-libGLU-devel.x86_64 - conda install -y -c conda-forge mesa - conda install -y -c conda-forge mesalib - PRIVATE_MUJOCO_GL=osmesa + PRIVATE_MUJOCO_GL=egl fi export MUJOCO_GL=$PRIVATE_MUJOCO_GL diff --git a/.circleci/unittest/linux_stable/scripts/setup_env.sh b/.circleci/unittest/linux_stable/scripts/setup_env.sh index fa7eeda1e0d..0a11da7e8d7 100755 --- a/.circleci/unittest/linux_stable/scripts/setup_env.sh +++ b/.circleci/unittest/linux_stable/scripts/setup_env.sh @@ -59,9 +59,7 @@ if [[ $OSTYPE == 'darwin'* ]]; then else # Software rendering requires GLX and OSMesa. yum install -y mesa-libOSMesa-devel.x86_64 mesa-libGL-devel.x86_64 mesa-libGLU-devel.x86_64 - conda install -y -c conda-forge mesa - conda install -y -c conda-forge mesalib - PRIVATE_MUJOCO_GL=osmesa + PRIVATE_MUJOCO_GL=egl fi export MUJOCO_GL=$PRIVATE_MUJOCO_GL From 8d99c5d2d17806c849b672ba728f2db1bb48f491 Mon Sep 17 00:00:00 2001 From: Tony Tong Date: Wed, 3 Aug 2022 16:37:11 -0400 Subject: [PATCH 10/44] should be good --- .circleci/unittest/linux/scripts/setup_env.sh | 2 -- .circleci/unittest/linux_stable/scripts/setup_env.sh | 2 -- 2 files changed, 4 deletions(-) diff --git a/.circleci/unittest/linux/scripts/setup_env.sh b/.circleci/unittest/linux/scripts/setup_env.sh index 0cec1e711ca..fc66680ce4a 100755 --- a/.circleci/unittest/linux/scripts/setup_env.sh +++ b/.circleci/unittest/linux/scripts/setup_env.sh @@ -58,8 +58,6 @@ if [[ $OSTYPE == 'darwin'* ]]; then else # Software rendering requires GLX and OSMesa. yum install -y mesa-libOSMesa-devel.x86_64 mesa-libGL-devel.x86_64 mesa-libGLU-devel.x86_64 - conda install -y -c conda-forge mesa - conda install -y -c conda-forge mesalib PRIVATE_MUJOCO_GL=osmesa fi diff --git a/.circleci/unittest/linux_stable/scripts/setup_env.sh b/.circleci/unittest/linux_stable/scripts/setup_env.sh index fa7eeda1e0d..b112943793e 100755 --- a/.circleci/unittest/linux_stable/scripts/setup_env.sh +++ b/.circleci/unittest/linux_stable/scripts/setup_env.sh @@ -59,8 +59,6 @@ if [[ $OSTYPE == 'darwin'* ]]; then else # Software rendering requires GLX and OSMesa. yum install -y mesa-libOSMesa-devel.x86_64 mesa-libGL-devel.x86_64 mesa-libGLU-devel.x86_64 - conda install -y -c conda-forge mesa - conda install -y -c conda-forge mesalib PRIVATE_MUJOCO_GL=osmesa fi From 0aaba3f1deb0d9dab2fe94b4fb0fd0e0945f7719 Mon Sep 17 00:00:00 2001 From: Tony Tong Date: Wed, 3 Aug 2022 16:37:41 -0400 Subject: [PATCH 11/44] remove xml --- .idea/workspace.xml | 46 --------------------------------------------- 1 file changed, 46 deletions(-) delete mode 100644 .idea/workspace.xml diff --git a/.idea/workspace.xml b/.idea/workspace.xml deleted file mode 100644 index 916ea8b2148..00000000000 --- a/.idea/workspace.xml +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - 1659499114932 - - - - \ No newline at end of file From 8e2ae9a6f562f63a0007626e76fec136d75f1b81 Mon Sep 17 00:00:00 2001 From: Tony Tong Date: Wed, 3 Aug 2022 16:38:17 -0400 Subject: [PATCH 12/44] save setup --- setup.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/setup.py b/setup.py index fb3146eee84..70a8165571e 100644 --- a/setup.py +++ b/setup.py @@ -168,11 +168,7 @@ def _main(): "build_ext": BuildExtension.with_options(no_python_abi_suffix=True), "clean": clean, }, - install_requires=[ - pytorch_package_dep, - "numpy", - "packaging", - ], + install_requires=[pytorch_package_dep, "numpy", "packaging"], extras_require={ "atari": [ "gym<=0.24", From d0dd7bbec4dae7e3fb210e349d5ab33448dc1ba2 Mon Sep 17 00:00:00 2001 From: Tony Tong Date: Wed, 3 Aug 2022 17:24:57 -0400 Subject: [PATCH 13/44] try fix openGL version --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 70a8165571e..fd327f7144b 100644 --- a/setup.py +++ b/setup.py @@ -168,7 +168,7 @@ def _main(): "build_ext": BuildExtension.with_options(no_python_abi_suffix=True), "clean": clean, }, - install_requires=[pytorch_package_dep, "numpy", "packaging"], + install_requires=[pytorch_package_dep, "numpy", "packaging", "PyOpenGL==3.1.0"], extras_require={ "atari": [ "gym<=0.24", From 2901caa3eea7498b1422e356c0bea9c987c822f0 Mon Sep 17 00:00:00 2001 From: Tony Tong Date: Wed, 3 Aug 2022 17:53:43 -0400 Subject: [PATCH 14/44] for GPU tests? --- .circleci/unittest/linux_optdeps/scripts/setup_env.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.circleci/unittest/linux_optdeps/scripts/setup_env.sh b/.circleci/unittest/linux_optdeps/scripts/setup_env.sh index fe363b584c6..666e4d1d5ad 100755 --- a/.circleci/unittest/linux_optdeps/scripts/setup_env.sh +++ b/.circleci/unittest/linux_optdeps/scripts/setup_env.sh @@ -46,6 +46,8 @@ tar -xf mujoco-2.1.1-linux-x86_64.tar.gz wget https://mujoco.org/download/mujoco210-linux-x86_64.tar.gz tar -xf mujoco210-linux-x86_64.tar.gz cd $this_dir +# Software rendering requires GLX and OSMesa. +yum install -y mesa-libOSMesa-devel.x86_64 mesa-libGL-devel.x86_64 mesa-libGLU-devel.x86_64 # 4. Install Conda dependencies printf "* Installing dependencies (except PyTorch)\n" From d5dbde998f5ceb7bee739f766de3100473ae4f01 Mon Sep 17 00:00:00 2001 From: Tony Tong Date: Wed, 3 Aug 2022 18:10:54 -0400 Subject: [PATCH 15/44] revert --- .circleci/unittest/linux_optdeps/scripts/setup_env.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/.circleci/unittest/linux_optdeps/scripts/setup_env.sh b/.circleci/unittest/linux_optdeps/scripts/setup_env.sh index 666e4d1d5ad..fe363b584c6 100755 --- a/.circleci/unittest/linux_optdeps/scripts/setup_env.sh +++ b/.circleci/unittest/linux_optdeps/scripts/setup_env.sh @@ -46,8 +46,6 @@ tar -xf mujoco-2.1.1-linux-x86_64.tar.gz wget https://mujoco.org/download/mujoco210-linux-x86_64.tar.gz tar -xf mujoco210-linux-x86_64.tar.gz cd $this_dir -# Software rendering requires GLX and OSMesa. -yum install -y mesa-libOSMesa-devel.x86_64 mesa-libGL-devel.x86_64 mesa-libGLU-devel.x86_64 # 4. Install Conda dependencies printf "* Installing dependencies (except PyTorch)\n" From b6a26df879e0886b7d3a460d7fca66f44f178e9d Mon Sep 17 00:00:00 2001 From: Tony Tong Date: Thu, 4 Aug 2022 01:11:30 -0400 Subject: [PATCH 16/44] try again --- .circleci/unittest/linux/scripts/setup_env.sh | 4 +++- .circleci/unittest/linux_stable/scripts/setup_env.sh | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.circleci/unittest/linux/scripts/setup_env.sh b/.circleci/unittest/linux/scripts/setup_env.sh index fc66680ce4a..4bed96ad81c 100755 --- a/.circleci/unittest/linux/scripts/setup_env.sh +++ b/.circleci/unittest/linux/scripts/setup_env.sh @@ -57,7 +57,9 @@ if [[ $OSTYPE == 'darwin'* ]]; then PRIVATE_MUJOCO_GL=glfw else # Software rendering requires GLX and OSMesa. - yum install -y mesa-libOSMesa-devel.x86_64 mesa-libGL-devel.x86_64 mesa-libGLU-devel.x86_64 + yum makecache + yum install -y glx-utils + yum install -y mesa-libOSMesa-devel PRIVATE_MUJOCO_GL=osmesa fi diff --git a/.circleci/unittest/linux_stable/scripts/setup_env.sh b/.circleci/unittest/linux_stable/scripts/setup_env.sh index b112943793e..e6078d722c4 100755 --- a/.circleci/unittest/linux_stable/scripts/setup_env.sh +++ b/.circleci/unittest/linux_stable/scripts/setup_env.sh @@ -58,7 +58,9 @@ if [[ $OSTYPE == 'darwin'* ]]; then PRIVATE_MUJOCO_GL=glfw else # Software rendering requires GLX and OSMesa. - yum install -y mesa-libOSMesa-devel.x86_64 mesa-libGL-devel.x86_64 mesa-libGLU-devel.x86_64 + yum makecache + yum install -y glx-utils + yum install -y mesa-libOSMesa-devel PRIVATE_MUJOCO_GL=osmesa fi From 76253a811cf9aa6f4fe7578665811278b96cd5d0 Mon Sep 17 00:00:00 2001 From: Tony Tong Date: Thu, 4 Aug 2022 01:26:00 -0400 Subject: [PATCH 17/44] try again --- .circleci/unittest/linux/scripts/setup_env.sh | 3 +-- .circleci/unittest/linux_stable/scripts/setup_env.sh | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.circleci/unittest/linux/scripts/setup_env.sh b/.circleci/unittest/linux/scripts/setup_env.sh index 4bed96ad81c..417f9ff2fac 100755 --- a/.circleci/unittest/linux/scripts/setup_env.sh +++ b/.circleci/unittest/linux/scripts/setup_env.sh @@ -58,8 +58,7 @@ if [[ $OSTYPE == 'darwin'* ]]; then else # Software rendering requires GLX and OSMesa. yum makecache - yum install -y glx-utils - yum install -y mesa-libOSMesa-devel + yum install -y mesa-libGL PRIVATE_MUJOCO_GL=osmesa fi diff --git a/.circleci/unittest/linux_stable/scripts/setup_env.sh b/.circleci/unittest/linux_stable/scripts/setup_env.sh index e6078d722c4..be0089da7e1 100755 --- a/.circleci/unittest/linux_stable/scripts/setup_env.sh +++ b/.circleci/unittest/linux_stable/scripts/setup_env.sh @@ -59,8 +59,7 @@ if [[ $OSTYPE == 'darwin'* ]]; then else # Software rendering requires GLX and OSMesa. yum makecache - yum install -y glx-utils - yum install -y mesa-libOSMesa-devel + yum install -y mesa-libGL PRIVATE_MUJOCO_GL=osmesa fi From cdbeb14d18f83a1fedb3f4bb074bcc773a121297 Mon Sep 17 00:00:00 2001 From: Tony Tong Date: Thu, 4 Aug 2022 01:31:48 -0400 Subject: [PATCH 18/44] try again --- .circleci/unittest/linux/scripts/setup_env.sh | 1 + .circleci/unittest/linux_stable/scripts/setup_env.sh | 1 + 2 files changed, 2 insertions(+) diff --git a/.circleci/unittest/linux/scripts/setup_env.sh b/.circleci/unittest/linux/scripts/setup_env.sh index 417f9ff2fac..80057912cf2 100755 --- a/.circleci/unittest/linux/scripts/setup_env.sh +++ b/.circleci/unittest/linux/scripts/setup_env.sh @@ -59,6 +59,7 @@ else # Software rendering requires GLX and OSMesa. yum makecache yum install -y mesa-libGL + yum install -y mesa-libOSMesa-devel PRIVATE_MUJOCO_GL=osmesa fi diff --git a/.circleci/unittest/linux_stable/scripts/setup_env.sh b/.circleci/unittest/linux_stable/scripts/setup_env.sh index be0089da7e1..cc2c4e3d04d 100755 --- a/.circleci/unittest/linux_stable/scripts/setup_env.sh +++ b/.circleci/unittest/linux_stable/scripts/setup_env.sh @@ -60,6 +60,7 @@ else # Software rendering requires GLX and OSMesa. yum makecache yum install -y mesa-libGL + yum install -y mesa-libOSMesa-devel PRIVATE_MUJOCO_GL=osmesa fi From 06a9e1c3fd7a0b13bcf4bfc4a3e49ff95de73bba Mon Sep 17 00:00:00 2001 From: Tony Tong Date: Thu, 4 Aug 2022 01:52:53 -0400 Subject: [PATCH 19/44] try again --- .circleci/unittest/linux/scripts/setup_env.sh | 2 ++ .circleci/unittest/linux_stable/scripts/setup_env.sh | 2 ++ 2 files changed, 4 insertions(+) diff --git a/.circleci/unittest/linux/scripts/setup_env.sh b/.circleci/unittest/linux/scripts/setup_env.sh index 80057912cf2..d853cfc2634 100755 --- a/.circleci/unittest/linux/scripts/setup_env.sh +++ b/.circleci/unittest/linux/scripts/setup_env.sh @@ -58,6 +58,8 @@ if [[ $OSTYPE == 'darwin'* ]]; then else # Software rendering requires GLX and OSMesa. yum makecache + yum install -y glfw + yum install -y glew yum install -y mesa-libGL yum install -y mesa-libOSMesa-devel PRIVATE_MUJOCO_GL=osmesa diff --git a/.circleci/unittest/linux_stable/scripts/setup_env.sh b/.circleci/unittest/linux_stable/scripts/setup_env.sh index cc2c4e3d04d..9146b7c3291 100755 --- a/.circleci/unittest/linux_stable/scripts/setup_env.sh +++ b/.circleci/unittest/linux_stable/scripts/setup_env.sh @@ -59,6 +59,8 @@ if [[ $OSTYPE == 'darwin'* ]]; then else # Software rendering requires GLX and OSMesa. yum makecache + yum install -y glfw + yum install -y glew yum install -y mesa-libGL yum install -y mesa-libOSMesa-devel PRIVATE_MUJOCO_GL=osmesa From d6a8f4ee34deced2b47d46f53910f11359b7da5f Mon Sep 17 00:00:00 2001 From: Tony Tong Date: Thu, 4 Aug 2022 02:05:29 -0400 Subject: [PATCH 20/44] try again --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index fd327f7144b..70a8165571e 100644 --- a/setup.py +++ b/setup.py @@ -168,7 +168,7 @@ def _main(): "build_ext": BuildExtension.with_options(no_python_abi_suffix=True), "clean": clean, }, - install_requires=[pytorch_package_dep, "numpy", "packaging", "PyOpenGL==3.1.0"], + install_requires=[pytorch_package_dep, "numpy", "packaging"], extras_require={ "atari": [ "gym<=0.24", From a672c389658a37b642f1bd95c065250cce1d99f2 Mon Sep 17 00:00:00 2001 From: Tony Tong Date: Thu, 4 Aug 2022 02:17:55 -0400 Subject: [PATCH 21/44] try again --- .circleci/unittest/linux/scripts/setup_env.sh | 2 +- .circleci/unittest/linux_stable/scripts/setup_env.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/unittest/linux/scripts/setup_env.sh b/.circleci/unittest/linux/scripts/setup_env.sh index d853cfc2634..26df793eb7e 100755 --- a/.circleci/unittest/linux/scripts/setup_env.sh +++ b/.circleci/unittest/linux/scripts/setup_env.sh @@ -62,7 +62,7 @@ else yum install -y glew yum install -y mesa-libGL yum install -y mesa-libOSMesa-devel - PRIVATE_MUJOCO_GL=osmesa + PRIVATE_MUJOCO_GL=egl fi export MUJOCO_GL=$PRIVATE_MUJOCO_GL diff --git a/.circleci/unittest/linux_stable/scripts/setup_env.sh b/.circleci/unittest/linux_stable/scripts/setup_env.sh index 9146b7c3291..923fdc19e20 100755 --- a/.circleci/unittest/linux_stable/scripts/setup_env.sh +++ b/.circleci/unittest/linux_stable/scripts/setup_env.sh @@ -63,7 +63,7 @@ else yum install -y glew yum install -y mesa-libGL yum install -y mesa-libOSMesa-devel - PRIVATE_MUJOCO_GL=osmesa + PRIVATE_MUJOCO_GL=egl fi export MUJOCO_GL=$PRIVATE_MUJOCO_GL From f436505ed5830ee8121020348a2bd473304917f2 Mon Sep 17 00:00:00 2001 From: Tony Tong Date: Thu, 4 Aug 2022 02:33:05 -0400 Subject: [PATCH 22/44] update pyopenGL platform --- .circleci/unittest/linux/scripts/setup_env.sh | 5 +++-- .circleci/unittest/linux_stable/scripts/setup_env.sh | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.circleci/unittest/linux/scripts/setup_env.sh b/.circleci/unittest/linux/scripts/setup_env.sh index 26df793eb7e..c19aad0b880 100755 --- a/.circleci/unittest/linux/scripts/setup_env.sh +++ b/.circleci/unittest/linux/scripts/setup_env.sh @@ -62,7 +62,7 @@ else yum install -y glew yum install -y mesa-libGL yum install -y mesa-libOSMesa-devel - PRIVATE_MUJOCO_GL=egl + PRIVATE_MUJOCO_GL=osmesa fi export MUJOCO_GL=$PRIVATE_MUJOCO_GL @@ -71,6 +71,7 @@ conda env config vars set MUJOCO_PY_MUJOCO_PATH=$root_dir/.mujoco/mujoco210 \ 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 + MUJOCO_GL=$PRIVATE_MUJOCO_GL\ + PYOPENGL_PLATFORM=osmesa conda env update --file "${this_dir}/environment.yml" --prune diff --git a/.circleci/unittest/linux_stable/scripts/setup_env.sh b/.circleci/unittest/linux_stable/scripts/setup_env.sh index 923fdc19e20..ed9bd20d51d 100755 --- a/.circleci/unittest/linux_stable/scripts/setup_env.sh +++ b/.circleci/unittest/linux_stable/scripts/setup_env.sh @@ -63,7 +63,7 @@ else yum install -y glew yum install -y mesa-libGL yum install -y mesa-libOSMesa-devel - PRIVATE_MUJOCO_GL=egl + PRIVATE_MUJOCO_GL=osmesa fi export MUJOCO_GL=$PRIVATE_MUJOCO_GL @@ -72,6 +72,7 @@ conda env config vars set MUJOCO_PY_MUJOCO_PATH=$root_dir/.mujoco/mujoco210 \ 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 + MUJOCO_GL=$PRIVATE_MUJOCO_GL \ + PYOPENGL_PLATFORM=osmesa conda env update --file "${this_dir}/environment.yml" --prune From 35ccfaf7ba2216a81922ec8693e88eccf9c6838b Mon Sep 17 00:00:00 2001 From: Tony Tong Date: Thu, 4 Aug 2022 02:58:34 -0400 Subject: [PATCH 23/44] check env vars --- .circleci/unittest/linux/scripts/setup_env.sh | 13 +++++++------ .circleci/unittest/linux_stable/scripts/install.sh | 4 ++++ .../unittest/linux_stable/scripts/setup_env.sh | 13 +++++++------ 3 files changed, 18 insertions(+), 12 deletions(-) diff --git a/.circleci/unittest/linux/scripts/setup_env.sh b/.circleci/unittest/linux/scripts/setup_env.sh index c19aad0b880..55bbf348231 100755 --- a/.circleci/unittest/linux/scripts/setup_env.sh +++ b/.circleci/unittest/linux/scripts/setup_env.sh @@ -56,12 +56,6 @@ cat "${this_dir}/environment.yml" if [[ $OSTYPE == 'darwin'* ]]; then PRIVATE_MUJOCO_GL=glfw else - # Software rendering requires GLX and OSMesa. - yum makecache - yum install -y glfw - yum install -y glew - yum install -y mesa-libGL - yum install -y mesa-libOSMesa-devel PRIVATE_MUJOCO_GL=osmesa fi @@ -74,4 +68,11 @@ conda env config vars set MUJOCO_PY_MUJOCO_PATH=$root_dir/.mujoco/mujoco210 \ MUJOCO_GL=$PRIVATE_MUJOCO_GL\ PYOPENGL_PLATFORM=osmesa +# Software rendering requires GLX and OSMesa. +yum update +yum install -y glfw +yum install -y glew +yum install -y mesa-libGL +yum install -y mesa-libOSMesa-devel + conda env update --file "${this_dir}/environment.yml" --prune diff --git a/.circleci/unittest/linux_stable/scripts/install.sh b/.circleci/unittest/linux_stable/scripts/install.sh index 0c0e3c9f0b6..cec21f79ddd 100755 --- a/.circleci/unittest/linux_stable/scripts/install.sh +++ b/.circleci/unittest/linux_stable/scripts/install.sh @@ -54,4 +54,8 @@ printf "* Installing torchrl\n" printf "g++ version: " gcc --version +printf "Check env variables-->" +printf "${MUJOCO_GL}/env" +printf "${PYOPENGL_PLATFORM}/env" + python setup.py develop diff --git a/.circleci/unittest/linux_stable/scripts/setup_env.sh b/.circleci/unittest/linux_stable/scripts/setup_env.sh index ed9bd20d51d..f25a123f2ef 100755 --- a/.circleci/unittest/linux_stable/scripts/setup_env.sh +++ b/.circleci/unittest/linux_stable/scripts/setup_env.sh @@ -57,12 +57,6 @@ cat "${this_dir}/environment.yml" if [[ $OSTYPE == 'darwin'* ]]; then PRIVATE_MUJOCO_GL=glfw else - # Software rendering requires GLX and OSMesa. - yum makecache - yum install -y glfw - yum install -y glew - yum install -y mesa-libGL - yum install -y mesa-libOSMesa-devel PRIVATE_MUJOCO_GL=osmesa fi @@ -75,4 +69,11 @@ conda env config vars set MUJOCO_PY_MUJOCO_PATH=$root_dir/.mujoco/mujoco210 \ MUJOCO_GL=$PRIVATE_MUJOCO_GL \ PYOPENGL_PLATFORM=osmesa +# Software rendering requires GLX and OSMesa. +yum update +yum install -y glfw +yum install -y glew +yum install -y mesa-libGL +yum install -y mesa-libOSMesa-devel + conda env update --file "${this_dir}/environment.yml" --prune From cbaa2c9d37487207bb757549cb9f9ed277e48629 Mon Sep 17 00:00:00 2001 From: Tony Tong Date: Thu, 4 Aug 2022 03:07:35 -0400 Subject: [PATCH 24/44] check mesa --- .circleci/unittest/linux/scripts/setup_env.sh | 12 +++++++----- .circleci/unittest/linux_stable/scripts/setup_env.sh | 12 +++++++----- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/.circleci/unittest/linux/scripts/setup_env.sh b/.circleci/unittest/linux/scripts/setup_env.sh index 55bbf348231..26f6ad9e59d 100755 --- a/.circleci/unittest/linux/scripts/setup_env.sh +++ b/.circleci/unittest/linux/scripts/setup_env.sh @@ -69,10 +69,12 @@ conda env config vars set MUJOCO_PY_MUJOCO_PATH=$root_dir/.mujoco/mujoco210 \ PYOPENGL_PLATFORM=osmesa # Software rendering requires GLX and OSMesa. -yum update -yum install -y glfw -yum install -y glew -yum install -y mesa-libGL -yum install -y mesa-libOSMesa-devel +if [[ $MUJOCO_GL == 'osmesa' ]]; then + yum makecache + yum install -y glfw + yum install -y glew + yum install -y mesa-libGL + yum install -y mesa-libOSMesa-devel +fi conda env update --file "${this_dir}/environment.yml" --prune diff --git a/.circleci/unittest/linux_stable/scripts/setup_env.sh b/.circleci/unittest/linux_stable/scripts/setup_env.sh index f25a123f2ef..7a2aaac92fe 100755 --- a/.circleci/unittest/linux_stable/scripts/setup_env.sh +++ b/.circleci/unittest/linux_stable/scripts/setup_env.sh @@ -70,10 +70,12 @@ conda env config vars set MUJOCO_PY_MUJOCO_PATH=$root_dir/.mujoco/mujoco210 \ PYOPENGL_PLATFORM=osmesa # Software rendering requires GLX and OSMesa. -yum update -yum install -y glfw -yum install -y glew -yum install -y mesa-libGL -yum install -y mesa-libOSMesa-devel +if [[ $MUJOCO_GL == 'osmesa' ]]; then + yum makecache + yum install -y glfw + yum install -y glew + yum install -y mesa-libGL + yum install -y mesa-libOSMesa-devel +fi conda env update --file "${this_dir}/environment.yml" --prune From 93fb291468f2a731ae1456afac42ed191f3dd44d Mon Sep 17 00:00:00 2001 From: Tony Tong Date: Thu, 4 Aug 2022 03:36:30 -0400 Subject: [PATCH 25/44] ld path --- .circleci/unittest/linux/scripts/setup_env.sh | 2 +- .circleci/unittest/linux_stable/scripts/install.sh | 4 ---- .circleci/unittest/linux_stable/scripts/setup_env.sh | 2 +- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/.circleci/unittest/linux/scripts/setup_env.sh b/.circleci/unittest/linux/scripts/setup_env.sh index 26f6ad9e59d..3713e93071e 100755 --- a/.circleci/unittest/linux/scripts/setup_env.sh +++ b/.circleci/unittest/linux/scripts/setup_env.sh @@ -63,7 +63,7 @@ export MUJOCO_GL=$PRIVATE_MUJOCO_GL conda env config vars set 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 \ + LD_LIBRARY_PATH=$root_dir/.mujoco/mujoco210/bin \ SDL_VIDEODRIVER=dummy \ MUJOCO_GL=$PRIVATE_MUJOCO_GL\ PYOPENGL_PLATFORM=osmesa diff --git a/.circleci/unittest/linux_stable/scripts/install.sh b/.circleci/unittest/linux_stable/scripts/install.sh index cec21f79ddd..0c0e3c9f0b6 100755 --- a/.circleci/unittest/linux_stable/scripts/install.sh +++ b/.circleci/unittest/linux_stable/scripts/install.sh @@ -54,8 +54,4 @@ printf "* Installing torchrl\n" printf "g++ version: " gcc --version -printf "Check env variables-->" -printf "${MUJOCO_GL}/env" -printf "${PYOPENGL_PLATFORM}/env" - python setup.py develop diff --git a/.circleci/unittest/linux_stable/scripts/setup_env.sh b/.circleci/unittest/linux_stable/scripts/setup_env.sh index 7a2aaac92fe..e2df45887d7 100755 --- a/.circleci/unittest/linux_stable/scripts/setup_env.sh +++ b/.circleci/unittest/linux_stable/scripts/setup_env.sh @@ -64,7 +64,7 @@ export MUJOCO_GL=$PRIVATE_MUJOCO_GL conda env config vars set 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 \ + LD_LIBRARY_PATH=$root_dir/.mujoco/mujoco210/bin \ SDL_VIDEODRIVER=dummy \ MUJOCO_GL=$PRIVATE_MUJOCO_GL \ PYOPENGL_PLATFORM=osmesa From 2ee5bbd938d85cd29f7b95ee2eb21f903e5b1865 Mon Sep 17 00:00:00 2001 From: Tony Tong Date: Thu, 4 Aug 2022 14:37:44 -0400 Subject: [PATCH 26/44] try pyrender --- .circleci/unittest/linux/scripts/environment.yml | 1 + .circleci/unittest/linux_stable/scripts/environment.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/.circleci/unittest/linux/scripts/environment.yml b/.circleci/unittest/linux/scripts/environment.yml index ffb02c17783..fe4746e72ac 100644 --- a/.circleci/unittest/linux/scripts/environment.yml +++ b/.circleci/unittest/linux/scripts/environment.yml @@ -25,3 +25,4 @@ dependencies: - hydra-core - tensorboard - dm_control + - pyrender diff --git a/.circleci/unittest/linux_stable/scripts/environment.yml b/.circleci/unittest/linux_stable/scripts/environment.yml index 6d9365065e9..cff74626dd8 100644 --- a/.circleci/unittest/linux_stable/scripts/environment.yml +++ b/.circleci/unittest/linux_stable/scripts/environment.yml @@ -26,3 +26,4 @@ dependencies: - hydra-core - tensorboard - dm_control + - pyrender From f1f93445d8ce0d47be582080feb8733d54d07d6f Mon Sep 17 00:00:00 2001 From: Tony Tong Date: Thu, 4 Aug 2022 15:13:12 -0400 Subject: [PATCH 27/44] try install older version --- .circleci/unittest/linux/scripts/environment.yml | 2 +- .circleci/unittest/linux_stable/scripts/environment.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/unittest/linux/scripts/environment.yml b/.circleci/unittest/linux/scripts/environment.yml index fe4746e72ac..18ef5072271 100644 --- a/.circleci/unittest/linux/scripts/environment.yml +++ b/.circleci/unittest/linux/scripts/environment.yml @@ -25,4 +25,4 @@ dependencies: - hydra-core - tensorboard - dm_control - - pyrender + - PyOpenGL==3.1.0 diff --git a/.circleci/unittest/linux_stable/scripts/environment.yml b/.circleci/unittest/linux_stable/scripts/environment.yml index cff74626dd8..a6964a73e5d 100644 --- a/.circleci/unittest/linux_stable/scripts/environment.yml +++ b/.circleci/unittest/linux_stable/scripts/environment.yml @@ -26,4 +26,4 @@ dependencies: - hydra-core - tensorboard - dm_control - - pyrender + - PyOpenGL==3.1.0 From f94daac6d09a6e5829e5c7f066f9fb15e510f11d Mon Sep 17 00:00:00 2001 From: Tony Tong Date: Thu, 4 Aug 2022 15:30:25 -0400 Subject: [PATCH 28/44] libopengl0 --- .circleci/unittest/linux/scripts/environment.yml | 1 - .circleci/unittest/linux/scripts/setup_env.sh | 1 + .circleci/unittest/linux_stable/scripts/environment.yml | 1 - .circleci/unittest/linux_stable/scripts/setup_env.sh | 1 + 4 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/unittest/linux/scripts/environment.yml b/.circleci/unittest/linux/scripts/environment.yml index 18ef5072271..ffb02c17783 100644 --- a/.circleci/unittest/linux/scripts/environment.yml +++ b/.circleci/unittest/linux/scripts/environment.yml @@ -25,4 +25,3 @@ dependencies: - hydra-core - tensorboard - dm_control - - PyOpenGL==3.1.0 diff --git a/.circleci/unittest/linux/scripts/setup_env.sh b/.circleci/unittest/linux/scripts/setup_env.sh index 3713e93071e..bccf158d35e 100755 --- a/.circleci/unittest/linux/scripts/setup_env.sh +++ b/.circleci/unittest/linux/scripts/setup_env.sh @@ -75,6 +75,7 @@ if [[ $MUJOCO_GL == 'osmesa' ]]; then yum install -y glew yum install -y mesa-libGL yum install -y mesa-libOSMesa-devel + yum install -y libopengl0 fi conda env update --file "${this_dir}/environment.yml" --prune diff --git a/.circleci/unittest/linux_stable/scripts/environment.yml b/.circleci/unittest/linux_stable/scripts/environment.yml index a6964a73e5d..6d9365065e9 100644 --- a/.circleci/unittest/linux_stable/scripts/environment.yml +++ b/.circleci/unittest/linux_stable/scripts/environment.yml @@ -26,4 +26,3 @@ dependencies: - hydra-core - tensorboard - dm_control - - PyOpenGL==3.1.0 diff --git a/.circleci/unittest/linux_stable/scripts/setup_env.sh b/.circleci/unittest/linux_stable/scripts/setup_env.sh index e2df45887d7..a766c482fcc 100755 --- a/.circleci/unittest/linux_stable/scripts/setup_env.sh +++ b/.circleci/unittest/linux_stable/scripts/setup_env.sh @@ -76,6 +76,7 @@ if [[ $MUJOCO_GL == 'osmesa' ]]; then yum install -y glew yum install -y mesa-libGL yum install -y mesa-libOSMesa-devel + yum install -y libopengl0 fi conda env update --file "${this_dir}/environment.yml" --prune From e02a23ad11b0ee6a22900c1ac1d505ecbb9e7f22 Mon Sep 17 00:00:00 2001 From: Tony Tong Date: Thu, 4 Aug 2022 15:33:49 -0400 Subject: [PATCH 29/44] libopengl0 --- .circleci/unittest/linux/scripts/setup_env.sh | 2 +- .circleci/unittest/linux_stable/scripts/setup_env.sh | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.circleci/unittest/linux/scripts/setup_env.sh b/.circleci/unittest/linux/scripts/setup_env.sh index bccf158d35e..f7db1d15525 100755 --- a/.circleci/unittest/linux/scripts/setup_env.sh +++ b/.circleci/unittest/linux/scripts/setup_env.sh @@ -75,7 +75,7 @@ if [[ $MUJOCO_GL == 'osmesa' ]]; then yum install -y glew yum install -y mesa-libGL yum install -y mesa-libOSMesa-devel - yum install -y libopengl0 + yum install -y libglvnd-opengl fi conda env update --file "${this_dir}/environment.yml" --prune diff --git a/.circleci/unittest/linux_stable/scripts/setup_env.sh b/.circleci/unittest/linux_stable/scripts/setup_env.sh index a766c482fcc..246d86c9dac 100755 --- a/.circleci/unittest/linux_stable/scripts/setup_env.sh +++ b/.circleci/unittest/linux_stable/scripts/setup_env.sh @@ -72,11 +72,12 @@ conda env config vars set MUJOCO_PY_MUJOCO_PATH=$root_dir/.mujoco/mujoco210 \ # Software rendering requires GLX and OSMesa. if [[ $MUJOCO_GL == 'osmesa' ]]; then yum makecache + yum update -y yum install -y glfw yum install -y glew yum install -y mesa-libGL yum install -y mesa-libOSMesa-devel - yum install -y libopengl0 + yum install -y libglvnd-opengl fi conda env update --file "${this_dir}/environment.yml" --prune From a8e52ae07e2d6adbdb6abe1beecb0e01dd57c839 Mon Sep 17 00:00:00 2001 From: Tony Tong Date: Thu, 4 Aug 2022 16:41:45 -0400 Subject: [PATCH 30/44] try suggestion in run_tests.sh first --- .circleci/unittest/linux/scripts/run_test.sh | 6 ++++++ .circleci/unittest/linux/scripts/setup_env.sh | 1 - .circleci/unittest/linux_stable/scripts/run_test.sh | 6 ++++++ .circleci/unittest/linux_stable/scripts/setup_env.sh | 1 - 4 files changed, 12 insertions(+), 2 deletions(-) diff --git a/.circleci/unittest/linux/scripts/run_test.sh b/.circleci/unittest/linux/scripts/run_test.sh index fea33f15774..58bbf48f8df 100755 --- a/.circleci/unittest/linux/scripts/run_test.sh +++ b/.circleci/unittest/linux/scripts/run_test.sh @@ -5,6 +5,12 @@ set -e eval "$(./conda/bin/conda shell.bash hook)" conda activate ./env +pip3 install pyrender +pip3 install pyopengl --upgrade + +export MUJOCO_GL=egl +export PYOPENGL_PLATFORM=egl + export PYTORCH_TEST_WITH_SLOW='1' python -m torch.utils.collect_env # Avoid error: "fatal: unsafe repository" diff --git a/.circleci/unittest/linux/scripts/setup_env.sh b/.circleci/unittest/linux/scripts/setup_env.sh index f7db1d15525..3713e93071e 100755 --- a/.circleci/unittest/linux/scripts/setup_env.sh +++ b/.circleci/unittest/linux/scripts/setup_env.sh @@ -75,7 +75,6 @@ if [[ $MUJOCO_GL == 'osmesa' ]]; then yum install -y glew yum install -y mesa-libGL yum install -y mesa-libOSMesa-devel - yum install -y libglvnd-opengl fi conda env update --file "${this_dir}/environment.yml" --prune diff --git a/.circleci/unittest/linux_stable/scripts/run_test.sh b/.circleci/unittest/linux_stable/scripts/run_test.sh index fea33f15774..58bbf48f8df 100755 --- a/.circleci/unittest/linux_stable/scripts/run_test.sh +++ b/.circleci/unittest/linux_stable/scripts/run_test.sh @@ -5,6 +5,12 @@ set -e eval "$(./conda/bin/conda shell.bash hook)" conda activate ./env +pip3 install pyrender +pip3 install pyopengl --upgrade + +export MUJOCO_GL=egl +export PYOPENGL_PLATFORM=egl + export PYTORCH_TEST_WITH_SLOW='1' python -m torch.utils.collect_env # Avoid error: "fatal: unsafe repository" diff --git a/.circleci/unittest/linux_stable/scripts/setup_env.sh b/.circleci/unittest/linux_stable/scripts/setup_env.sh index 246d86c9dac..8db8472cf31 100755 --- a/.circleci/unittest/linux_stable/scripts/setup_env.sh +++ b/.circleci/unittest/linux_stable/scripts/setup_env.sh @@ -77,7 +77,6 @@ if [[ $MUJOCO_GL == 'osmesa' ]]; then yum install -y glew yum install -y mesa-libGL yum install -y mesa-libOSMesa-devel - yum install -y libglvnd-opengl fi conda env update --file "${this_dir}/environment.yml" --prune From 8e25f9d2f367ceb95fbba3d950a0c5275ff5e58d Mon Sep 17 00:00:00 2001 From: Tony Tong Date: Thu, 4 Aug 2022 17:23:24 -0400 Subject: [PATCH 31/44] check path --- .circleci/unittest/linux_stable/scripts/run_test.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.circleci/unittest/linux_stable/scripts/run_test.sh b/.circleci/unittest/linux_stable/scripts/run_test.sh index 58bbf48f8df..8e4fa9cf4e5 100755 --- a/.circleci/unittest/linux_stable/scripts/run_test.sh +++ b/.circleci/unittest/linux_stable/scripts/run_test.sh @@ -10,6 +10,9 @@ pip3 install pyopengl --upgrade export MUJOCO_GL=egl export PYOPENGL_PLATFORM=egl +export __GL_SHADER_DISK_CACHE=0 +xport __GL_SHADER_DISK_CACHE_PATH=/tmp +printf "DISPLAY:$DISPLAY-->\n" export PYTORCH_TEST_WITH_SLOW='1' python -m torch.utils.collect_env @@ -22,6 +25,7 @@ lib_dir="${env_dir}/lib" # solves ImportError: /lib64/libstdc++.so.6: version `GLIBCXX_3.4.21' not found export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$lib_dir +printf "LD_LIBRARY_PATH:$LD_LIBRARY_PATH-->\n" export MKL_THREADING_LAYER=GNU pytest test/smoke_test.py -v --durations 20 From 5eb14570a9067ad46c097b2c1f38169f24ed1d37 Mon Sep 17 00:00:00 2001 From: Tony Tong Date: Thu, 4 Aug 2022 17:34:00 -0400 Subject: [PATCH 32/44] typo --- .circleci/unittest/linux_stable/scripts/run_test.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/unittest/linux_stable/scripts/run_test.sh b/.circleci/unittest/linux_stable/scripts/run_test.sh index 8e4fa9cf4e5..59a048a6089 100755 --- a/.circleci/unittest/linux_stable/scripts/run_test.sh +++ b/.circleci/unittest/linux_stable/scripts/run_test.sh @@ -11,7 +11,7 @@ pip3 install pyopengl --upgrade export MUJOCO_GL=egl export PYOPENGL_PLATFORM=egl export __GL_SHADER_DISK_CACHE=0 -xport __GL_SHADER_DISK_CACHE_PATH=/tmp +export __GL_SHADER_DISK_CACHE_PATH=/tmp printf "DISPLAY:$DISPLAY-->\n" export PYTORCH_TEST_WITH_SLOW='1' From 965969dc765c6d6a528d2c4c387f40a8ef12b026 Mon Sep 17 00:00:00 2001 From: Tony Tong Date: Fri, 5 Aug 2022 10:49:27 -0400 Subject: [PATCH 33/44] check envs --- .circleci/unittest/linux_stable/scripts/install.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.circleci/unittest/linux_stable/scripts/install.sh b/.circleci/unittest/linux_stable/scripts/install.sh index 0c0e3c9f0b6..717af1fa839 100755 --- a/.circleci/unittest/linux_stable/scripts/install.sh +++ b/.circleci/unittest/linux_stable/scripts/install.sh @@ -1,5 +1,6 @@ #!/usr/bin/env bash + unset PYTORCH_VERSION # For unittest, nightly PyTorch is used as the following section, # so no need to set PYTORCH_VERSION. @@ -10,6 +11,9 @@ set -e eval "$(./conda/bin/conda shell.bash hook)" conda activate ./env +echo "--> Check env" +printenv + if [ "${CU_VERSION:-}" == cpu ] ; then cudatoolkit="cpuonly" version="cpu" From afb5c1dd68d686278d5be7bae4dc7c3aa6d5cea5 Mon Sep 17 00:00:00 2001 From: Tony Tong Date: Fri, 5 Aug 2022 11:05:02 -0400 Subject: [PATCH 34/44] unset cuda version --- .circleci/unittest/linux_stable/scripts/install.sh | 10 +++++----- .circleci/unittest/linux_stable/scripts/run_test.sh | 2 ++ 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.circleci/unittest/linux_stable/scripts/install.sh b/.circleci/unittest/linux_stable/scripts/install.sh index 717af1fa839..c4428c09bf5 100755 --- a/.circleci/unittest/linux_stable/scripts/install.sh +++ b/.circleci/unittest/linux_stable/scripts/install.sh @@ -19,11 +19,11 @@ if [ "${CU_VERSION:-}" == cpu ] ; then version="cpu" echo "Using cpu build" else - if [[ ${#CU_VERSION} -eq 4 ]]; then - CUDA_VERSION="${CU_VERSION:2:1}.${CU_VERSION:3:1}" - elif [[ ${#CU_VERSION} -eq 5 ]]; then - CUDA_VERSION="${CU_VERSION:2:2}.${CU_VERSION:4:1}" - fi +# if [[ ${#CU_VERSION} -eq 4 ]]; then +# CUDA_VERSION="${CU_VERSION:2:1}.${CU_VERSION:3:1}" +# elif [[ ${#CU_VERSION} -eq 5 ]]; then +# CUDA_VERSION="${CU_VERSION:2:2}.${CU_VERSION:4:1}" +# fi echo "Using CUDA $CUDA_VERSION as determined by CU_VERSION ($CU_VERSION)" version="$(python -c "print('.'.join(\"${CUDA_VERSION}\".split('.')[:2]))")" cudatoolkit="cudatoolkit=${version}" diff --git a/.circleci/unittest/linux_stable/scripts/run_test.sh b/.circleci/unittest/linux_stable/scripts/run_test.sh index 59a048a6089..79b934bea60 100755 --- a/.circleci/unittest/linux_stable/scripts/run_test.sh +++ b/.circleci/unittest/linux_stable/scripts/run_test.sh @@ -28,6 +28,8 @@ export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$lib_dir printf "LD_LIBRARY_PATH:$LD_LIBRARY_PATH-->\n" export MKL_THREADING_LAYER=GNU +printenv + pytest test/smoke_test.py -v --durations 20 pytest test/smoke_test_deps.py -v --durations 20 pytest --instafail -v --durations 20 From 2a97d0c27a3ab4da30af389296caa6b8ca78234f Mon Sep 17 00:00:00 2001 From: Tony Tong Date: Fri, 5 Aug 2022 11:30:39 -0400 Subject: [PATCH 35/44] try install pytroch 10.2 --- .circleci/unittest/linux_stable/scripts/install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/unittest/linux_stable/scripts/install.sh b/.circleci/unittest/linux_stable/scripts/install.sh index c4428c09bf5..1b2d415aa4b 100755 --- a/.circleci/unittest/linux_stable/scripts/install.sh +++ b/.circleci/unittest/linux_stable/scripts/install.sh @@ -45,7 +45,7 @@ if [ "${CU_VERSION:-}" == cpu ] ; then pip3 install torch torchvision torchaudio --extra-index-url https://download.pytorch.org/whl/cpu else # conda install -y pytorch torchvision cudatoolkit=11.3 -c pytorch - pip3 install torch torchvision torchaudio --extra-index-url https://download.pytorch.org/whl/cu113 + pip3 install torch torchvision torchaudio --extra-index-url https://download.pytorch.org/whl/cu102 fi printf "Installing functorch\n" From f23e27c4e4a45d07f5e16c10c72a144f5ce22cb6 Mon Sep 17 00:00:00 2001 From: Tony Tong Date: Fri, 5 Aug 2022 11:58:57 -0400 Subject: [PATCH 36/44] hard code cuda --- .circleci/unittest/linux/scripts/setup_env.sh | 6 +++--- .circleci/unittest/linux_stable/scripts/install.sh | 12 ++++++------ .circleci/unittest/linux_stable/scripts/run_test.sh | 1 + .circleci/unittest/linux_stable/scripts/setup_env.sh | 6 +++--- 4 files changed, 13 insertions(+), 12 deletions(-) diff --git a/.circleci/unittest/linux/scripts/setup_env.sh b/.circleci/unittest/linux/scripts/setup_env.sh index 3713e93071e..ffedc260e58 100755 --- a/.circleci/unittest/linux/scripts/setup_env.sh +++ b/.circleci/unittest/linux/scripts/setup_env.sh @@ -56,7 +56,7 @@ cat "${this_dir}/environment.yml" if [[ $OSTYPE == 'darwin'* ]]; then PRIVATE_MUJOCO_GL=glfw else - PRIVATE_MUJOCO_GL=osmesa + PRIVATE_MUJOCO_GL=egl fi export MUJOCO_GL=$PRIVATE_MUJOCO_GL @@ -66,10 +66,10 @@ conda env config vars set MUJOCO_PY_MUJOCO_PATH=$root_dir/.mujoco/mujoco210 \ LD_LIBRARY_PATH=$root_dir/.mujoco/mujoco210/bin \ SDL_VIDEODRIVER=dummy \ MUJOCO_GL=$PRIVATE_MUJOCO_GL\ - PYOPENGL_PLATFORM=osmesa + PYOPENGL_PLATFORM=egl # Software rendering requires GLX and OSMesa. -if [[ $MUJOCO_GL == 'osmesa' ]]; then +if [[ $MUJOCO_GL == 'egl' ]]; then yum makecache yum install -y glfw yum install -y glew diff --git a/.circleci/unittest/linux_stable/scripts/install.sh b/.circleci/unittest/linux_stable/scripts/install.sh index 1b2d415aa4b..717af1fa839 100755 --- a/.circleci/unittest/linux_stable/scripts/install.sh +++ b/.circleci/unittest/linux_stable/scripts/install.sh @@ -19,11 +19,11 @@ if [ "${CU_VERSION:-}" == cpu ] ; then version="cpu" echo "Using cpu build" else -# if [[ ${#CU_VERSION} -eq 4 ]]; then -# CUDA_VERSION="${CU_VERSION:2:1}.${CU_VERSION:3:1}" -# elif [[ ${#CU_VERSION} -eq 5 ]]; then -# CUDA_VERSION="${CU_VERSION:2:2}.${CU_VERSION:4:1}" -# fi + if [[ ${#CU_VERSION} -eq 4 ]]; then + CUDA_VERSION="${CU_VERSION:2:1}.${CU_VERSION:3:1}" + elif [[ ${#CU_VERSION} -eq 5 ]]; then + CUDA_VERSION="${CU_VERSION:2:2}.${CU_VERSION:4:1}" + fi echo "Using CUDA $CUDA_VERSION as determined by CU_VERSION ($CU_VERSION)" version="$(python -c "print('.'.join(\"${CUDA_VERSION}\".split('.')[:2]))")" cudatoolkit="cudatoolkit=${version}" @@ -45,7 +45,7 @@ if [ "${CU_VERSION:-}" == cpu ] ; then pip3 install torch torchvision torchaudio --extra-index-url https://download.pytorch.org/whl/cpu else # conda install -y pytorch torchvision cudatoolkit=11.3 -c pytorch - pip3 install torch torchvision torchaudio --extra-index-url https://download.pytorch.org/whl/cu102 + pip3 install torch torchvision torchaudio --extra-index-url https://download.pytorch.org/whl/cu113 fi printf "Installing functorch\n" diff --git a/.circleci/unittest/linux_stable/scripts/run_test.sh b/.circleci/unittest/linux_stable/scripts/run_test.sh index 79b934bea60..4b09823f6bc 100755 --- a/.circleci/unittest/linux_stable/scripts/run_test.sh +++ b/.circleci/unittest/linux_stable/scripts/run_test.sh @@ -4,6 +4,7 @@ set -e eval "$(./conda/bin/conda shell.bash hook)" conda activate ./env +export CUDA_VERSION=11.3 pip3 install pyrender pip3 install pyopengl --upgrade diff --git a/.circleci/unittest/linux_stable/scripts/setup_env.sh b/.circleci/unittest/linux_stable/scripts/setup_env.sh index 8db8472cf31..5938d6469df 100755 --- a/.circleci/unittest/linux_stable/scripts/setup_env.sh +++ b/.circleci/unittest/linux_stable/scripts/setup_env.sh @@ -57,7 +57,7 @@ cat "${this_dir}/environment.yml" if [[ $OSTYPE == 'darwin'* ]]; then PRIVATE_MUJOCO_GL=glfw else - PRIVATE_MUJOCO_GL=osmesa + PRIVATE_MUJOCO_GL=egl fi export MUJOCO_GL=$PRIVATE_MUJOCO_GL @@ -67,10 +67,10 @@ conda env config vars set MUJOCO_PY_MUJOCO_PATH=$root_dir/.mujoco/mujoco210 \ LD_LIBRARY_PATH=$root_dir/.mujoco/mujoco210/bin \ SDL_VIDEODRIVER=dummy \ MUJOCO_GL=$PRIVATE_MUJOCO_GL \ - PYOPENGL_PLATFORM=osmesa + PYOPENGL_PLATFORM=egl # Software rendering requires GLX and OSMesa. -if [[ $MUJOCO_GL == 'osmesa' ]]; then +if [[ $MUJOCO_GL == 'egl' ]]; then yum makecache yum update -y yum install -y glfw From e1662ad0e47d98ae2fd531440efdab15908d694d Mon Sep 17 00:00:00 2001 From: Tony Tong Date: Fri, 5 Aug 2022 12:14:06 -0400 Subject: [PATCH 37/44] this should work --- .circleci/unittest/linux_stable/scripts/install.sh | 14 +++++++------- .../unittest/linux_stable/scripts/run_test.sh | 1 - 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/.circleci/unittest/linux_stable/scripts/install.sh b/.circleci/unittest/linux_stable/scripts/install.sh index 717af1fa839..7de8fd6c9d4 100755 --- a/.circleci/unittest/linux_stable/scripts/install.sh +++ b/.circleci/unittest/linux_stable/scripts/install.sh @@ -19,11 +19,11 @@ if [ "${CU_VERSION:-}" == cpu ] ; then version="cpu" echo "Using cpu build" else - if [[ ${#CU_VERSION} -eq 4 ]]; then - CUDA_VERSION="${CU_VERSION:2:1}.${CU_VERSION:3:1}" - elif [[ ${#CU_VERSION} -eq 5 ]]; then - CUDA_VERSION="${CU_VERSION:2:2}.${CU_VERSION:4:1}" - fi +# if [[ ${#CU_VERSION} -eq 4 ]]; then +# CUDA_VERSION="${CU_VERSION:2:1}.${CU_VERSION:3:1}" +# elif [[ ${#CU_VERSION} -eq 5 ]]; then +# CUDA_VERSION="${CU_VERSION:2:2}.${CU_VERSION:4:1}" +# fi echo "Using CUDA $CUDA_VERSION as determined by CU_VERSION ($CU_VERSION)" version="$(python -c "print('.'.join(\"${CUDA_VERSION}\".split('.')[:2]))")" cudatoolkit="cudatoolkit=${version}" @@ -45,11 +45,11 @@ if [ "${CU_VERSION:-}" == cpu ] ; then pip3 install torch torchvision torchaudio --extra-index-url https://download.pytorch.org/whl/cpu else # conda install -y pytorch torchvision cudatoolkit=11.3 -c pytorch - pip3 install torch torchvision torchaudio --extra-index-url https://download.pytorch.org/whl/cu113 + pip3 install torch torchvision torchaudio --extra-index-url https://download.pytorch.org/whl/cu102 fi printf "Installing functorch\n" -pip3 install functorch +pip install --user git+https://github.com/pytorch/functorch@v0.2.0 # smoke test python -c "import functorch" diff --git a/.circleci/unittest/linux_stable/scripts/run_test.sh b/.circleci/unittest/linux_stable/scripts/run_test.sh index 4b09823f6bc..79b934bea60 100755 --- a/.circleci/unittest/linux_stable/scripts/run_test.sh +++ b/.circleci/unittest/linux_stable/scripts/run_test.sh @@ -4,7 +4,6 @@ set -e eval "$(./conda/bin/conda shell.bash hook)" conda activate ./env -export CUDA_VERSION=11.3 pip3 install pyrender pip3 install pyopengl --upgrade From f6bbf1beb20fdfe137cf659a9aaf8a8c74f9b3c7 Mon Sep 17 00:00:00 2001 From: Tony Tong Date: Fri, 5 Aug 2022 12:44:58 -0400 Subject: [PATCH 38/44] update ld path --- .circleci/unittest/linux_stable/scripts/setup_env.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/unittest/linux_stable/scripts/setup_env.sh b/.circleci/unittest/linux_stable/scripts/setup_env.sh index 5938d6469df..3764c58d65e 100755 --- a/.circleci/unittest/linux_stable/scripts/setup_env.sh +++ b/.circleci/unittest/linux_stable/scripts/setup_env.sh @@ -64,7 +64,7 @@ export MUJOCO_GL=$PRIVATE_MUJOCO_GL conda env config vars set 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=$root_dir/.mujoco/mujoco210/bin \ + LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$root_dir/.mujoco/mujoco210/bin:${root_dir}/conda/lib \ SDL_VIDEODRIVER=dummy \ MUJOCO_GL=$PRIVATE_MUJOCO_GL \ PYOPENGL_PLATFORM=egl From a83881a3897012c9106a81b1941929bb8a201339 Mon Sep 17 00:00:00 2001 From: Tony Tong Date: Fri, 5 Aug 2022 13:41:00 -0400 Subject: [PATCH 39/44] dont' load env --- .circleci/config.yml | 2 +- .circleci/unittest/linux_stable/scripts/install.sh | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 8aa7dc9855b..3977e330a83 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -481,7 +481,7 @@ jobs: command: docker run -t --gpus all -v $PWD:$PWD -w $PWD -e UPLOAD_CHANNEL -e CU_VERSION "${image_name}" .circleci/unittest/linux_stable/scripts/install.sh - run: name: Run tests - command: docker run --env-file ./env.list -t --gpus all -v $PWD:$PWD -w $PWD "${image_name}" .circleci/unittest/linux_stable/scripts/run_test.sh + command: docker run -t --gpus all -v $PWD:$PWD -w $PWD "${image_name}" .circleci/unittest/linux_stable/scripts/run_test.sh - run: name: Post Process command: docker run -t --gpus all -v $PWD:$PWD -w $PWD "${image_name}" .circleci/unittest/linux_stable/scripts/post_process.sh diff --git a/.circleci/unittest/linux_stable/scripts/install.sh b/.circleci/unittest/linux_stable/scripts/install.sh index 7de8fd6c9d4..717af1fa839 100755 --- a/.circleci/unittest/linux_stable/scripts/install.sh +++ b/.circleci/unittest/linux_stable/scripts/install.sh @@ -19,11 +19,11 @@ if [ "${CU_VERSION:-}" == cpu ] ; then version="cpu" echo "Using cpu build" else -# if [[ ${#CU_VERSION} -eq 4 ]]; then -# CUDA_VERSION="${CU_VERSION:2:1}.${CU_VERSION:3:1}" -# elif [[ ${#CU_VERSION} -eq 5 ]]; then -# CUDA_VERSION="${CU_VERSION:2:2}.${CU_VERSION:4:1}" -# fi + if [[ ${#CU_VERSION} -eq 4 ]]; then + CUDA_VERSION="${CU_VERSION:2:1}.${CU_VERSION:3:1}" + elif [[ ${#CU_VERSION} -eq 5 ]]; then + CUDA_VERSION="${CU_VERSION:2:2}.${CU_VERSION:4:1}" + fi echo "Using CUDA $CUDA_VERSION as determined by CU_VERSION ($CU_VERSION)" version="$(python -c "print('.'.join(\"${CUDA_VERSION}\".split('.')[:2]))")" cudatoolkit="cudatoolkit=${version}" @@ -45,11 +45,11 @@ if [ "${CU_VERSION:-}" == cpu ] ; then pip3 install torch torchvision torchaudio --extra-index-url https://download.pytorch.org/whl/cpu else # conda install -y pytorch torchvision cudatoolkit=11.3 -c pytorch - pip3 install torch torchvision torchaudio --extra-index-url https://download.pytorch.org/whl/cu102 + pip3 install torch torchvision torchaudio --extra-index-url https://download.pytorch.org/whl/cu113 fi printf "Installing functorch\n" -pip install --user git+https://github.com/pytorch/functorch@v0.2.0 +pip3 install functorch # smoke test python -c "import functorch" From cfa95ae3c986d903cb8ea392cae0cdc2fa8a0701 Mon Sep 17 00:00:00 2001 From: Tony Tong Date: Fri, 5 Aug 2022 13:56:38 -0400 Subject: [PATCH 40/44] emm --- .circleci/unittest/linux_stable/scripts/run_test.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/unittest/linux_stable/scripts/run_test.sh b/.circleci/unittest/linux_stable/scripts/run_test.sh index 79b934bea60..67746e8db7a 100755 --- a/.circleci/unittest/linux_stable/scripts/run_test.sh +++ b/.circleci/unittest/linux_stable/scripts/run_test.sh @@ -8,8 +8,8 @@ conda activate ./env pip3 install pyrender pip3 install pyopengl --upgrade -export MUJOCO_GL=egl -export PYOPENGL_PLATFORM=egl +export MUJOCO_GL=glfw +export PYOPENGL_PLATFORM=glfw export __GL_SHADER_DISK_CACHE=0 export __GL_SHADER_DISK_CACHE_PATH=/tmp printf "DISPLAY:$DISPLAY-->\n" From c8a16a4d76a373bbd344f9470f74196feabe826a Mon Sep 17 00:00:00 2001 From: Tony Tong Date: Fri, 5 Aug 2022 14:12:06 -0400 Subject: [PATCH 41/44] run with less tests --- .circleci/config.yml | 146 +++++++++--------- .../unittest/linux_stable/scripts/run_test.sh | 33 +++- 2 files changed, 104 insertions(+), 75 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 3977e330a83..e0bac2a447d 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -656,30 +656,30 @@ workflows: unittest: jobs: - - unittest_macos_cpu: - cu_version: cpu - name: unittest_macos_cpu_py3.7 - python_version: '3.7' - - unittest_linux_cpu: - cu_version: cpu - name: unittest_linux_cpu_py3.7 - python_version: '3.7' - - unittest_linux_gpu: - cu_version: cu113 - name: unittest_linux_gpu_py3.7 - python_version: '3.7' - - unittest_linux_optdeps_gpu: - cu_version: cu113 - name: unittest_linux_optdeps_gpu_py3.7 - python_version: '3.7' - - unittest_linux_stable_cpu: - cu_version: cpu - name: unittest_linux_stable_cpu_py3.7 - python_version: '3.7' - - unittest_linux_stable_gpu: - cu_version: cu113 - name: unittest_linux_stable_gpu_py3.7 - python_version: '3.7' +# - unittest_macos_cpu: +# cu_version: cpu +# name: unittest_macos_cpu_py3.7 +# python_version: '3.7' +# - unittest_linux_cpu: +# cu_version: cpu +# name: unittest_linux_cpu_py3.7 +# python_version: '3.7' +# - unittest_linux_gpu: +# cu_version: cu113 +# name: unittest_linux_gpu_py3.7 +# python_version: '3.7' +# - unittest_linux_optdeps_gpu: +# cu_version: cu113 +# name: unittest_linux_optdeps_gpu_py3.7 +# python_version: '3.7' +# - unittest_linux_stable_cpu: +# cu_version: cpu +# name: unittest_linux_stable_cpu_py3.7 +# python_version: '3.7' +# - unittest_linux_stable_gpu: +# cu_version: cu113 +# name: unittest_linux_stable_gpu_py3.7 +# python_version: '3.7' - unittest_macos_cpu: cu_version: cpu @@ -706,52 +706,52 @@ workflows: name: unittest_linux_stable_gpu_py3.8 python_version: '3.8' - - unittest_macos_cpu: - cu_version: cpu - name: unittest_macos_cpu_py3.9 - python_version: '3.9' - - unittest_linux_cpu: - cu_version: cpu - name: unittest_linux_cpu_py3.9 - python_version: '3.9' - - unittest_linux_gpu: - cu_version: cu113 - name: unittest_linux_gpu_py3.9 - python_version: '3.9' - - unittest_linux_optdeps_gpu: - cu_version: cu113 - name: unittest_linux_optdeps_gpu_py3.9 - python_version: '3.9' - - unittest_linux_stable_cpu: - cu_version: cpu - name: unittest_linux_stable_cpu_py3.9 - python_version: '3.9' - - unittest_linux_stable_gpu: - cu_version: cu113 - name: unittest_linux_stable_gpu_py3.9 - python_version: '3.9' - - - unittest_macos_cpu: - cu_version: cpu - name: unittest_macos_cpu_py3.10 - python_version: '3.10' - - unittest_linux_cpu: - cu_version: cpu - name: unittest_linux_cpu_py3.10 - python_version: '3.10' - - unittest_linux_gpu: - cu_version: cu113 - name: unittest_linux_gpu_py3.10 - python_version: '3.10' - - unittest_linux_optdeps_gpu: - cu_version: cu113 - name: unittest_linux_optdeps_gpu_py3.10 - python_version: '3.10' - - unittest_linux_stable_cpu: - cu_version: cpu - name: unittest_linux_stable_cpu_py3.10 - python_version: '3.10' - - unittest_linux_stable_gpu: - cu_version: cu113 - name: unittest_linux_stable_gpu_py3.10 - python_version: '3.10' +# - unittest_macos_cpu: +# cu_version: cpu +# name: unittest_macos_cpu_py3.9 +# python_version: '3.9' +# - unittest_linux_cpu: +# cu_version: cpu +# name: unittest_linux_cpu_py3.9 +# python_version: '3.9' +# - unittest_linux_gpu: +# cu_version: cu113 +# name: unittest_linux_gpu_py3.9 +# python_version: '3.9' +# - unittest_linux_optdeps_gpu: +# cu_version: cu113 +# name: unittest_linux_optdeps_gpu_py3.9 +# python_version: '3.9' +# - unittest_linux_stable_cpu: +# cu_version: cpu +# name: unittest_linux_stable_cpu_py3.9 +# python_version: '3.9' +# - unittest_linux_stable_gpu: +# cu_version: cu113 +# name: unittest_linux_stable_gpu_py3.9 +# python_version: '3.9' +# +# - unittest_macos_cpu: +# cu_version: cpu +# name: unittest_macos_cpu_py3.10 +# python_version: '3.10' +# - unittest_linux_cpu: +# cu_version: cpu +# name: unittest_linux_cpu_py3.10 +# python_version: '3.10' +# - unittest_linux_gpu: +# cu_version: cu113 +# name: unittest_linux_gpu_py3.10 +# python_version: '3.10' +# - unittest_linux_optdeps_gpu: +# cu_version: cu113 +# name: unittest_linux_optdeps_gpu_py3.10 +# python_version: '3.10' +# - unittest_linux_stable_cpu: +# cu_version: cpu +# name: unittest_linux_stable_cpu_py3.10 +# python_version: '3.10' +# - unittest_linux_stable_gpu: +# cu_version: cu113 +# name: unittest_linux_stable_gpu_py3.10 +# python_version: '3.10' diff --git a/.circleci/unittest/linux_stable/scripts/run_test.sh b/.circleci/unittest/linux_stable/scripts/run_test.sh index 67746e8db7a..cc77e79d501 100755 --- a/.circleci/unittest/linux_stable/scripts/run_test.sh +++ b/.circleci/unittest/linux_stable/scripts/run_test.sh @@ -5,11 +5,40 @@ set -e eval "$(./conda/bin/conda shell.bash hook)" conda activate ./env +unset NV_LIBNCCL_PACKAGE_NAME +unset NV_LIBCUBLAS_DEV_VERSION +unset NV_LIBNPP_VERSION +unset NV_LIBNPP_DEV_VERSION +unset NV_CUDA_LIB_VERSION +unset NV_NVML_DEV_VERSION +unset NVIDIA_VISIBLE_DEVICES +unset NV_LIBNCCL_PACKAGE_VERSION +unset NV_NVTX_VERSION +unset NV_NVPROF_VERSION +unset NVIDIA_DRIVER_CAPABILITIES +unset NV_LIBNCCL_DEV_PACKAGE +unset NV_LIBCUBLAS_VERSION +unset NV_LIBNCCL_DEV_PACKAGE_VERSION +unset NV_CUDA_CUDART_VERSION +unset __CONDA_SHLVL_1_LD_LIBRARY_PATH +unset NVARCH +unset NV_CUDA_CUDART_DEV_VERSION +unset CUDA_VERSION +unset NV_LIBCUBLAS_PACKAGE +unset NV_LIBCUBLAS_PACKAGE_NAME +unset NCCL_VERSION +unset NV_LIBNCCL_PACKAGE +unset NV_LIBCUBLAS_DEV_PACKAGE_NAME +unset NV_LIBNCCL_DEV_PACKAGE_NAME +unset NV_LIBCUBLAS_DEV_PACKAGE + pip3 install pyrender pip3 install pyopengl --upgrade +pip3 uninstall dm_control +pip3 install dm_control -export MUJOCO_GL=glfw -export PYOPENGL_PLATFORM=glfw +export MUJOCO_GL=egl +export PYOPENGL_PLATFORM=egl export __GL_SHADER_DISK_CACHE=0 export __GL_SHADER_DISK_CACHE_PATH=/tmp printf "DISPLAY:$DISPLAY-->\n" From 8ca2bfa6e6ed7baa34aa2d0e49aab22916fcf1bc Mon Sep 17 00:00:00 2001 From: Tony Tong Date: Fri, 5 Aug 2022 14:38:37 -0400 Subject: [PATCH 42/44] -y --- .circleci/unittest/linux_stable/scripts/run_test.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/unittest/linux_stable/scripts/run_test.sh b/.circleci/unittest/linux_stable/scripts/run_test.sh index cc77e79d501..f4b615dbf02 100755 --- a/.circleci/unittest/linux_stable/scripts/run_test.sh +++ b/.circleci/unittest/linux_stable/scripts/run_test.sh @@ -34,7 +34,7 @@ unset NV_LIBCUBLAS_DEV_PACKAGE pip3 install pyrender pip3 install pyopengl --upgrade -pip3 uninstall dm_control +pip3 uninstall -y dm_control pip3 install dm_control export MUJOCO_GL=egl From c2febb6fd750814c49ef2ea367319af4ce203e92 Mon Sep 17 00:00:00 2001 From: Tony Tong Date: Fri, 5 Aug 2022 15:14:16 -0400 Subject: [PATCH 43/44] unset early --- .../unittest/linux_stable/scripts/run_test.sh | 32 ------------------- .../linux_stable/scripts/setup_env.sh | 29 +++++++++++++++++ 2 files changed, 29 insertions(+), 32 deletions(-) diff --git a/.circleci/unittest/linux_stable/scripts/run_test.sh b/.circleci/unittest/linux_stable/scripts/run_test.sh index f4b615dbf02..4e3afae9833 100755 --- a/.circleci/unittest/linux_stable/scripts/run_test.sh +++ b/.circleci/unittest/linux_stable/scripts/run_test.sh @@ -5,38 +5,6 @@ set -e eval "$(./conda/bin/conda shell.bash hook)" conda activate ./env -unset NV_LIBNCCL_PACKAGE_NAME -unset NV_LIBCUBLAS_DEV_VERSION -unset NV_LIBNPP_VERSION -unset NV_LIBNPP_DEV_VERSION -unset NV_CUDA_LIB_VERSION -unset NV_NVML_DEV_VERSION -unset NVIDIA_VISIBLE_DEVICES -unset NV_LIBNCCL_PACKAGE_VERSION -unset NV_NVTX_VERSION -unset NV_NVPROF_VERSION -unset NVIDIA_DRIVER_CAPABILITIES -unset NV_LIBNCCL_DEV_PACKAGE -unset NV_LIBCUBLAS_VERSION -unset NV_LIBNCCL_DEV_PACKAGE_VERSION -unset NV_CUDA_CUDART_VERSION -unset __CONDA_SHLVL_1_LD_LIBRARY_PATH -unset NVARCH -unset NV_CUDA_CUDART_DEV_VERSION -unset CUDA_VERSION -unset NV_LIBCUBLAS_PACKAGE -unset NV_LIBCUBLAS_PACKAGE_NAME -unset NCCL_VERSION -unset NV_LIBNCCL_PACKAGE -unset NV_LIBCUBLAS_DEV_PACKAGE_NAME -unset NV_LIBNCCL_DEV_PACKAGE_NAME -unset NV_LIBCUBLAS_DEV_PACKAGE - -pip3 install pyrender -pip3 install pyopengl --upgrade -pip3 uninstall -y dm_control -pip3 install dm_control - export MUJOCO_GL=egl export PYOPENGL_PLATFORM=egl export __GL_SHADER_DISK_CACHE=0 diff --git a/.circleci/unittest/linux_stable/scripts/setup_env.sh b/.circleci/unittest/linux_stable/scripts/setup_env.sh index 3764c58d65e..a8bee276b41 100755 --- a/.circleci/unittest/linux_stable/scripts/setup_env.sh +++ b/.circleci/unittest/linux_stable/scripts/setup_env.sh @@ -22,6 +22,35 @@ case "$(uname -s)" in *) os=Linux esac + +printenv +unset NV_LIBNCCL_PACKAGE_NAME +unset NV_LIBCUBLAS_DEV_VERSION +unset NV_LIBNPP_VERSION +unset NV_LIBNPP_DEV_VERSION +unset NV_CUDA_LIB_VERSION +unset NV_NVML_DEV_VERSION +unset NVIDIA_VISIBLE_DEVICES +unset NV_LIBNCCL_PACKAGE_VERSION +unset NV_NVTX_VERSION +unset NV_NVPROF_VERSION +unset NVIDIA_DRIVER_CAPABILITIES +unset NV_LIBNCCL_DEV_PACKAGE +unset NV_LIBCUBLAS_VERSION +unset NV_LIBNCCL_DEV_PACKAGE_VERSION +unset NV_CUDA_CUDART_VERSION +unset __CONDA_SHLVL_1_LD_LIBRARY_PATH +unset NVARCH +unset NV_CUDA_CUDART_DEV_VERSION +unset CUDA_VERSION +unset NV_LIBCUBLAS_PACKAGE +unset NV_LIBCUBLAS_PACKAGE_NAME +unset NCCL_VERSION +unset NV_LIBNCCL_PACKAGE +unset NV_LIBCUBLAS_DEV_PACKAGE_NAME +unset NV_LIBNCCL_DEV_PACKAGE_NAME +unset NV_LIBCUBLAS_DEV_PACKAGE +printenv # 1. Install conda at ./conda if [ ! -d "${conda_dir}" ]; then printf "* Installing conda\n" From b65faaed559db320d7ecb91ad2ba498d341aa9bf Mon Sep 17 00:00:00 2001 From: Tony Tong Date: Fri, 5 Aug 2022 15:37:08 -0400 Subject: [PATCH 44/44] last try --- .../unittest/linux_stable/scripts/run_test.sh | 5 +++- .../linux_stable/scripts/setup_env.sh | 29 ------------------- 2 files changed, 4 insertions(+), 30 deletions(-) diff --git a/.circleci/unittest/linux_stable/scripts/run_test.sh b/.circleci/unittest/linux_stable/scripts/run_test.sh index 4e3afae9833..2a98092eb84 100755 --- a/.circleci/unittest/linux_stable/scripts/run_test.sh +++ b/.circleci/unittest/linux_stable/scripts/run_test.sh @@ -5,6 +5,9 @@ set -e eval "$(./conda/bin/conda shell.bash hook)" conda activate ./env +pip3 install pyrender +pip3 install pyopengl --upgrade + export MUJOCO_GL=egl export PYOPENGL_PLATFORM=egl export __GL_SHADER_DISK_CACHE=0 @@ -24,7 +27,7 @@ lib_dir="${env_dir}/lib" export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$lib_dir printf "LD_LIBRARY_PATH:$LD_LIBRARY_PATH-->\n" export MKL_THREADING_LAYER=GNU - +export PATH=/home/circleci/project/env/bin:/home/circleci/project/conda/condabin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin printenv pytest test/smoke_test.py -v --durations 20 diff --git a/.circleci/unittest/linux_stable/scripts/setup_env.sh b/.circleci/unittest/linux_stable/scripts/setup_env.sh index a8bee276b41..3764c58d65e 100755 --- a/.circleci/unittest/linux_stable/scripts/setup_env.sh +++ b/.circleci/unittest/linux_stable/scripts/setup_env.sh @@ -22,35 +22,6 @@ case "$(uname -s)" in *) os=Linux esac - -printenv -unset NV_LIBNCCL_PACKAGE_NAME -unset NV_LIBCUBLAS_DEV_VERSION -unset NV_LIBNPP_VERSION -unset NV_LIBNPP_DEV_VERSION -unset NV_CUDA_LIB_VERSION -unset NV_NVML_DEV_VERSION -unset NVIDIA_VISIBLE_DEVICES -unset NV_LIBNCCL_PACKAGE_VERSION -unset NV_NVTX_VERSION -unset NV_NVPROF_VERSION -unset NVIDIA_DRIVER_CAPABILITIES -unset NV_LIBNCCL_DEV_PACKAGE -unset NV_LIBCUBLAS_VERSION -unset NV_LIBNCCL_DEV_PACKAGE_VERSION -unset NV_CUDA_CUDART_VERSION -unset __CONDA_SHLVL_1_LD_LIBRARY_PATH -unset NVARCH -unset NV_CUDA_CUDART_DEV_VERSION -unset CUDA_VERSION -unset NV_LIBCUBLAS_PACKAGE -unset NV_LIBCUBLAS_PACKAGE_NAME -unset NCCL_VERSION -unset NV_LIBNCCL_PACKAGE -unset NV_LIBCUBLAS_DEV_PACKAGE_NAME -unset NV_LIBNCCL_DEV_PACKAGE_NAME -unset NV_LIBCUBLAS_DEV_PACKAGE -printenv # 1. Install conda at ./conda if [ ! -d "${conda_dir}" ]; then printf "* Installing conda\n"