Skip to content

Commit bbe0c1d

Browse files
author
Vincent Moens
committed
Update (base update)
[ghstack-poisoned]
2 parents 6329d1d + 20a19fe commit bbe0c1d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

65 files changed

+2647
-1211
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ 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
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
8484

8585
pip3 install pip --upgrade
8686
pip install virtualenv

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,8 @@ conda env config vars set MUJOCO_PY_MUJOCO_PATH=$root_dir/.mujoco/mujoco210 \
6969
LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$root_dir/.mujoco/mujoco210/bin \
7070
SDL_VIDEODRIVER=dummy \
7171
MUJOCO_GL=$PRIVATE_MUJOCO_GL \
72-
PYOPENGL_PLATFORM=$PRIVATE_MUJOCO_GL
72+
PYOPENGL_PLATFORM=$PRIVATE_MUJOCO_GL \
73+
TOKENIZERS_PARALLELISM=true
7374

7475
# Software rendering requires GLX and OSMesa.
7576
if [ $PRIVATE_MUJOCO_GL == 'egl' ] || [ $PRIVATE_MUJOCO_GL == 'osmesa' ] ; then

.github/unittest/linux_libs/scripts_chess/environment.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,3 +20,4 @@ dependencies:
2020
- chess
2121
- transformers
2222
- cairosvg
23+
- pycairo

.github/unittest/linux_libs/scripts_chess/setup_env.sh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ set -e
99
set -v
1010

1111
this_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
12+
yum install cairo-devel -y
13+
1214
# Avoid error: "fatal: unsafe repository"
1315

1416
git config --global --add safe.directory '*'
@@ -46,4 +48,7 @@ cat "${this_dir}/environment.yml"
4648

4749
pip install pip --upgrade
4850

51+
conda install anaconda::cmake -y
52+
conda install conda-forge::cairo -y
53+
4954
conda env update --file "${this_dir}/environment.yml" --prune

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,7 @@ conda env config vars set \
9292
MUJOCO_PY_MJKEY_PATH=$root_dir/.mujoco/mjkey.txt \
9393
SDL_VIDEODRIVER=dummy \
9494
MUJOCO_GL=$PRIVATE_MUJOCO_GL \
95-
PYOPENGL_PLATFORM=$PRIVATE_MUJOCO_GL
95+
PYOPENGL_PLATFORM=$PRIVATE_MUJOCO_GL \
96+
TOKENIZERS_PARALLELISM=true
9697

9798
conda env update --file "${this_dir}/environment.yml" --prune

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@ conda env config vars set \
8080
MUJOCO_PY_MJKEY_PATH=${root_dir}/mujoco-py/mujoco_py/binaries/mjkey.txt \
8181
MUJOCO_PY_MUJOCO_PATH=${root_dir}/mujoco-py/mujoco_py/binaries/linux/mujoco210 \
8282
LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/pytorch/rl/mujoco-py/mujoco_py/binaries/linux/mujoco210/bin
83+
TOKENIZERS_PARALLELISM=true
8384
# LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/home/circleci/project/mujoco-py/mujoco_py/binaries/linux/mujoco210/bin
8485

8586
# make env variables apparent

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ 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
13+
conda env config vars set LD_PRELOAD=$LD_PRELOAD:$STDC_LOC TOKENIZERS_PARALLELISM=true
1414

1515
## find libstdc
1616
STDC_LOC=$(find conda/ -name "libstdc++.so.6" | head -1)
@@ -36,7 +36,7 @@ export MKL_THREADING_LAYER=GNU
3636
#wget https://github.com/openai/mujoco-py/blob/master/vendor/10_nvidia.json
3737
#mv 10_nvidia.json /usr/share/glvnd/egl_vendor.d/10_nvidia.json
3838

39-
conda env config vars set MAGNUM_LOG=quiet HABITAT_SIM_LOG=quiet
39+
conda env config vars set MAGNUM_LOG=quiet HABITAT_SIM_LOG=quiet TOKENIZERS_PARALLELISM=true
4040

4141
conda deactivate && conda activate ./env
4242

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

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

4343
# set debug variables
44-
conda env config vars set MAGNUM_LOG=debug HABITAT_SIM_LOG=debug
44+
conda env config vars set MAGNUM_LOG=debug HABITAT_SIM_LOG=debug TOKENIZERS_PARALLELISM=true
4545
conda deactivate && conda activate "${env_dir}"
4646

4747
pip3 install "cython<3"

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,8 @@ conda env config vars set \
6767
PYOPENGL_PLATFORM=egl \
6868
NVIDIA_PATH=/usr/src/nvidia-470.63.01 \
6969
sim_backend=MUJOCO \
70-
LAZY_LEGACY_OP=False
70+
LAZY_LEGACY_OP=False \
71+
TOKENIZERS_PARALLELISM=true
7172

7273
# make env variables apparent
7374
conda deactivate && conda activate "${env_dir}"

.github/unittest/linux_olddeps/scripts_gym_0_13/environment.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ channels:
22
- pytorch
33
- defaults
44
dependencies:
5-
- pip
5+
- pip<25.0
66
- protobuf
77
- pip:
88
- hypothesis
@@ -21,7 +21,6 @@ dependencies:
2121
- pyyaml
2222
- scipy
2323
- hydra-core
24-
- dm_control -e git+https://github.com/deepmind/dm_control.git@c053360edea6170acfd9c8f65446703307d9d352#egg={dm_control}
2524
- mujoco
2625
- patchelf
2726
- pyopengl==3.1.4

0 commit comments

Comments
 (0)