Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
46 commits
Select commit Hold shift + click to select a range
a816d0c
update linux setup_env to include libosmesa6 and libgl1-mesa-glx
Aug 3, 2022
b714c34
try just apt
Aug 3, 2022
a77c0b5
try yum
Aug 3, 2022
3424edd
try yum again
Aug 3, 2022
7aabc85
well it is functorch now
Aug 3, 2022
f7692ee
remove install from git
Aug 3, 2022
7ca29dc
Merge branch 'main' into TT_circleci
Aug 3, 2022
567c00f
remove
Aug 3, 2022
2f131c9
revert format
Aug 3, 2022
69f436c
remove conda install
Aug 3, 2022
8d99c5d
should be good
Aug 3, 2022
0aaba3f
remove xml
Aug 3, 2022
8e2ae9a
save setup
Aug 3, 2022
c98d40d
git merge
Aug 3, 2022
d0dd7bb
try fix openGL version
Aug 3, 2022
2901caa
for GPU tests?
Aug 3, 2022
d5dbde9
revert
Aug 3, 2022
b6a26df
try again
Aug 4, 2022
76253a8
try again
Aug 4, 2022
cdbeb14
try again
Aug 4, 2022
06a9e1c
try again
Aug 4, 2022
d6a8f4e
try again
Aug 4, 2022
a672c38
try again
Aug 4, 2022
f436505
update pyopenGL platform
Aug 4, 2022
35ccfaf
check env vars
Aug 4, 2022
cbaa2c9
check mesa
Aug 4, 2022
93fb291
ld path
Aug 4, 2022
2ee5bbd
try pyrender
Aug 4, 2022
f1f9344
try install older version
Aug 4, 2022
f94daac
libopengl0
Aug 4, 2022
e02a23a
libopengl0
Aug 4, 2022
a8e52ae
try suggestion in run_tests.sh first
Aug 4, 2022
8e25f9d
check path
Aug 4, 2022
5eb1457
typo
Aug 4, 2022
965969d
check envs
Aug 5, 2022
afb5c1d
unset cuda version
Aug 5, 2022
2a97d0c
try install pytroch 10.2
Aug 5, 2022
f23e27c
hard code cuda
Aug 5, 2022
e1662ad
this should work
Aug 5, 2022
f6bbf1b
update ld path
Aug 5, 2022
a83881a
dont' load env
Aug 5, 2022
cfa95ae
emm
Aug 5, 2022
c8a16a4
run with less tests
Aug 5, 2022
8ca2bfa
-y
Aug 5, 2022
c2febb6
unset early
Aug 5, 2022
b65faae
last try
Aug 5, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
148 changes: 74 additions & 74 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -481,7 +481,7 @@ jobs:
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
- 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: docker run -t --gpus all -v $PWD:$PWD -w $PWD "${image_name}" .circleci/unittest/linux_stable/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
Expand Down Expand Up @@ -656,30 +656,30 @@ workflows:

unittest:
jobs:
- unittest_macos_cpu:
cu_version: cpu
name: unittest_macos_cpu_py3.7
python_version: '3.7'
- unittest_linux_cpu:
cu_version: cpu
name: unittest_linux_cpu_py3.7
python_version: '3.7'
- unittest_linux_gpu:
cu_version: cu113
name: unittest_linux_gpu_py3.7
python_version: '3.7'
- unittest_linux_optdeps_gpu:
cu_version: cu113
name: unittest_linux_optdeps_gpu_py3.7
python_version: '3.7'
- unittest_linux_stable_cpu:
cu_version: cpu
name: unittest_linux_stable_cpu_py3.7
python_version: '3.7'
- unittest_linux_stable_gpu:
cu_version: cu113
name: unittest_linux_stable_gpu_py3.7
python_version: '3.7'
# - unittest_macos_cpu:
# cu_version: cpu
# name: unittest_macos_cpu_py3.7
# python_version: '3.7'
# - unittest_linux_cpu:
# cu_version: cpu
# name: unittest_linux_cpu_py3.7
# python_version: '3.7'
# - unittest_linux_gpu:
# cu_version: cu113
# name: unittest_linux_gpu_py3.7
# python_version: '3.7'
# - unittest_linux_optdeps_gpu:
# cu_version: cu113
# name: unittest_linux_optdeps_gpu_py3.7
# python_version: '3.7'
# - unittest_linux_stable_cpu:
# cu_version: cpu
# name: unittest_linux_stable_cpu_py3.7
# python_version: '3.7'
# - unittest_linux_stable_gpu:
# cu_version: cu113
# name: unittest_linux_stable_gpu_py3.7
# python_version: '3.7'

- unittest_macos_cpu:
cu_version: cpu
Expand All @@ -706,52 +706,52 @@ workflows:
name: unittest_linux_stable_gpu_py3.8
python_version: '3.8'

- unittest_macos_cpu:
cu_version: cpu
name: unittest_macos_cpu_py3.9
python_version: '3.9'
- unittest_linux_cpu:
cu_version: cpu
name: unittest_linux_cpu_py3.9
python_version: '3.9'
- unittest_linux_gpu:
cu_version: cu113
name: unittest_linux_gpu_py3.9
python_version: '3.9'
- unittest_linux_optdeps_gpu:
cu_version: cu113
name: unittest_linux_optdeps_gpu_py3.9
python_version: '3.9'
- unittest_linux_stable_cpu:
cu_version: cpu
name: unittest_linux_stable_cpu_py3.9
python_version: '3.9'
- unittest_linux_stable_gpu:
cu_version: cu113
name: unittest_linux_stable_gpu_py3.9
python_version: '3.9'

- unittest_macos_cpu:
cu_version: cpu
name: unittest_macos_cpu_py3.10
python_version: '3.10'
- unittest_linux_cpu:
cu_version: cpu
name: unittest_linux_cpu_py3.10
python_version: '3.10'
- unittest_linux_gpu:
cu_version: cu113
name: unittest_linux_gpu_py3.10
python_version: '3.10'
- unittest_linux_optdeps_gpu:
cu_version: cu113
name: unittest_linux_optdeps_gpu_py3.10
python_version: '3.10'
- unittest_linux_stable_cpu:
cu_version: cpu
name: unittest_linux_stable_cpu_py3.10
python_version: '3.10'
- unittest_linux_stable_gpu:
cu_version: cu113
name: unittest_linux_stable_gpu_py3.10
python_version: '3.10'
# - unittest_macos_cpu:
# cu_version: cpu
# name: unittest_macos_cpu_py3.9
# python_version: '3.9'
# - unittest_linux_cpu:
# cu_version: cpu
# name: unittest_linux_cpu_py3.9
# python_version: '3.9'
# - unittest_linux_gpu:
# cu_version: cu113
# name: unittest_linux_gpu_py3.9
# python_version: '3.9'
# - unittest_linux_optdeps_gpu:
# cu_version: cu113
# name: unittest_linux_optdeps_gpu_py3.9
# python_version: '3.9'
# - unittest_linux_stable_cpu:
# cu_version: cpu
# name: unittest_linux_stable_cpu_py3.9
# python_version: '3.9'
# - unittest_linux_stable_gpu:
# cu_version: cu113
# name: unittest_linux_stable_gpu_py3.9
# python_version: '3.9'
#
# - unittest_macos_cpu:
# cu_version: cpu
# name: unittest_macos_cpu_py3.10
# python_version: '3.10'
# - unittest_linux_cpu:
# cu_version: cpu
# name: unittest_linux_cpu_py3.10
# python_version: '3.10'
# - unittest_linux_gpu:
# cu_version: cu113
# name: unittest_linux_gpu_py3.10
# python_version: '3.10'
# - unittest_linux_optdeps_gpu:
# cu_version: cu113
# name: unittest_linux_optdeps_gpu_py3.10
# python_version: '3.10'
# - unittest_linux_stable_cpu:
# cu_version: cpu
# name: unittest_linux_stable_cpu_py3.10
# python_version: '3.10'
# - unittest_linux_stable_gpu:
# cu_version: cu113
# name: unittest_linux_stable_gpu_py3.10
# python_version: '3.10'
6 changes: 6 additions & 0 deletions .circleci/unittest/linux/scripts/run_test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,12 @@ set -e
eval "$(./conda/bin/conda shell.bash hook)"
conda activate ./env

pip3 install pyrender
pip3 install pyopengl --upgrade

export MUJOCO_GL=egl
export PYOPENGL_PLATFORM=egl

export PYTORCH_TEST_WITH_SLOW='1'
python -m torch.utils.collect_env
# Avoid error: "fatal: unsafe repository"
Expand Down
18 changes: 13 additions & 5 deletions .circleci/unittest/linux/scripts/setup_env.sh
Original file line number Diff line number Diff line change
Expand Up @@ -56,17 +56,25 @@ cat "${this_dir}/environment.yml"
if [[ $OSTYPE == 'darwin'* ]]; then
PRIVATE_MUJOCO_GL=glfw
else
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
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
MUJOCO_GL=$PRIVATE_MUJOCO_GL\
PYOPENGL_PLATFORM=egl

# Software rendering requires GLX and OSMesa.
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
fi

conda env update --file "${this_dir}/environment.yml" --prune
4 changes: 4 additions & 0 deletions .circleci/unittest/linux_stable/scripts/install.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
#!/usr/bin/env bash


unset PYTORCH_VERSION
# For unittest, nightly PyTorch is used as the following section,
# so no need to set PYTORCH_VERSION.
Expand All @@ -10,6 +11,9 @@ set -e
eval "$(./conda/bin/conda shell.bash hook)"
conda activate ./env

echo "--> Check env"
printenv

if [ "${CU_VERSION:-}" == cpu ] ; then
cudatoolkit="cpuonly"
version="cpu"
Expand Down
12 changes: 12 additions & 0 deletions .circleci/unittest/linux_stable/scripts/run_test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,15 @@ set -e
eval "$(./conda/bin/conda shell.bash hook)"
conda activate ./env

pip3 install pyrender
pip3 install pyopengl --upgrade

export MUJOCO_GL=egl
export PYOPENGL_PLATFORM=egl
export __GL_SHADER_DISK_CACHE=0
export __GL_SHADER_DISK_CACHE_PATH=/tmp
printf "DISPLAY:$DISPLAY-->\n"

export PYTORCH_TEST_WITH_SLOW='1'
python -m torch.utils.collect_env
# Avoid error: "fatal: unsafe repository"
Expand All @@ -16,7 +25,10 @@ lib_dir="${env_dir}/lib"

# solves ImportError: /lib64/libstdc++.so.6: version `GLIBCXX_3.4.21' not found
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$lib_dir
printf "LD_LIBRARY_PATH:$LD_LIBRARY_PATH-->\n"
export MKL_THREADING_LAYER=GNU
export PATH=/home/circleci/project/env/bin:/home/circleci/project/conda/condabin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
printenv

pytest test/smoke_test.py -v --durations 20
pytest test/smoke_test_deps.py -v --durations 20
Expand Down
19 changes: 14 additions & 5 deletions .circleci/unittest/linux_stable/scripts/setup_env.sh
Original file line number Diff line number Diff line change
Expand Up @@ -57,17 +57,26 @@ cat "${this_dir}/environment.yml"
if [[ $OSTYPE == 'darwin'* ]]; then
PRIVATE_MUJOCO_GL=glfw
else
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
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=$LD_LIBRARY_PATH:$root_dir/.mujoco/mujoco210/bin:${root_dir}/conda/lib \
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
yum makecache
yum update -y
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