Skip to content

Commit 8a8ac7a

Browse files
committed
[CI] egl for all
ghstack-source-id: ca5ff72d975a60e2834436e6e5a0954b50d83e21 Pull Request resolved: #2915
1 parent 136f7c4 commit 8a8ac7a

File tree

5 files changed

+3
-6
lines changed

5 files changed

+3
-6
lines changed

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

+1-2
Original file line numberDiff line numberDiff line change
@@ -76,13 +76,12 @@ else
7676
export MUJOCO_GL=egl
7777
fi
7878

79-
export DISPLAY=:0
8079
export SDL_VIDEODRIVER=dummy
8180

8281
# legacy from bash scripts: remove?
8382
conda env config vars set \
8483
MAX_IDLE_COUNT=1000 \
85-
MUJOCO_GL=$MUJOCO_GL PYOPENGL_PLATFORM=$MUJOCO_GL DISPLAY=:0 SDL_VIDEODRIVER=dummy LAZY_LEGACY_OP=False RL_LOGGING_LEVEL=DEBUG TOKENIZERS_PARALLELISM=true
84+
MUJOCO_GL=$MUJOCO_GL PYOPENGL_PLATFORM=$MUJOCO_GL DISPLAY=unix:0.0 SDL_VIDEODRIVER=dummy LAZY_LEGACY_OP=False RL_LOGGING_LEVEL=DEBUG TOKENIZERS_PARALLELISM=true
8685

8786
pip3 install pip --upgrade
8887
pip install virtualenv

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ export MKL_THREADING_LAYER=GNU
2121
python .github/unittest/helpers/coverage_run_parallel.py -m pytest test/smoke_test.py -v --durations 200
2222
python .github/unittest/helpers/coverage_run_parallel.py -m pytest test/smoke_test_deps.py -v --durations 200 -k 'test_gym'
2323

24-
export DISPLAY=':99.0'
24+
export DISPLAY=unix:0.0
2525
Xvfb :99 -screen 0 1400x900x24 > /dev/null 2>&1 &
2626
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
2727
coverage combine

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ export BATCHED_PIPE_TIMEOUT=60
2424
python .github/unittest/helpers/coverage_run_parallel.py -m pytest test/smoke_test.py -v --durations 200
2525
python .github/unittest/helpers/coverage_run_parallel.py -m pytest test/smoke_test_deps.py -v --durations 200 -k 'test_gym'
2626

27-
export DISPLAY=':99.0'
27+
export DISPLAY=unix:0.0
2828
Xvfb :99 -screen 0 1400x900x24 > /dev/null 2>&1 &
2929
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
3030
#pytest --instafail -v --durations 200

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

-1
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,6 @@ echo " - python=${PYTHON_VERSION}" >> "${this_dir}/environment.yml"
6868
cat "${this_dir}/environment.yml"
6969

7070
export MUJOCO_PY_MUJOCO_PATH=$root_dir/.mujoco/mujoco210
71-
export DISPLAY=unix:0.0
7271
#export MJLIB_PATH=$root_dir/.mujoco/mujoco-2.1.1/lib/libmujoco.so.2.1.1
7372
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$root_dir/.mujoco/mujoco210/bin
7473
export SDL_VIDEODRIVER=dummy

.github/workflows/docs.yml

-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ jobs:
4747
yum install -y xorg-x11-server-Xvfb
4848
# xhost +local:docker
4949
# Xvfb :1 -screen 0 1024x768x24 &
50-
# export DISPLAY=:1
5150
5251
root_dir="$(pwd)"
5352
conda_dir="${root_dir}/conda"

0 commit comments

Comments
 (0)