Skip to content

Commit 963f3cd

Browse files
author
Vincent Moens
committed
[CI] Make MAX_IDLE_COUNT a feature of tests
ghstack-source-id: 2bf31df Pull Request resolved: #2752
1 parent 9368ca6 commit 963f3cd

File tree

10 files changed

+24
-7
lines changed

10 files changed

+24
-7
lines changed

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,9 @@ export DISPLAY=:0
8080
export SDL_VIDEODRIVER=dummy
8181

8282
# legacy from bash scripts: remove?
83-
conda env config vars set MUJOCO_GL=$MUJOCO_GL PYOPENGL_PLATFORM=$MUJOCO_GL DISPLAY=:0 SDL_VIDEODRIVER=dummy LAZY_LEGACY_OP=False RL_LOGGING_LEVEL=DEBUG TOKENIZERS_PARALLELISM=true
83+
conda env config vars set \
84+
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
8486

8587
pip3 install pip --upgrade
8688
pip install virtualenv

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ fi
6464

6565
export MUJOCO_GL=$PRIVATE_MUJOCO_GL
6666
conda env config vars set MUJOCO_PY_MUJOCO_PATH=$root_dir/.mujoco/mujoco210 \
67+
MAX_IDLE_COUNT=1000 \
6768
DISPLAY=unix:0.0 \
6869
MJLIB_PATH=$root_dir/.mujoco/mujoco-2.1.1/lib/libmujoco.so.2.1.1 \
6970
LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$root_dir/.mujoco/mujoco210/bin \

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,7 @@ fi
8585

8686
export MUJOCO_GL=$PRIVATE_MUJOCO_GL
8787
conda env config vars set \
88+
MAX_IDLE_COUNT=1000 \
8889
MUJOCO_PY_MUJOCO_PATH=$root_dir/.mujoco/mujoco200_linux \
8990
DISPLAY=unix:0.0 \
9091
MJLIB_PATH=$root_dir/.mujoco/mujoco200_linux/bin/libmujoco200.so \

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@ cat "${this_dir}/environment.yml"
7171

7272
export MUJOCO_GL=egl
7373
conda env config vars set \
74+
MAX_IDLE_COUNT=1000 \
7475
MUJOCO_GL=egl \
7576
SDL_VIDEODRIVER=dummy \
7677
DISPLAY=unix:0.0 \

.github/unittest/linux_libs/scripts_habitat/run_test.sh

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,9 @@ conda activate ./env
1010
# https://stackoverflow.com/questions/72540359/glibcxx-3-4-30-not-found-for-librosa-in-conda-virtual-environment-after-tryin
1111
#conda install -y -c conda-forge gcc=12.1.0
1212
conda install -y -c conda-forge libstdcxx-ng=12
13-
conda env config vars set LD_PRELOAD=$LD_PRELOAD:$STDC_LOC TOKENIZERS_PARALLELISM=true
13+
conda env config vars set \
14+
MAX_IDLE_COUNT=1000 \
15+
LD_PRELOAD=$LD_PRELOAD:$STDC_LOC TOKENIZERS_PARALLELISM=true
1416

1517
## find libstdc
1618
STDC_LOC=$(find conda/ -name "libstdc++.so.6" | head -1)
@@ -36,7 +38,9 @@ export MKL_THREADING_LAYER=GNU
3638
#wget https://github.com/openai/mujoco-py/blob/master/vendor/10_nvidia.json
3739
#mv 10_nvidia.json /usr/share/glvnd/egl_vendor.d/10_nvidia.json
3840

39-
conda env config vars set MAGNUM_LOG=quiet HABITAT_SIM_LOG=quiet TOKENIZERS_PARALLELISM=true
41+
conda env config vars set \
42+
MAX_IDLE_COUNT=1000 \
43+
MAGNUM_LOG=quiet HABITAT_SIM_LOG=quiet TOKENIZERS_PARALLELISM=true
4044

4145
conda deactivate && conda activate ./env
4246

.github/unittest/linux_libs/scripts_habitat/setup_env.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,9 @@ fi
4141
conda activate "${env_dir}"
4242

4343
# set debug variables
44-
conda env config vars set MAGNUM_LOG=debug HABITAT_SIM_LOG=debug TOKENIZERS_PARALLELISM=true
44+
conda env config vars set \
45+
MAX_IDLE_COUNT=1000 \
46+
MAGNUM_LOG=debug HABITAT_SIM_LOG=debug TOKENIZERS_PARALLELISM=true
4547
conda deactivate && conda activate "${env_dir}"
4648

4749
pip3 install "cython<3"

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ cat "${this_dir}/environment.yml"
6161

6262
export MUJOCO_GL=egl
6363
conda env config vars set \
64+
MAX_IDLE_COUNT=1000 \
6465
MUJOCO_GL=egl \
6566
SDL_VIDEODRIVER=dummy \
6667
DISPLAY=unix:0.0 \

.github/unittest/linux_olddeps/scripts_gym_0_13/setup_env.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@ cat "${this_dir}/environment.yml"
7777

7878
export MUJOCO_GL=egl
7979
conda env config vars set \
80+
MAX_IDLE_COUNT=1000 \
8081
MUJOCO_GL=egl \
8182
SDL_VIDEODRIVER=dummy \
8283
DISPLAY=unix:0.0 \

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

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,9 @@ export PYOPENGL_PLATFORM=egl
7777
export LAZY_LEGACY_OP=False
7878
export COMPOSITE_LP_AGGREGATE=0
7979

80-
conda env config vars set MUJOCO_PY_MUJOCO_PATH=$root_dir/.mujoco/mujoco210 \
80+
conda env config vars set \
81+
MAX_IDLE_COUNT=1000 \
82+
MUJOCO_PY_MUJOCO_PATH=$root_dir/.mujoco/mujoco210 \
8183
DISPLAY=unix:0.0 \
8284
LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$root_dir/.mujoco/mujoco210/bin \
8385
SDL_VIDEODRIVER=dummy \
@@ -101,7 +103,9 @@ pip install git+https://github.com/Farama-Foundation/d4rl@master#egg=d4rl
101103
conda install -y -c conda-forge libstdcxx-ng=12
102104
## find libstdc
103105
STDC_LOC=$(find conda/ -name "libstdc++.so.6" | head -1)
104-
conda env config vars set LD_PRELOAD=${root_dir}/$STDC_LOC TOKENIZERS_PARALLELISM=true
106+
conda env config vars set \
107+
MAX_IDLE_COUNT=1000 \
108+
LD_PRELOAD=${root_dir}/$STDC_LOC TOKENIZERS_PARALLELISM=true
105109

106110
# compile mujoco-py (bc it's done at runtime for whatever reason someone thought it was a good idea)
107111
python -c """import gym;import d4rl"""

torchrl/collectors/collectors.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ def cudagraph_mark_step_begin():
8181
INSTANTIATE_TIMEOUT = 20
8282
_MIN_TIMEOUT = 1e-3 # should be several orders of magnitude inferior wrt time spent collecting a trajectory
8383
# MAX_IDLE_COUNT is the maximum number of times a Dataloader worker can timeout with his queue.
84-
_MAX_IDLE_COUNT = int(os.environ.get("MAX_IDLE_COUNT", 1000))
84+
_MAX_IDLE_COUNT = int(os.environ.get("MAX_IDLE_COUNT", float("inf")))
8585

8686
DEFAULT_EXPLORATION_TYPE: ExplorationType = ExplorationType.RANDOM
8787

0 commit comments

Comments
 (0)