[CI] egl for all

ghstack-source-id: dc2c266
Pull Request resolved: #2915

Author: vmoens

.github/unittest/linux/scripts/run_all.sh

@@ -12,7 +12,7 @@ if [[ $OSTYPE != 'darwin'* ]]; then
   apt-get install -y vim git wget libsdl2-dev libsdl2-2.0-0 cmake
 
   apt-get install -y libglfw3 libgl1-mesa-glx libosmesa6 libglew-dev
-  apt-get install -y libglvnd0 libgl1 libglx0 libegl1 libgles2
+  apt-get install -y libglvnd0 libgl1 libglx0 libegl1 libgles2 xvfb
 
   if [ "${CU_VERSION:-}" == cpu ] ; then
     # solves version `GLIBCXX_3.4.29' not found for tensorboard
@@ -76,13 +76,12 @@ else
   export MUJOCO_GL=egl
 fi
 
-export DISPLAY=:0
 export SDL_VIDEODRIVER=dummy
 
 # legacy from bash scripts: remove?
 conda env config vars set \
   MAX_IDLE_COUNT=1000 \
-  MUJOCO_GL=$MUJOCO_GL PYOPENGL_PLATFORM=$MUJOCO_GL DISPLAY=:0 SDL_VIDEODRIVER=dummy LAZY_LEGACY_OP=False RL_LOGGING_LEVEL=DEBUG TOKENIZERS_PARALLELISM=true
+  MUJOCO_GL=$MUJOCO_GL PYOPENGL_PLATFORM=$MUJOCO_GL DISPLAY=:99 SDL_VIDEODRIVER=dummy LAZY_LEGACY_OP=False RL_LOGGING_LEVEL=DEBUG TOKENIZERS_PARALLELISM=true
 
 pip3 install pip --upgrade
 pip install virtualenv
@@ -202,6 +201,8 @@ export CKPT_BACKEND=torch
 export MAX_IDLE_COUNT=100
 export BATCHED_PIPE_TIMEOUT=60
 
+Xvfb :99 -screen 0 1024x768x24 &
+
 pytest test/smoke_test.py -v --durations 200
 pytest test/smoke_test_deps.py -v --durations 200 -k 'test_gym or test_dm_control_pixels or test_dm_control or test_tb'
 if [ "${CU_VERSION:-}" != cpu ] ; then

.github/unittest/linux_distributed/scripts/setup_env.sh

@@ -65,7 +65,7 @@ fi
 export MUJOCO_GL=$PRIVATE_MUJOCO_GL
 conda env config vars set MUJOCO_PY_MUJOCO_PATH=$root_dir/.mujoco/mujoco210 \
   MAX_IDLE_COUNT=1000 \
-  DISPLAY=unix:0.0 \
+  DISPLAY=:99 \
   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 \

.github/unittest/linux_libs/scripts_d4rl/setup_env.sh

@@ -110,7 +110,7 @@ export MUJOCO_GL=$PRIVATE_MUJOCO_GL
 conda env config vars set \
   MAX_IDLE_COUNT=1000 \
   MUJOCO_PY_MUJOCO_PATH=$root_dir/.mujoco/mujoco200_linux \
-  DISPLAY=unix:0.0 \
+  DISPLAY=:99 \
   MJLIB_PATH=$root_dir/.mujoco/mujoco200_linux/bin/libmujoco200.so \
   LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$root_dir/.mujoco/mujoco200_linux/bin \
   MUJOCO_PY_MJKEY_PATH=$root_dir/.mujoco/mjkey.txt \

.github/unittest/linux_libs/scripts_gym/run_test.sh

@@ -21,7 +21,7 @@ export MKL_THREADING_LAYER=GNU
 python .github/unittest/helpers/coverage_run_parallel.py -m pytest test/smoke_test.py -v --durations 200
 python .github/unittest/helpers/coverage_run_parallel.py -m pytest test/smoke_test_deps.py -v --durations 200 -k 'test_gym'
 
-export DISPLAY=':99.0'
+export DISPLAY=:99
 Xvfb :99 -screen 0 1400x900x24 > /dev/null 2>&1 &
 python .github/unittest/helpers/coverage_run_parallel.py -m pytest test/test_libs.py --instafail -v --durations 200 -k "gym and not isaac" --error-for-skips --mp_fork
 coverage combine

.github/unittest/linux_libs/scripts_gym/setup_env.sh

@@ -74,7 +74,7 @@ conda env config vars set \
   MAX_IDLE_COUNT=1000 \
   MUJOCO_GL=egl \
   SDL_VIDEODRIVER=dummy \
-  DISPLAY=unix:0.0 \
+  DISPLAY=:99 \
   PYOPENGL_PLATFORM=egl \
   LD_PRELOAD=$glew_path \
   NVIDIA_PATH=/usr/src/nvidia-470.63.01 \

.github/unittest/linux_libs/scripts_robohive/setup_env.sh

@@ -64,7 +64,7 @@ conda env config vars set \
   MAX_IDLE_COUNT=1000 \
   MUJOCO_GL=egl \
   SDL_VIDEODRIVER=dummy \
-  DISPLAY=unix:0.0 \
+  DISPLAY=:99 \
   PYOPENGL_PLATFORM=egl \
   NVIDIA_PATH=/usr/src/nvidia-470.63.01 \
   sim_backend=MUJOCO \

.github/unittest/linux_olddeps/scripts_gym_0_13/run_test.sh

@@ -25,8 +25,9 @@ export BATCHED_PIPE_TIMEOUT=60
 python .github/unittest/helpers/coverage_run_parallel.py -m pytest test/smoke_test.py -v --durations 200
 python .github/unittest/helpers/coverage_run_parallel.py -m pytest test/smoke_test_deps.py -v --durations 200 -k 'test_gym'
 
-export DISPLAY=':99.0'
+export DISPLAY=:99
 Xvfb :99 -screen 0 1400x900x24 > /dev/null 2>&1 &
+
 CKPT_BACKEND=torch MUJOCO_GL=egl python .github/unittest/helpers/coverage_run_parallel.py -m pytest --instafail -v --durations 200 --ignore test/test_distributed.py --ignore test/test_rlhf.py
 #pytest --instafail -v --durations 200
 #python test/test_libs.py

.github/unittest/linux_sota/scripts/run_all.sh

@@ -68,7 +68,6 @@ echo "  - python=${PYTHON_VERSION}" >> "${this_dir}/environment.yml"
 cat "${this_dir}/environment.yml"
 
 export MUJOCO_PY_MUJOCO_PATH=$root_dir/.mujoco/mujoco210
-export DISPLAY=unix:0.0
 #export MJLIB_PATH=$root_dir/.mujoco/mujoco-2.1.1/lib/libmujoco.so.2.1.1
 export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$root_dir/.mujoco/mujoco210/bin
 export SDL_VIDEODRIVER=dummy
@@ -80,7 +79,7 @@ export COMPOSITE_LP_AGGREGATE=0
 conda env config vars set \
   MAX_IDLE_COUNT=1000 \
   MUJOCO_PY_MUJOCO_PATH=$root_dir/.mujoco/mujoco210 \
-  DISPLAY=unix:0.0 \
+  DISPLAY=:99 \
   LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$root_dir/.mujoco/mujoco210/bin \
   SDL_VIDEODRIVER=dummy \
   MUJOCO_GL=egl \

.github/workflows/docs.yml

@@ -47,7 +47,6 @@ jobs:
         yum install -y xorg-x11-server-Xvfb
         # xhost +local:docker
         # Xvfb :1 -screen 0 1024x768x24 &
-        # export DISPLAY=:1
 
         root_dir="$(pwd)"
         conda_dir="${root_dir}/conda"