From a816d0cd7f6ddd39c711f8aba36e9a958eb59ba9 Mon Sep 17 00:00:00 2001 From: Tony Tong Date: Wed, 3 Aug 2022 00:32:54 -0400 Subject: [PATCH 01/49] 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/49] 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/49] 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/49] 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/49] 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/49] 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/49] 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/49] 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/49] 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/49] 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/49] 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/49] 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/49] 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/49] 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/49] 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/49] 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/49] 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/49] 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/49] 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/49] 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/49] 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/49] 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/49] 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/49] 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/49] 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 7f27626dd8c7f737b6c3b7523719438ca7316177 Mon Sep 17 00:00:00 2001 From: vmoens Date: Fri, 5 Aug 2022 10:37:49 +0200 Subject: [PATCH 26/49] init --- .circleci/unittest/linux/scripts/setup_env.sh | 9 ++++++--- .circleci/unittest/linux_stable/scripts/setup_env.sh | 9 ++++++--- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/.circleci/unittest/linux/scripts/setup_env.sh b/.circleci/unittest/linux/scripts/setup_env.sh index 3713e93071e..73f58c7ccd2 100755 --- a/.circleci/unittest/linux/scripts/setup_env.sh +++ b/.circleci/unittest/linux/scripts/setup_env.sh @@ -56,17 +56,17 @@ 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 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 \ 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 @@ -78,3 +78,6 @@ if [[ $MUJOCO_GL == 'osmesa' ]]; then fi conda env update --file "${this_dir}/environment.yml" --prune + +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 e2df45887d7..fa7afe211a4 100755 --- a/.circleci/unittest/linux_stable/scripts/setup_env.sh +++ b/.circleci/unittest/linux_stable/scripts/setup_env.sh @@ -57,17 +57,17 @@ 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 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 \ 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 @@ -79,3 +79,6 @@ if [[ $MUJOCO_GL == 'osmesa' ]]; then fi conda env update --file "${this_dir}/environment.yml" --prune + +pip3 install pyrender +pip3 install pyopengl --upgrade From 9e777b8c08ffd8083e833c054461bdfcbbd4cbba Mon Sep 17 00:00:00 2001 From: vmoens Date: Fri, 5 Aug 2022 11:21:49 +0200 Subject: [PATCH 27/49] amend --- .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 73f58c7ccd2..ab7d1ac66d1 100755 --- a/.circleci/unittest/linux/scripts/setup_env.sh +++ b/.circleci/unittest/linux/scripts/setup_env.sh @@ -69,12 +69,14 @@ conda env config vars set MUJOCO_PY_MUJOCO_PATH=$root_dir/.mujoco/mujoco210 \ 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 yum install -y mesa-libGL yum install -y mesa-libOSMesa-devel +# yum -y install egl-utils +# yum -y install freeglut 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 fa7afe211a4..4f5d7d24353 100755 --- a/.circleci/unittest/linux_stable/scripts/setup_env.sh +++ b/.circleci/unittest/linux_stable/scripts/setup_env.sh @@ -70,12 +70,14 @@ conda env config vars set MUJOCO_PY_MUJOCO_PATH=$root_dir/.mujoco/mujoco210 \ 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 yum install -y mesa-libGL yum install -y mesa-libOSMesa-devel +# yum -y install egl-utils +# yum -y install freeglut fi conda env update --file "${this_dir}/environment.yml" --prune From 565532ec0538aa8dc9d95448e1505c6e75fe5344 Mon Sep 17 00:00:00 2001 From: vmoens Date: Fri, 5 Aug 2022 11:44:32 +0200 Subject: [PATCH 28/49] amend --- .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 ab7d1ac66d1..7e1f3a07c43 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=egl diff --git a/.circleci/unittest/linux_stable/scripts/setup_env.sh b/.circleci/unittest/linux_stable/scripts/setup_env.sh index 4f5d7d24353..c953b1729c7 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=egl From 41ff12957113eb9b1da11407273a86fc8ad9f81e Mon Sep 17 00:00:00 2001 From: vmoens Date: Fri, 5 Aug 2022 12:12:07 +0200 Subject: [PATCH 29/49] amend --- .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 7e1f3a07c43..1718c867d33 100755 --- a/.circleci/unittest/linux/scripts/setup_env.sh +++ b/.circleci/unittest/linux/scripts/setup_env.sh @@ -75,8 +75,8 @@ if [[ $MUJOCO_GL == 'egl' ]]; then yum install -y glew yum install -y mesa-libGL yum install -y mesa-libOSMesa-devel -# yum -y install egl-utils -# yum -y install freeglut + yum -y install egl-utils + yum -y install freeglut 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 c953b1729c7..da9054c9968 100755 --- a/.circleci/unittest/linux_stable/scripts/setup_env.sh +++ b/.circleci/unittest/linux_stable/scripts/setup_env.sh @@ -76,8 +76,8 @@ if [[ $MUJOCO_GL == 'egl' ]]; then yum install -y glew yum install -y mesa-libGL yum install -y mesa-libOSMesa-devel -# yum -y install egl-utils -# yum -y install freeglut + yum -y install egl-utils + yum -y install freeglut fi conda env update --file "${this_dir}/environment.yml" --prune From 1024a02693f818aab49c6974298dfbc273751627 Mon Sep 17 00:00:00 2001 From: vmoens Date: Fri, 5 Aug 2022 12:31:41 +0200 Subject: [PATCH 30/49] amend --- .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 1718c867d33..f025cfc4deb 100755 --- a/.circleci/unittest/linux/scripts/setup_env.sh +++ b/.circleci/unittest/linux/scripts/setup_env.sh @@ -82,4 +82,4 @@ fi conda env update --file "${this_dir}/environment.yml" --prune pip3 install pyrender -pip3 install pyopengl --upgrade +#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 da9054c9968..73247422012 100755 --- a/.circleci/unittest/linux_stable/scripts/setup_env.sh +++ b/.circleci/unittest/linux_stable/scripts/setup_env.sh @@ -83,4 +83,4 @@ fi conda env update --file "${this_dir}/environment.yml" --prune pip3 install pyrender -pip3 install pyopengl --upgrade +#pip3 install pyopengl --upgrade From 09bb2944268d597b6b375e232a580b7ebe0dba63 Mon Sep 17 00:00:00 2001 From: vmoens Date: Fri, 5 Aug 2022 14:27:59 +0200 Subject: [PATCH 31/49] amend --- .circleci/unittest/linux/scripts/run_test.sh | 2 ++ .circleci/unittest/linux_stable/scripts/run_test.sh | 2 ++ 2 files changed, 4 insertions(+) diff --git a/.circleci/unittest/linux/scripts/run_test.sh b/.circleci/unittest/linux/scripts/run_test.sh index fea33f15774..a868d12ef05 100755 --- a/.circleci/unittest/linux/scripts/run_test.sh +++ b/.circleci/unittest/linux/scripts/run_test.sh @@ -5,6 +5,8 @@ set -e eval "$(./conda/bin/conda shell.bash hook)" conda activate ./env +pip3 install pyopengl --upgrade + 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/run_test.sh b/.circleci/unittest/linux_stable/scripts/run_test.sh index fea33f15774..a868d12ef05 100755 --- a/.circleci/unittest/linux_stable/scripts/run_test.sh +++ b/.circleci/unittest/linux_stable/scripts/run_test.sh @@ -5,6 +5,8 @@ set -e eval "$(./conda/bin/conda shell.bash hook)" conda activate ./env +pip3 install pyopengl --upgrade + export PYTORCH_TEST_WITH_SLOW='1' python -m torch.utils.collect_env # Avoid error: "fatal: unsafe repository" From 4cddd6e32cf032ae538a68009c3937ab84422dc8 Mon Sep 17 00:00:00 2001 From: vmoens Date: Fri, 5 Aug 2022 15:48:17 +0200 Subject: [PATCH 32/49] amend --- .circleci/unittest/linux/scripts/run_test.sh | 3 +++ .circleci/unittest/linux_stable/scripts/run_test.sh | 2 ++ 2 files changed, 5 insertions(+) diff --git a/.circleci/unittest/linux/scripts/run_test.sh b/.circleci/unittest/linux/scripts/run_test.sh index a868d12ef05..6ae26fb0395 100755 --- a/.circleci/unittest/linux/scripts/run_test.sh +++ b/.circleci/unittest/linux/scripts/run_test.sh @@ -7,6 +7,7 @@ conda activate ./env pip3 install pyopengl --upgrade + export PYTORCH_TEST_WITH_SLOW='1' python -m torch.utils.collect_env # Avoid error: "fatal: unsafe repository" @@ -20,6 +21,8 @@ lib_dir="${env_dir}/lib" export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$lib_dir export MKL_THREADING_LAYER=GNU +echo `printenv` + pytest test/smoke_test.py -v --durations 20 pytest test/smoke_test_deps.py -v --durations 20 pytest --instafail -v --durations 20 diff --git a/.circleci/unittest/linux_stable/scripts/run_test.sh b/.circleci/unittest/linux_stable/scripts/run_test.sh index a868d12ef05..4bb99c8b03a 100755 --- a/.circleci/unittest/linux_stable/scripts/run_test.sh +++ b/.circleci/unittest/linux_stable/scripts/run_test.sh @@ -20,6 +20,8 @@ lib_dir="${env_dir}/lib" export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$lib_dir export MKL_THREADING_LAYER=GNU +echo `printenv` + pytest test/smoke_test.py -v --durations 20 pytest test/smoke_test_deps.py -v --durations 20 pytest --instafail -v --durations 20 From 650afc189f1455df3b2ef0e9bcd6ab51c1bac452 Mon Sep 17 00:00:00 2001 From: vmoens Date: Fri, 5 Aug 2022 18:47:11 +0200 Subject: [PATCH 33/49] amend --- .circleci/unittest/linux/scripts/run_test.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.circleci/unittest/linux/scripts/run_test.sh b/.circleci/unittest/linux/scripts/run_test.sh index 6ae26fb0395..fcb6d9bf8c1 100755 --- a/.circleci/unittest/linux/scripts/run_test.sh +++ b/.circleci/unittest/linux/scripts/run_test.sh @@ -6,7 +6,10 @@ eval "$(./conda/bin/conda shell.bash hook)" conda activate ./env pip3 install pyopengl --upgrade - +unset CUDA_VERSION +export PYENV_ROOT=/opt/circleci/.pyenv +export PYENV_SHELL=bash +export TERM=xterm-256color export PYTORCH_TEST_WITH_SLOW='1' python -m torch.utils.collect_env From 0fb5793396143ff5b95e85e4e27876862b829b18 Mon Sep 17 00:00:00 2001 From: vmoens Date: Fri, 5 Aug 2022 19:02:11 +0200 Subject: [PATCH 34/49] amend --- .circleci/unittest/linux/scripts/run_test.sh | 27 ++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/.circleci/unittest/linux/scripts/run_test.sh b/.circleci/unittest/linux/scripts/run_test.sh index fcb6d9bf8c1..f1e16770f35 100755 --- a/.circleci/unittest/linux/scripts/run_test.sh +++ b/.circleci/unittest/linux/scripts/run_test.sh @@ -7,6 +7,33 @@ conda activate ./env pip3 install pyopengl --upgrade unset CUDA_VERSION + +unset NCCL_VERSION +unset NVARCH +unset NVIDIA_DRIVER_CAPABILITIES +unset NVIDIA_REQUIRE_CUDA +unset NVIDIA_VISIBLE_DEVICES +unset NV_CUDA_CUDART_DEV_VERSION +unset NV_CUDA_CUDART_VERSION +unset NV_CUDA_LIB_VERSION +unset NV_LIBCUBLAS_DEV_PACKAGE +unset NV_LIBCUBLAS_DEV_PACKAGE_NAME +unset NV_LIBCUBLAS_DEV_VERSION +unset NV_LIBCUBLAS_PACKAGE +unset NV_LIBCUBLAS_PACKAGE_NAME +unset NV_LIBCUBLAS_VERSION +unset NV_LIBNCCL_DEV_PACKAGE +unset NV_LIBNCCL_DEV_PACKAGE_NAME +unset NV_LIBNCCL_DEV_PACKAGE_VERSION +unset NV_LIBNCCL_PACKAGE +unset NV_LIBNCCL_PACKAGE_NAME +unset NV_LIBNCCL_PACKAGE_VERSION +unset NV_LIBNPP_DEV_VERSION +unset NV_LIBNPP_VERSION +unset NV_NVML_DEV_VERSION +unset NV_NVPROF_VERSION +unset NV_NVTX_VERSION + export PYENV_ROOT=/opt/circleci/.pyenv export PYENV_SHELL=bash export TERM=xterm-256color From 2c2d5e466b89f796fd63894459d0a1bd56003c2c Mon Sep 17 00:00:00 2001 From: vmoens Date: Fri, 5 Aug 2022 19:21:27 +0200 Subject: [PATCH 35/49] amend --- .circleci/unittest/linux/scripts/run_test.sh | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.circleci/unittest/linux/scripts/run_test.sh b/.circleci/unittest/linux/scripts/run_test.sh index f1e16770f35..65ece757e3f 100755 --- a/.circleci/unittest/linux/scripts/run_test.sh +++ b/.circleci/unittest/linux/scripts/run_test.sh @@ -37,6 +37,13 @@ unset NV_NVTX_VERSION export PYENV_ROOT=/opt/circleci/.pyenv export PYENV_SHELL=bash export TERM=xterm-256color +export DBUS_SESSION_BUS_ADDRESS=/dev/null +export JAVA_HOME=/usr/lib/jvm/java-11-openjdk-amd64 +export JDK_HOME=/usr/lib/jvm/java-11-openjdk-amd64 +export JRE_HOME=/usr/lib/jvm/java-11-openjdk-amd64 +export M2_HOME=/usr/local/apache-maven +export MAVEN_OPTS=-Xmx2048m +export PATH=/home/circleci/project/env/bin:/home/circleci/project/conda/condabin:/home/circleci/.yarn/bin:/home/circleci/.config/yarn/global/node_modules/.bin:/opt/android/sdk/ndk/23.0.7599858:/opt/android/sdk/emulator:/opt/android/sdk/cmdline-tools/latest/bin:/opt/android/sdk/tools:/opt/android/sdk/tools/bin:/opt/android/sdk/platform-tools:/opt/android/sdk/platform-tools/bin:/home/circleci/.go_workspace/bin:/usr/local/go/bin:/opt/circleci/.pyenv/shims:/opt/circleci/.pyenv/bin:/opt/google/google-cloud-sdk/bin:/usr/local/apache-maven/bin:/home/circleci/bin:/home/circleci/.yarn/bin:/home/circleci/.config/yarn/global/node_modules/.bin:/opt/android/sdk/ndk/23.0.7599858:/opt/android/sdk/emulator:/opt/android/sdk/cmdline-tools/latest/bin:/opt/android/sdk/tools:/opt/android/sdk/tools/bin:/opt/android/sdk/platform-tools:/opt/android/sdk/platform-tools/bin:/opt/circleci/.rvm/gems/ruby-3.0.2/bin:/opt/circleci/.rvm/gems/ruby-3.0.2@global/bin:/opt/circleci/.rvm/rubies/ruby-3.0.2/bin:/home/circleci/.go_workspace/bin:/usr/local/go/bin:/opt/circleci/.nvm/versions/node/v14.17.3/bin:/opt/circleci/.pyenv/shims:/opt/circleci/.pyenv/bin:/opt/google/google-cloud-sdk/bin:/usr/local/apache-maven/bin:/home/circleci/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/snap/bin:/usr/local/gradle-7.1.1/bin:/opt/circleci/.rvm/bin:/snap/bin:/opt/circleci/.rvm/bin:/usr/local/gradle-7.1.1/bin:/snap/bin:/opt/circleci/.rvm/bin export PYTORCH_TEST_WITH_SLOW='1' python -m torch.utils.collect_env From f10e164be1b153bda9fc1e48cc0f42cc1a4c3420 Mon Sep 17 00:00:00 2001 From: vmoens Date: Fri, 5 Aug 2022 19:45:40 +0200 Subject: [PATCH 36/49] LIBRARY_PATH --- .circleci/unittest/linux/scripts/run_test.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/.circleci/unittest/linux/scripts/run_test.sh b/.circleci/unittest/linux/scripts/run_test.sh index 65ece757e3f..d1c11a875b7 100755 --- a/.circleci/unittest/linux/scripts/run_test.sh +++ b/.circleci/unittest/linux/scripts/run_test.sh @@ -8,6 +8,7 @@ conda activate ./env pip3 install pyopengl --upgrade unset CUDA_VERSION +unset LIBRARY_PATH unset NCCL_VERSION unset NVARCH unset NVIDIA_DRIVER_CAPABILITIES From 47d3a32024416a2f5276ae5d56ddbc7fc22c1a31 Mon Sep 17 00:00:00 2001 From: vmoens Date: Fri, 5 Aug 2022 19:48:21 +0200 Subject: [PATCH 37/49] __CONDA_SHLVL_1_DISPLAY and __CONDA_SHLVL_1_LD_LIBRARY_PATH --- .circleci/unittest/linux/scripts/run_test.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.circleci/unittest/linux/scripts/run_test.sh b/.circleci/unittest/linux/scripts/run_test.sh index d1c11a875b7..f1523ef478b 100755 --- a/.circleci/unittest/linux/scripts/run_test.sh +++ b/.circleci/unittest/linux/scripts/run_test.sh @@ -8,7 +8,6 @@ conda activate ./env pip3 install pyopengl --upgrade unset CUDA_VERSION -unset LIBRARY_PATH unset NCCL_VERSION unset NVARCH unset NVIDIA_DRIVER_CAPABILITIES @@ -46,6 +45,10 @@ export M2_HOME=/usr/local/apache-maven export MAVEN_OPTS=-Xmx2048m export PATH=/home/circleci/project/env/bin:/home/circleci/project/conda/condabin:/home/circleci/.yarn/bin:/home/circleci/.config/yarn/global/node_modules/.bin:/opt/android/sdk/ndk/23.0.7599858:/opt/android/sdk/emulator:/opt/android/sdk/cmdline-tools/latest/bin:/opt/android/sdk/tools:/opt/android/sdk/tools/bin:/opt/android/sdk/platform-tools:/opt/android/sdk/platform-tools/bin:/home/circleci/.go_workspace/bin:/usr/local/go/bin:/opt/circleci/.pyenv/shims:/opt/circleci/.pyenv/bin:/opt/google/google-cloud-sdk/bin:/usr/local/apache-maven/bin:/home/circleci/bin:/home/circleci/.yarn/bin:/home/circleci/.config/yarn/global/node_modules/.bin:/opt/android/sdk/ndk/23.0.7599858:/opt/android/sdk/emulator:/opt/android/sdk/cmdline-tools/latest/bin:/opt/android/sdk/tools:/opt/android/sdk/tools/bin:/opt/android/sdk/platform-tools:/opt/android/sdk/platform-tools/bin:/opt/circleci/.rvm/gems/ruby-3.0.2/bin:/opt/circleci/.rvm/gems/ruby-3.0.2@global/bin:/opt/circleci/.rvm/rubies/ruby-3.0.2/bin:/home/circleci/.go_workspace/bin:/usr/local/go/bin:/opt/circleci/.nvm/versions/node/v14.17.3/bin:/opt/circleci/.pyenv/shims:/opt/circleci/.pyenv/bin:/opt/google/google-cloud-sdk/bin:/usr/local/apache-maven/bin:/home/circleci/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/snap/bin:/usr/local/gradle-7.1.1/bin:/opt/circleci/.rvm/bin:/snap/bin:/opt/circleci/.rvm/bin:/usr/local/gradle-7.1.1/bin:/snap/bin:/opt/circleci/.rvm/bin +unset LIBRARY_PATH +export __CONDA_SHLVL_1_DISPLAY=:99 +unset __CONDA_SHLVL_1_LD_LIBRARY_PATH + export PYTORCH_TEST_WITH_SLOW='1' python -m torch.utils.collect_env # Avoid error: "fatal: unsafe repository" From 2dc443cb6317406af9409b267eaade777aebf3a9 Mon Sep 17 00:00:00 2001 From: vmoens Date: Sat, 6 Aug 2022 08:10:24 +0100 Subject: [PATCH 38/49] amend --- .circleci/config.yml | 3 +- .circleci/unittest/linux/scripts/run_test.sh | 84 ++++++++++---------- 2 files changed, 44 insertions(+), 43 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 8aa7dc9855b..2e7b1fca841 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -328,7 +328,8 @@ jobs: command: docker run -t --gpus all -v $PWD:$PWD -w $PWD -e UPLOAD_CHANNEL -e CU_VERSION "${image_name}" .circleci/unittest/linux/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/scripts/run_test.sh + command: bash .circleci/unittest/linux/scripts/run_test.sh +# command: docker run --env-file ./env.list -t --gpus all -v $PWD:$PWD -w $PWD "${image_name}" .circleci/unittest/linux/scripts/run_test.sh - run: name: Post Process command: docker run -t --gpus all -v $PWD:$PWD -w $PWD "${image_name}" .circleci/unittest/linux/scripts/post_process.sh diff --git a/.circleci/unittest/linux/scripts/run_test.sh b/.circleci/unittest/linux/scripts/run_test.sh index f1523ef478b..d9604746895 100755 --- a/.circleci/unittest/linux/scripts/run_test.sh +++ b/.circleci/unittest/linux/scripts/run_test.sh @@ -6,48 +6,48 @@ eval "$(./conda/bin/conda shell.bash hook)" conda activate ./env pip3 install pyopengl --upgrade -unset CUDA_VERSION - -unset NCCL_VERSION -unset NVARCH -unset NVIDIA_DRIVER_CAPABILITIES -unset NVIDIA_REQUIRE_CUDA -unset NVIDIA_VISIBLE_DEVICES -unset NV_CUDA_CUDART_DEV_VERSION -unset NV_CUDA_CUDART_VERSION -unset NV_CUDA_LIB_VERSION -unset NV_LIBCUBLAS_DEV_PACKAGE -unset NV_LIBCUBLAS_DEV_PACKAGE_NAME -unset NV_LIBCUBLAS_DEV_VERSION -unset NV_LIBCUBLAS_PACKAGE -unset NV_LIBCUBLAS_PACKAGE_NAME -unset NV_LIBCUBLAS_VERSION -unset NV_LIBNCCL_DEV_PACKAGE -unset NV_LIBNCCL_DEV_PACKAGE_NAME -unset NV_LIBNCCL_DEV_PACKAGE_VERSION -unset NV_LIBNCCL_PACKAGE -unset NV_LIBNCCL_PACKAGE_NAME -unset NV_LIBNCCL_PACKAGE_VERSION -unset NV_LIBNPP_DEV_VERSION -unset NV_LIBNPP_VERSION -unset NV_NVML_DEV_VERSION -unset NV_NVPROF_VERSION -unset NV_NVTX_VERSION - -export PYENV_ROOT=/opt/circleci/.pyenv -export PYENV_SHELL=bash -export TERM=xterm-256color -export DBUS_SESSION_BUS_ADDRESS=/dev/null -export JAVA_HOME=/usr/lib/jvm/java-11-openjdk-amd64 -export JDK_HOME=/usr/lib/jvm/java-11-openjdk-amd64 -export JRE_HOME=/usr/lib/jvm/java-11-openjdk-amd64 -export M2_HOME=/usr/local/apache-maven -export MAVEN_OPTS=-Xmx2048m -export PATH=/home/circleci/project/env/bin:/home/circleci/project/conda/condabin:/home/circleci/.yarn/bin:/home/circleci/.config/yarn/global/node_modules/.bin:/opt/android/sdk/ndk/23.0.7599858:/opt/android/sdk/emulator:/opt/android/sdk/cmdline-tools/latest/bin:/opt/android/sdk/tools:/opt/android/sdk/tools/bin:/opt/android/sdk/platform-tools:/opt/android/sdk/platform-tools/bin:/home/circleci/.go_workspace/bin:/usr/local/go/bin:/opt/circleci/.pyenv/shims:/opt/circleci/.pyenv/bin:/opt/google/google-cloud-sdk/bin:/usr/local/apache-maven/bin:/home/circleci/bin:/home/circleci/.yarn/bin:/home/circleci/.config/yarn/global/node_modules/.bin:/opt/android/sdk/ndk/23.0.7599858:/opt/android/sdk/emulator:/opt/android/sdk/cmdline-tools/latest/bin:/opt/android/sdk/tools:/opt/android/sdk/tools/bin:/opt/android/sdk/platform-tools:/opt/android/sdk/platform-tools/bin:/opt/circleci/.rvm/gems/ruby-3.0.2/bin:/opt/circleci/.rvm/gems/ruby-3.0.2@global/bin:/opt/circleci/.rvm/rubies/ruby-3.0.2/bin:/home/circleci/.go_workspace/bin:/usr/local/go/bin:/opt/circleci/.nvm/versions/node/v14.17.3/bin:/opt/circleci/.pyenv/shims:/opt/circleci/.pyenv/bin:/opt/google/google-cloud-sdk/bin:/usr/local/apache-maven/bin:/home/circleci/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/snap/bin:/usr/local/gradle-7.1.1/bin:/opt/circleci/.rvm/bin:/snap/bin:/opt/circleci/.rvm/bin:/usr/local/gradle-7.1.1/bin:/snap/bin:/opt/circleci/.rvm/bin - -unset LIBRARY_PATH -export __CONDA_SHLVL_1_DISPLAY=:99 -unset __CONDA_SHLVL_1_LD_LIBRARY_PATH +#unset CUDA_VERSION +# +#unset NCCL_VERSION +#unset NVARCH +#unset NVIDIA_DRIVER_CAPABILITIES +#unset NVIDIA_REQUIRE_CUDA +#unset NVIDIA_VISIBLE_DEVICES +#unset NV_CUDA_CUDART_DEV_VERSION +#unset NV_CUDA_CUDART_VERSION +#unset NV_CUDA_LIB_VERSION +#unset NV_LIBCUBLAS_DEV_PACKAGE +#unset NV_LIBCUBLAS_DEV_PACKAGE_NAME +#unset NV_LIBCUBLAS_DEV_VERSION +#unset NV_LIBCUBLAS_PACKAGE +#unset NV_LIBCUBLAS_PACKAGE_NAME +#unset NV_LIBCUBLAS_VERSION +#unset NV_LIBNCCL_DEV_PACKAGE +#unset NV_LIBNCCL_DEV_PACKAGE_NAME +#unset NV_LIBNCCL_DEV_PACKAGE_VERSION +#unset NV_LIBNCCL_PACKAGE +#unset NV_LIBNCCL_PACKAGE_NAME +#unset NV_LIBNCCL_PACKAGE_VERSION +#unset NV_LIBNPP_DEV_VERSION +#unset NV_LIBNPP_VERSION +#unset NV_NVML_DEV_VERSION +#unset NV_NVPROF_VERSION +#unset NV_NVTX_VERSION +# +#export PYENV_ROOT=/opt/circleci/.pyenv +#export PYENV_SHELL=bash +#export TERM=xterm-256color +#export DBUS_SESSION_BUS_ADDRESS=/dev/null +#export JAVA_HOME=/usr/lib/jvm/java-11-openjdk-amd64 +#export JDK_HOME=/usr/lib/jvm/java-11-openjdk-amd64 +#export JRE_HOME=/usr/lib/jvm/java-11-openjdk-amd64 +#export M2_HOME=/usr/local/apache-maven +#export MAVEN_OPTS=-Xmx2048m +#export PATH=/home/circleci/project/env/bin:/home/circleci/project/conda/condabin:/home/circleci/.yarn/bin:/home/circleci/.config/yarn/global/node_modules/.bin:/opt/android/sdk/ndk/23.0.7599858:/opt/android/sdk/emulator:/opt/android/sdk/cmdline-tools/latest/bin:/opt/android/sdk/tools:/opt/android/sdk/tools/bin:/opt/android/sdk/platform-tools:/opt/android/sdk/platform-tools/bin:/home/circleci/.go_workspace/bin:/usr/local/go/bin:/opt/circleci/.pyenv/shims:/opt/circleci/.pyenv/bin:/opt/google/google-cloud-sdk/bin:/usr/local/apache-maven/bin:/home/circleci/bin:/home/circleci/.yarn/bin:/home/circleci/.config/yarn/global/node_modules/.bin:/opt/android/sdk/ndk/23.0.7599858:/opt/android/sdk/emulator:/opt/android/sdk/cmdline-tools/latest/bin:/opt/android/sdk/tools:/opt/android/sdk/tools/bin:/opt/android/sdk/platform-tools:/opt/android/sdk/platform-tools/bin:/opt/circleci/.rvm/gems/ruby-3.0.2/bin:/opt/circleci/.rvm/gems/ruby-3.0.2@global/bin:/opt/circleci/.rvm/rubies/ruby-3.0.2/bin:/home/circleci/.go_workspace/bin:/usr/local/go/bin:/opt/circleci/.nvm/versions/node/v14.17.3/bin:/opt/circleci/.pyenv/shims:/opt/circleci/.pyenv/bin:/opt/google/google-cloud-sdk/bin:/usr/local/apache-maven/bin:/home/circleci/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/snap/bin:/usr/local/gradle-7.1.1/bin:/opt/circleci/.rvm/bin:/snap/bin:/opt/circleci/.rvm/bin:/usr/local/gradle-7.1.1/bin:/snap/bin:/opt/circleci/.rvm/bin +# +#unset LIBRARY_PATH +#export __CONDA_SHLVL_1_DISPLAY=:99 +#unset __CONDA_SHLVL_1_LD_LIBRARY_PATH export PYTORCH_TEST_WITH_SLOW='1' python -m torch.utils.collect_env From 7c692ce35e3013e716f5d06ea72ed11d60f6de4d Mon Sep 17 00:00:00 2001 From: vmoens Date: Sat, 6 Aug 2022 08:30:41 +0100 Subject: [PATCH 39/49] amend --- .circleci/config.yml | 63 ++++++++++++++++++++++++-------------------- 1 file changed, 34 insertions(+), 29 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 2e7b1fca841..4ef7194e23c 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -315,17 +315,18 @@ jobs: paths: - conda - env - - run: - # Here we create an envlist file that contains some env variables that we want the docker container to be aware of. - # Normally, the CIRCLECI variable is set and available on all CI workflows: https://circleci.com/docs/2.0/env-vars/#built-in-environment-variables. - # They're available in all the other workflows (OSX and Windows). - # But here, we're running the unittest_linux_gpu workflows in a docker container, where those variables aren't accessible. - # So instead we dump the variables we need in env.list and we pass that file when invoking "docker run". - name: export CIRCLECI env var - command: echo "CIRCLECI=true" >> ./env.list +# - run: +# # Here we create an envlist file that contains some env variables that we want the docker container to be aware of. +# # Normally, the CIRCLECI variable is set and available on all CI workflows: https://circleci.com/docs/2.0/env-vars/#built-in-environment-variables. +# # They're available in all the other workflows (OSX and Windows). +# # But here, we're running the unittest_linux_gpu workflows in a docker container, where those variables aren't accessible. +# # So instead we dump the variables we need in env.list and we pass that file when invoking "docker run". +# name: export CIRCLECI env var +# command: echo "CIRCLECI=true" >> ./env.list - run: name: Install torchrl - command: docker run -t --gpus all -v $PWD:$PWD -w $PWD -e UPLOAD_CHANNEL -e CU_VERSION "${image_name}" .circleci/unittest/linux/scripts/install.sh + command: bash .circleci/unittest/linux/scripts/install.sh +# command: docker run -t --gpus all -v $PWD:$PWD -w $PWD -e UPLOAD_CHANNEL -e CU_VERSION "${image_name}" .circleci/unittest/linux/scripts/install.sh - run: name: Run tests command: bash .circleci/unittest/linux/scripts/run_test.sh @@ -369,20 +370,22 @@ jobs: paths: - conda - env - - run: - # Here we create an envlist file that contains some env variables that we want the docker container to be aware of. - # Normally, the CIRCLECI variable is set and available on all CI workflows: https://circleci.com/docs/2.0/env-vars/#built-in-environment-variables. - # They're available in all the other workflows (OSX and Windows). - # But here, we're running the unittest_linux_gpu workflows in a docker container, where those variables aren't accessible. - # So instead we dump the variables we need in env.list and we pass that file when invoking "docker run". - name: export CIRCLECI env var - command: echo "CIRCLECI=true" >> ./env.list +# - run: +# # Here we create an envlist file that contains some env variables that we want the docker container to be aware of. +# # Normally, the CIRCLECI variable is set and available on all CI workflows: https://circleci.com/docs/2.0/env-vars/#built-in-environment-variables. +# # They're available in all the other workflows (OSX and Windows). +# # But here, we're running the unittest_linux_gpu workflows in a docker container, where those variables aren't accessible. +# # So instead we dump the variables we need in env.list and we pass that file when invoking "docker run". +# name: export CIRCLECI env var +# command: echo "CIRCLECI=true" >> ./env.list - run: name: Install torchrl - command: docker run -t --gpus all -v $PWD:$PWD -w $PWD -e UPLOAD_CHANNEL -e CU_VERSION "${image_name}" .circleci/unittest/linux_optdeps/scripts/install.sh + command: bash .circleci/unittest/linux/scripts/install.sh +# command: docker run -t --gpus all -v $PWD:$PWD -w $PWD -e UPLOAD_CHANNEL -e CU_VERSION "${image_name}" .circleci/unittest/linux/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_optdeps/scripts/run_test.sh + command: bash .circleci/unittest/linux/scripts/run_test.sh +# command: docker run --env-file ./env.list -t --gpus all -v $PWD:$PWD -w $PWD "${image_name}" .circleci/unittest/linux/scripts/run_test.sh - run: name: Post Process command: docker run -t --gpus all -v $PWD:$PWD -w $PWD "${image_name}" .circleci/unittest/linux_optdeps/scripts/post_process.sh @@ -469,20 +472,22 @@ jobs: paths: - conda - env - - run: - # Here we create an envlist file that contains some env variables that we want the docker container to be aware of. - # Normally, the CIRCLECI variable is set and available on all CI workflows: https://circleci.com/docs/2.0/env-vars/#built-in-environment-variables. - # They're availble in all the other workflows (OSX and Windows). - # But here, we're running the unittest_linux_gpu workflows in a docker container, where those variables aren't accessible. - # So instead we dump the variables we need in env.list and we pass that file when invoking "docker run". - name: export CIRCLECI env var - command: echo "CIRCLECI=true" >> ./env.list +# - run: +# # Here we create an envlist file that contains some env variables that we want the docker container to be aware of. +# # Normally, the CIRCLECI variable is set and available on all CI workflows: https://circleci.com/docs/2.0/env-vars/#built-in-environment-variables. +# # They're available in all the other workflows (OSX and Windows). +# # But here, we're running the unittest_linux_gpu workflows in a docker container, where those variables aren't accessible. +# # So instead we dump the variables we need in env.list and we pass that file when invoking "docker run". +# name: export CIRCLECI env var +# command: echo "CIRCLECI=true" >> ./env.list - run: name: Install torchrl - 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 + command: bash .circleci/unittest/linux/scripts/install.sh +# command: docker run -t --gpus all -v $PWD:$PWD -w $PWD -e UPLOAD_CHANNEL -e CU_VERSION "${image_name}" .circleci/unittest/linux/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: bash .circleci/unittest/linux/scripts/run_test.sh +# command: docker run --env-file ./env.list -t --gpus all -v $PWD:$PWD -w $PWD "${image_name}" .circleci/unittest/linux/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 From 74af44c3c8ae6edf55861cd6b6553adb5a04d5bf Mon Sep 17 00:00:00 2001 From: vmoens Date: Sat, 6 Aug 2022 08:31:17 +0100 Subject: [PATCH 40/49] amend --- .circleci/unittest/linux/scripts/run_test.sh | 44 ------------------- .circleci/unittest/linux/scripts/setup_env.sh | 2 +- .../unittest/linux_stable/scripts/run_test.sh | 2 - .../linux_stable/scripts/setup_env.sh | 2 +- 4 files changed, 2 insertions(+), 48 deletions(-) diff --git a/.circleci/unittest/linux/scripts/run_test.sh b/.circleci/unittest/linux/scripts/run_test.sh index d9604746895..addefdd4c2a 100755 --- a/.circleci/unittest/linux/scripts/run_test.sh +++ b/.circleci/unittest/linux/scripts/run_test.sh @@ -5,50 +5,6 @@ set -e eval "$(./conda/bin/conda shell.bash hook)" conda activate ./env -pip3 install pyopengl --upgrade -#unset CUDA_VERSION -# -#unset NCCL_VERSION -#unset NVARCH -#unset NVIDIA_DRIVER_CAPABILITIES -#unset NVIDIA_REQUIRE_CUDA -#unset NVIDIA_VISIBLE_DEVICES -#unset NV_CUDA_CUDART_DEV_VERSION -#unset NV_CUDA_CUDART_VERSION -#unset NV_CUDA_LIB_VERSION -#unset NV_LIBCUBLAS_DEV_PACKAGE -#unset NV_LIBCUBLAS_DEV_PACKAGE_NAME -#unset NV_LIBCUBLAS_DEV_VERSION -#unset NV_LIBCUBLAS_PACKAGE -#unset NV_LIBCUBLAS_PACKAGE_NAME -#unset NV_LIBCUBLAS_VERSION -#unset NV_LIBNCCL_DEV_PACKAGE -#unset NV_LIBNCCL_DEV_PACKAGE_NAME -#unset NV_LIBNCCL_DEV_PACKAGE_VERSION -#unset NV_LIBNCCL_PACKAGE -#unset NV_LIBNCCL_PACKAGE_NAME -#unset NV_LIBNCCL_PACKAGE_VERSION -#unset NV_LIBNPP_DEV_VERSION -#unset NV_LIBNPP_VERSION -#unset NV_NVML_DEV_VERSION -#unset NV_NVPROF_VERSION -#unset NV_NVTX_VERSION -# -#export PYENV_ROOT=/opt/circleci/.pyenv -#export PYENV_SHELL=bash -#export TERM=xterm-256color -#export DBUS_SESSION_BUS_ADDRESS=/dev/null -#export JAVA_HOME=/usr/lib/jvm/java-11-openjdk-amd64 -#export JDK_HOME=/usr/lib/jvm/java-11-openjdk-amd64 -#export JRE_HOME=/usr/lib/jvm/java-11-openjdk-amd64 -#export M2_HOME=/usr/local/apache-maven -#export MAVEN_OPTS=-Xmx2048m -#export PATH=/home/circleci/project/env/bin:/home/circleci/project/conda/condabin:/home/circleci/.yarn/bin:/home/circleci/.config/yarn/global/node_modules/.bin:/opt/android/sdk/ndk/23.0.7599858:/opt/android/sdk/emulator:/opt/android/sdk/cmdline-tools/latest/bin:/opt/android/sdk/tools:/opt/android/sdk/tools/bin:/opt/android/sdk/platform-tools:/opt/android/sdk/platform-tools/bin:/home/circleci/.go_workspace/bin:/usr/local/go/bin:/opt/circleci/.pyenv/shims:/opt/circleci/.pyenv/bin:/opt/google/google-cloud-sdk/bin:/usr/local/apache-maven/bin:/home/circleci/bin:/home/circleci/.yarn/bin:/home/circleci/.config/yarn/global/node_modules/.bin:/opt/android/sdk/ndk/23.0.7599858:/opt/android/sdk/emulator:/opt/android/sdk/cmdline-tools/latest/bin:/opt/android/sdk/tools:/opt/android/sdk/tools/bin:/opt/android/sdk/platform-tools:/opt/android/sdk/platform-tools/bin:/opt/circleci/.rvm/gems/ruby-3.0.2/bin:/opt/circleci/.rvm/gems/ruby-3.0.2@global/bin:/opt/circleci/.rvm/rubies/ruby-3.0.2/bin:/home/circleci/.go_workspace/bin:/usr/local/go/bin:/opt/circleci/.nvm/versions/node/v14.17.3/bin:/opt/circleci/.pyenv/shims:/opt/circleci/.pyenv/bin:/opt/google/google-cloud-sdk/bin:/usr/local/apache-maven/bin:/home/circleci/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/snap/bin:/usr/local/gradle-7.1.1/bin:/opt/circleci/.rvm/bin:/snap/bin:/opt/circleci/.rvm/bin:/usr/local/gradle-7.1.1/bin:/snap/bin:/opt/circleci/.rvm/bin -# -#unset LIBRARY_PATH -#export __CONDA_SHLVL_1_DISPLAY=:99 -#unset __CONDA_SHLVL_1_LD_LIBRARY_PATH - 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 f025cfc4deb..1718c867d33 100755 --- a/.circleci/unittest/linux/scripts/setup_env.sh +++ b/.circleci/unittest/linux/scripts/setup_env.sh @@ -82,4 +82,4 @@ fi conda env update --file "${this_dir}/environment.yml" --prune pip3 install pyrender -#pip3 install pyopengl --upgrade +pip3 install pyopengl --upgrade diff --git a/.circleci/unittest/linux_stable/scripts/run_test.sh b/.circleci/unittest/linux_stable/scripts/run_test.sh index 4bb99c8b03a..addefdd4c2a 100755 --- a/.circleci/unittest/linux_stable/scripts/run_test.sh +++ b/.circleci/unittest/linux_stable/scripts/run_test.sh @@ -5,8 +5,6 @@ set -e eval "$(./conda/bin/conda shell.bash hook)" conda activate ./env -pip3 install pyopengl --upgrade - 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 73247422012..da9054c9968 100755 --- a/.circleci/unittest/linux_stable/scripts/setup_env.sh +++ b/.circleci/unittest/linux_stable/scripts/setup_env.sh @@ -83,4 +83,4 @@ fi conda env update --file "${this_dir}/environment.yml" --prune pip3 install pyrender -#pip3 install pyopengl --upgrade +pip3 install pyopengl --upgrade From ea07ec91f313de1b29ec6a21d8a6060e7c83ffe2 Mon Sep 17 00:00:00 2001 From: vmoens Date: Sat, 6 Aug 2022 08:33:27 +0100 Subject: [PATCH 41/49] amend --- .circleci/unittest/linux/scripts/run_test.sh | 2 -- .circleci/unittest/linux_stable/scripts/run_test.sh | 2 -- 2 files changed, 4 deletions(-) diff --git a/.circleci/unittest/linux/scripts/run_test.sh b/.circleci/unittest/linux/scripts/run_test.sh index addefdd4c2a..fea33f15774 100755 --- a/.circleci/unittest/linux/scripts/run_test.sh +++ b/.circleci/unittest/linux/scripts/run_test.sh @@ -18,8 +18,6 @@ lib_dir="${env_dir}/lib" export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$lib_dir export MKL_THREADING_LAYER=GNU -echo `printenv` - pytest test/smoke_test.py -v --durations 20 pytest test/smoke_test_deps.py -v --durations 20 pytest --instafail -v --durations 20 diff --git a/.circleci/unittest/linux_stable/scripts/run_test.sh b/.circleci/unittest/linux_stable/scripts/run_test.sh index addefdd4c2a..fea33f15774 100755 --- a/.circleci/unittest/linux_stable/scripts/run_test.sh +++ b/.circleci/unittest/linux_stable/scripts/run_test.sh @@ -18,8 +18,6 @@ lib_dir="${env_dir}/lib" export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$lib_dir export MKL_THREADING_LAYER=GNU -echo `printenv` - pytest test/smoke_test.py -v --durations 20 pytest test/smoke_test_deps.py -v --durations 20 pytest --instafail -v --durations 20 From 5eda0d0f555db5ee466fdd5b4b56e0408395b082 Mon Sep 17 00:00:00 2001 From: vmoens Date: Sat, 6 Aug 2022 08:47:19 +0100 Subject: [PATCH 42/49] amend --- .circleci/config.yml | 8 ++++---- .circleci/unittest/linux/scripts/setup_env.sh | 7 +++++-- .circleci/unittest/linux_stable/scripts/setup_env.sh | 6 ++++-- 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 4ef7194e23c..c1f5e2cef31 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -380,11 +380,11 @@ jobs: # command: echo "CIRCLECI=true" >> ./env.list - run: name: Install torchrl - command: bash .circleci/unittest/linux/scripts/install.sh + command: bash .circleci/unittest/linux_optdeps/scripts/install.sh # command: docker run -t --gpus all -v $PWD:$PWD -w $PWD -e UPLOAD_CHANNEL -e CU_VERSION "${image_name}" .circleci/unittest/linux/scripts/install.sh - run: name: Run tests - command: bash .circleci/unittest/linux/scripts/run_test.sh + command: bash .circleci/unittest/linux_optdeps/scripts/run_test.sh # command: docker run --env-file ./env.list -t --gpus all -v $PWD:$PWD -w $PWD "${image_name}" .circleci/unittest/linux/scripts/run_test.sh - run: name: Post Process @@ -482,11 +482,11 @@ jobs: # command: echo "CIRCLECI=true" >> ./env.list - run: name: Install torchrl - command: bash .circleci/unittest/linux/scripts/install.sh + command: bash .circleci/unittest/linux_stable/scripts/install.sh # command: docker run -t --gpus all -v $PWD:$PWD -w $PWD -e UPLOAD_CHANNEL -e CU_VERSION "${image_name}" .circleci/unittest/linux/scripts/install.sh - run: name: Run tests - command: bash .circleci/unittest/linux/scripts/run_test.sh + command: bash .circleci/unittest/linux_stable/scripts/run_test.sh # command: docker run --env-file ./env.list -t --gpus all -v $PWD:$PWD -w $PWD "${image_name}" .circleci/unittest/linux/scripts/run_test.sh - run: name: Post Process diff --git a/.circleci/unittest/linux/scripts/setup_env.sh b/.circleci/unittest/linux/scripts/setup_env.sh index 1718c867d33..181be269dd6 100755 --- a/.circleci/unittest/linux/scripts/setup_env.sh +++ b/.circleci/unittest/linux/scripts/setup_env.sh @@ -53,8 +53,11 @@ printf "* Installing dependencies (except PyTorch)\n" echo " - python=${PYTHON_VERSION}" >> "${this_dir}/environment.yml" cat "${this_dir}/environment.yml" + if [[ $OSTYPE == 'darwin'* ]]; then PRIVATE_MUJOCO_GL=glfw +elif [ "${CU_VERSION:-}" == cpu ]; then + PRIVATE_MUJOCO_GL=osmesa else PRIVATE_MUJOCO_GL=egl fi @@ -65,11 +68,11 @@ 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=$root_dir/.mujoco/mujoco210/bin \ SDL_VIDEODRIVER=dummy \ - MUJOCO_GL=$PRIVATE_MUJOCO_GL\ + MUJOCO_GL=$PRIVATE_MUJOCO_GL \ PYOPENGL_PLATFORM=egl # Software rendering requires GLX and OSMesa. -if [[ $MUJOCO_GL == 'egl' ]]; then +if [[ $OSTYPE -ne 'darwin'* ]]; then yum makecache yum install -y glfw yum install -y glew diff --git a/.circleci/unittest/linux_stable/scripts/setup_env.sh b/.circleci/unittest/linux_stable/scripts/setup_env.sh index da9054c9968..181be269dd6 100755 --- a/.circleci/unittest/linux_stable/scripts/setup_env.sh +++ b/.circleci/unittest/linux_stable/scripts/setup_env.sh @@ -40,7 +40,7 @@ conda activate "${env_dir}" # 3. Install mujoco printf "* Installing mujoco and related\n" -mkdir $root_dir/.mujoco +mkdir -p $root_dir/.mujoco cd $root_dir/.mujoco/ wget https://github.com/deepmind/mujoco/releases/download/2.1.1/mujoco-2.1.1-linux-x86_64.tar.gz tar -xf mujoco-2.1.1-linux-x86_64.tar.gz @@ -56,6 +56,8 @@ cat "${this_dir}/environment.yml" if [[ $OSTYPE == 'darwin'* ]]; then PRIVATE_MUJOCO_GL=glfw +elif [ "${CU_VERSION:-}" == cpu ]; then + PRIVATE_MUJOCO_GL=osmesa else PRIVATE_MUJOCO_GL=egl fi @@ -70,7 +72,7 @@ conda env config vars set MUJOCO_PY_MUJOCO_PATH=$root_dir/.mujoco/mujoco210 \ PYOPENGL_PLATFORM=egl # Software rendering requires GLX and OSMesa. -if [[ $MUJOCO_GL == 'egl' ]]; then +if [[ $OSTYPE -ne 'darwin'* ]]; then yum makecache yum install -y glfw yum install -y glew From 4d551aec68ec5823ad3fd611b4a9b6263eed3297 Mon Sep 17 00:00:00 2001 From: vmoens Date: Sat, 6 Aug 2022 08:51:03 +0100 Subject: [PATCH 43/49] amend --- .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 181be269dd6..cd49cab8be2 100755 --- a/.circleci/unittest/linux/scripts/setup_env.sh +++ b/.circleci/unittest/linux/scripts/setup_env.sh @@ -66,10 +66,10 @@ 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 \ SDL_VIDEODRIVER=dummy \ MUJOCO_GL=$PRIVATE_MUJOCO_GL \ - PYOPENGL_PLATFORM=egl + PYOPENGL_PLATFORM=$PRIVATE_MUJOCO_GL # Software rendering requires GLX and OSMesa. if [[ $OSTYPE -ne 'darwin'* ]]; then diff --git a/.circleci/unittest/linux_stable/scripts/setup_env.sh b/.circleci/unittest/linux_stable/scripts/setup_env.sh index 181be269dd6..cd49cab8be2 100755 --- a/.circleci/unittest/linux_stable/scripts/setup_env.sh +++ b/.circleci/unittest/linux_stable/scripts/setup_env.sh @@ -66,10 +66,10 @@ 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 \ SDL_VIDEODRIVER=dummy \ MUJOCO_GL=$PRIVATE_MUJOCO_GL \ - PYOPENGL_PLATFORM=egl + PYOPENGL_PLATFORM=$PRIVATE_MUJOCO_GL # Software rendering requires GLX and OSMesa. if [[ $OSTYPE -ne 'darwin'* ]]; then From 018e9d31eba4e00c0f69e46235f98a772023506c Mon Sep 17 00:00:00 2001 From: vmoens Date: Sat, 6 Aug 2022 09:06:36 +0100 Subject: [PATCH 44/49] amend --- .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 cd49cab8be2..de41c2632f0 100755 --- a/.circleci/unittest/linux/scripts/setup_env.sh +++ b/.circleci/unittest/linux/scripts/setup_env.sh @@ -85,4 +85,4 @@ fi conda env update --file "${this_dir}/environment.yml" --prune pip3 install pyrender -pip3 install pyopengl --upgrade +#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 cd49cab8be2..de41c2632f0 100755 --- a/.circleci/unittest/linux_stable/scripts/setup_env.sh +++ b/.circleci/unittest/linux_stable/scripts/setup_env.sh @@ -85,4 +85,4 @@ fi conda env update --file "${this_dir}/environment.yml" --prune pip3 install pyrender -pip3 install pyopengl --upgrade +#pip3 install pyopengl --upgrade From 86a0b1e4dcc22435a94ae5aa08414b39228dec0c Mon Sep 17 00:00:00 2001 From: vmoens Date: Sat, 6 Aug 2022 09:23:28 +0100 Subject: [PATCH 45/49] amend --- .circleci/config.yml | 12 ++++++------ .circleci/unittest/linux/scripts/setup_env.sh | 2 +- .circleci/unittest/linux_stable/scripts/setup_env.sh | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index c1f5e2cef31..a804188cbb5 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -325,8 +325,8 @@ jobs: # command: echo "CIRCLECI=true" >> ./env.list - run: name: Install torchrl - command: bash .circleci/unittest/linux/scripts/install.sh -# command: docker run -t --gpus all -v $PWD:$PWD -w $PWD -e UPLOAD_CHANNEL -e CU_VERSION "${image_name}" .circleci/unittest/linux/scripts/install.sh +# command: bash .circleci/unittest/linux/scripts/install.sh + command: docker run -t --gpus all -v $PWD:$PWD -w $PWD -e UPLOAD_CHANNEL -e CU_VERSION "${image_name}" .circleci/unittest/linux/scripts/install.sh - run: name: Run tests command: bash .circleci/unittest/linux/scripts/run_test.sh @@ -380,8 +380,8 @@ jobs: # command: echo "CIRCLECI=true" >> ./env.list - run: name: Install torchrl - command: bash .circleci/unittest/linux_optdeps/scripts/install.sh -# command: docker run -t --gpus all -v $PWD:$PWD -w $PWD -e UPLOAD_CHANNEL -e CU_VERSION "${image_name}" .circleci/unittest/linux/scripts/install.sh +# command: bash .circleci/unittest/linux_optdeps/scripts/install.sh + command: docker run -t --gpus all -v $PWD:$PWD -w $PWD -e UPLOAD_CHANNEL -e CU_VERSION "${image_name}" .circleci/unittest/linux/scripts/install.sh - run: name: Run tests command: bash .circleci/unittest/linux_optdeps/scripts/run_test.sh @@ -482,8 +482,8 @@ jobs: # command: echo "CIRCLECI=true" >> ./env.list - run: name: Install torchrl - command: bash .circleci/unittest/linux_stable/scripts/install.sh -# command: docker run -t --gpus all -v $PWD:$PWD -w $PWD -e UPLOAD_CHANNEL -e CU_VERSION "${image_name}" .circleci/unittest/linux/scripts/install.sh +# command: bash .circleci/unittest/linux_stable/scripts/install.sh + command: docker run -t --gpus all -v $PWD:$PWD -w $PWD -e UPLOAD_CHANNEL -e CU_VERSION "${image_name}" .circleci/unittest/linux/scripts/install.sh - run: name: Run tests command: bash .circleci/unittest/linux_stable/scripts/run_test.sh diff --git a/.circleci/unittest/linux/scripts/setup_env.sh b/.circleci/unittest/linux/scripts/setup_env.sh index de41c2632f0..c571db9dd6b 100755 --- a/.circleci/unittest/linux/scripts/setup_env.sh +++ b/.circleci/unittest/linux/scripts/setup_env.sh @@ -72,7 +72,7 @@ conda env config vars set MUJOCO_PY_MUJOCO_PATH=$root_dir/.mujoco/mujoco210 \ PYOPENGL_PLATFORM=$PRIVATE_MUJOCO_GL # Software rendering requires GLX and OSMesa. -if [[ $OSTYPE -ne 'darwin'* ]]; then +if [ $PRIVATE_MUJOCO_GL == 'egl' ] || [ $PRIVATE_MUJOCO_GL == 'osmesa' ] ; then yum makecache yum install -y glfw yum install -y glew diff --git a/.circleci/unittest/linux_stable/scripts/setup_env.sh b/.circleci/unittest/linux_stable/scripts/setup_env.sh index de41c2632f0..c571db9dd6b 100755 --- a/.circleci/unittest/linux_stable/scripts/setup_env.sh +++ b/.circleci/unittest/linux_stable/scripts/setup_env.sh @@ -72,7 +72,7 @@ conda env config vars set MUJOCO_PY_MUJOCO_PATH=$root_dir/.mujoco/mujoco210 \ PYOPENGL_PLATFORM=$PRIVATE_MUJOCO_GL # Software rendering requires GLX and OSMesa. -if [[ $OSTYPE -ne 'darwin'* ]]; then +if [ $PRIVATE_MUJOCO_GL == 'egl' ] || [ $PRIVATE_MUJOCO_GL == 'osmesa' ] ; then yum makecache yum install -y glfw yum install -y glew From b678d01782507fd0a1c8a6393997b016de6bee2f Mon Sep 17 00:00:00 2001 From: vmoens Date: Sat, 6 Aug 2022 09:38:01 +0100 Subject: [PATCH 46/49] amend --- .circleci/unittest/linux/scripts/setup_env.sh | 5 ++++- .circleci/unittest/linux_stable/scripts/setup_env.sh | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.circleci/unittest/linux/scripts/setup_env.sh b/.circleci/unittest/linux/scripts/setup_env.sh index c571db9dd6b..2dab5fb2817 100755 --- a/.circleci/unittest/linux/scripts/setup_env.sh +++ b/.circleci/unittest/linux/scripts/setup_env.sh @@ -85,4 +85,7 @@ fi conda env update --file "${this_dir}/environment.yml" --prune pip3 install pyrender -#pip3 install pyopengl --upgrade + +if [ "${CU_VERSION:-}" -ne cpu ]; then + pip3 install pyopengl --upgrade +fi diff --git a/.circleci/unittest/linux_stable/scripts/setup_env.sh b/.circleci/unittest/linux_stable/scripts/setup_env.sh index c571db9dd6b..2dab5fb2817 100755 --- a/.circleci/unittest/linux_stable/scripts/setup_env.sh +++ b/.circleci/unittest/linux_stable/scripts/setup_env.sh @@ -85,4 +85,7 @@ fi conda env update --file "${this_dir}/environment.yml" --prune pip3 install pyrender -#pip3 install pyopengl --upgrade + +if [ "${CU_VERSION:-}" -ne cpu ]; then + pip3 install pyopengl --upgrade +fi From 219f87aeb55dbc86ec044b5767565f333ef80671 Mon Sep 17 00:00:00 2001 From: vmoens Date: Sat, 6 Aug 2022 10:12:09 +0100 Subject: [PATCH 47/49] amend --- .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 2dab5fb2817..efcbccd66b0 100755 --- a/.circleci/unittest/linux/scripts/setup_env.sh +++ b/.circleci/unittest/linux/scripts/setup_env.sh @@ -86,6 +86,6 @@ conda env update --file "${this_dir}/environment.yml" --prune pip3 install pyrender -if [ "${CU_VERSION:-}" -ne cpu ]; then +if [ "${CU_VERSION:-}" != cpu ]; then pip3 install pyopengl --upgrade fi diff --git a/.circleci/unittest/linux_stable/scripts/setup_env.sh b/.circleci/unittest/linux_stable/scripts/setup_env.sh index 2dab5fb2817..efcbccd66b0 100755 --- a/.circleci/unittest/linux_stable/scripts/setup_env.sh +++ b/.circleci/unittest/linux_stable/scripts/setup_env.sh @@ -86,6 +86,6 @@ conda env update --file "${this_dir}/environment.yml" --prune pip3 install pyrender -if [ "${CU_VERSION:-}" -ne cpu ]; then +if [ "${CU_VERSION:-}" != cpu ]; then pip3 install pyopengl --upgrade fi From a72d88bd9a0a248834468f13c24592192a9b082e Mon Sep 17 00:00:00 2001 From: vmoens Date: Sat, 6 Aug 2022 10:43:09 +0100 Subject: [PATCH 48/49] amend --- .circleci/unittest/linux/scripts/setup_env.sh | 10 +++++----- .circleci/unittest/linux_stable/scripts/setup_env.sh | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.circleci/unittest/linux/scripts/setup_env.sh b/.circleci/unittest/linux/scripts/setup_env.sh index efcbccd66b0..857116f824e 100755 --- a/.circleci/unittest/linux/scripts/setup_env.sh +++ b/.circleci/unittest/linux/scripts/setup_env.sh @@ -84,8 +84,8 @@ fi conda env update --file "${this_dir}/environment.yml" --prune -pip3 install pyrender - -if [ "${CU_VERSION:-}" != cpu ]; then - pip3 install pyopengl --upgrade -fi +#pip3 install pyrender +# +#if [ "${CU_VERSION:-}" != cpu ]; then +# pip3 install pyopengl --upgrade +#fi diff --git a/.circleci/unittest/linux_stable/scripts/setup_env.sh b/.circleci/unittest/linux_stable/scripts/setup_env.sh index efcbccd66b0..857116f824e 100755 --- a/.circleci/unittest/linux_stable/scripts/setup_env.sh +++ b/.circleci/unittest/linux_stable/scripts/setup_env.sh @@ -84,8 +84,8 @@ fi conda env update --file "${this_dir}/environment.yml" --prune -pip3 install pyrender - -if [ "${CU_VERSION:-}" != cpu ]; then - pip3 install pyopengl --upgrade -fi +#pip3 install pyrender +# +#if [ "${CU_VERSION:-}" != cpu ]; then +# pip3 install pyopengl --upgrade +#fi From d4da7c4a60c9f312736cd0113233b23f9655ecbe Mon Sep 17 00:00:00 2001 From: vmoens Date: Sat, 6 Aug 2022 11:15:09 +0100 Subject: [PATCH 49/49] amend --- .circleci/unittest/linux/scripts/setup_env.sh | 6 -- .../linux_stable/scripts/setup_env.sh | 6 -- test/test_libs.py | 55 +++++++++---------- 3 files changed, 26 insertions(+), 41 deletions(-) diff --git a/.circleci/unittest/linux/scripts/setup_env.sh b/.circleci/unittest/linux/scripts/setup_env.sh index 857116f824e..d4ab971c35d 100755 --- a/.circleci/unittest/linux/scripts/setup_env.sh +++ b/.circleci/unittest/linux/scripts/setup_env.sh @@ -83,9 +83,3 @@ if [ $PRIVATE_MUJOCO_GL == 'egl' ] || [ $PRIVATE_MUJOCO_GL == 'osmesa' ] ; then fi conda env update --file "${this_dir}/environment.yml" --prune - -#pip3 install pyrender -# -#if [ "${CU_VERSION:-}" != cpu ]; then -# pip3 install pyopengl --upgrade -#fi diff --git a/.circleci/unittest/linux_stable/scripts/setup_env.sh b/.circleci/unittest/linux_stable/scripts/setup_env.sh index 857116f824e..d4ab971c35d 100755 --- a/.circleci/unittest/linux_stable/scripts/setup_env.sh +++ b/.circleci/unittest/linux_stable/scripts/setup_env.sh @@ -83,9 +83,3 @@ if [ $PRIVATE_MUJOCO_GL == 'egl' ] || [ $PRIVATE_MUJOCO_GL == 'osmesa' ] ; then fi conda env update --file "${this_dir}/environment.yml" --prune - -#pip3 install pyrender -# -#if [ "${CU_VERSION:-}" != cpu ]; then -# pip3 install pyopengl --upgrade -#fi diff --git a/test/test_libs.py b/test/test_libs.py index 1c9da094699..8499a35a419 100644 --- a/test/test_libs.py +++ b/test/test_libs.py @@ -105,7 +105,7 @@ def test_gym(env_name, frame_skip, from_pixels, pixels_only): @pytest.mark.skipif(not _has_dmc, reason="no dm_control library found") -@pytest.mark.parametrize("env_name,task", [["cheetah", "run"], ["humanoid", "walk"]]) +@pytest.mark.parametrize("env_name,task", [["cheetah", "run"]]) @pytest.mark.parametrize("frame_skip", [1, 3]) @pytest.mark.parametrize( "from_pixels,pixels_only", @@ -118,35 +118,32 @@ def test_gym(env_name, frame_skip, from_pixels, pixels_only): def test_dmcontrol(env_name, task, frame_skip, from_pixels, pixels_only): if from_pixels and (not torch.has_cuda or not torch.cuda.device_count()): raise pytest.skip("no cuda device") - env0 = DMControlEnv( - env_name, - task, - frame_skip=frame_skip, - from_pixels=from_pixels, - pixels_only=pixels_only, - ) - torch.manual_seed(0) - np.random.seed(0) - final_seed0 = env0.set_seed(0) - tdreset0 = env0.reset() - rollout0 = env0.rollout(max_steps=50) - env0.close() - del env0 - env1 = DMControlEnv( - env_name, - task, - frame_skip=frame_skip, - from_pixels=from_pixels, - pixels_only=pixels_only, - ) - torch.manual_seed(0) - np.random.seed(0) - final_seed1 = env1.set_seed(0) - tdreset1 = env1.reset() - rollout1 = env1.rollout(max_steps=50) - env1.close() - del env1 + tds = [] + tds_reset = [] + final_seed = [] + for i in range(2): + env0 = DMControlEnv( + env_name, + task, + frame_skip=frame_skip, + from_pixels=from_pixels, + pixels_only=pixels_only, + ) + torch.manual_seed(0) + np.random.seed(0) + final_seed0 = env0.set_seed(0) + tdreset0 = env0.reset() + rollout0 = env0.rollout(max_steps=50) + env0.close() + del env0 + tds_reset.append(tdreset0) + tds.append(rollout0) + final_seed.append(final_seed0) + + tdreset1, tdreset0 = tds_reset + rollout0, rollout1 = tds + final_seed0, final_seed1 = final_seed assert_allclose_td(tdreset1, tdreset0) assert final_seed0 == final_seed1