Skip to content

Commit 8a1263b

Browse files
committed
Update
[ghstack-poisoned]
1 parent 0507f70 commit 8a1263b

File tree

2 files changed

+40
-53
lines changed

2 files changed

+40
-53
lines changed

.github/unittest/linux_libs/scripts_isaaclab/isaac.sh

Lines changed: 8 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -48,32 +48,19 @@ eval "$(${conda_dir}/bin/conda shell.bash hook)"
4848
conda create --prefix ${env_dir} python=3.10 -y
4949
conda activate ${env_dir}
5050

51-
# Set LD_LIBRARY_PATH to prioritize conda environment libraries early
51+
# Set LD_LIBRARY_PATH to prioritize conda environment libraries
5252
export LD_LIBRARY_PATH=${lib_dir}:${LD_LIBRARY_PATH:-}
5353

54-
# Ensure libexpat is at the correct version BEFORE installing other packages
55-
conda install -c conda-forge expat -y
54+
# Install a compatible version of expat (< 2.6.0 to avoid XML_SetReparseDeferralEnabled symbol issues)
55+
conda install -c conda-forge "expat<2.6" -y
5656

57-
# Force the loader to pick conda's libexpat over the system one
58-
if [ -f "${lib_dir}/libexpat.so.1" ]; then
59-
export LD_PRELOAD="${lib_dir}/libexpat.so.1:${LD_PRELOAD:-}"
60-
elif [ -f "${lib_dir}/libexpat.so" ]; then
61-
export LD_PRELOAD="${lib_dir}/libexpat.so:${LD_PRELOAD:-}"
62-
fi
63-
64-
# Quick diagnostic to confirm which expat is resolved by pyexpat
65-
PYEXPAT_SO=$(python - <<'PY'
66-
import importlib.util
67-
spec = importlib.util.find_spec('pyexpat')
68-
print(spec.origin)
69-
PY
70-
)
71-
echo "* pyexpat module: ${PYEXPAT_SO}"
72-
ldd "${PYEXPAT_SO}" | grep -i expat || true
73-
74-
# Reinstall Python to ensure it links against the correct expat
57+
# Reinstall Python to ensure it's properly linked against the conda expat
7558
conda install --force-reinstall python=3.10 -y
7659

60+
# Verify the expat linkage
61+
echo "* Checking pyexpat linkage:"
62+
python -c "import pyexpat; print('pyexpat imported successfully')" || echo "WARNING: pyexpat import failed"
63+
7764
# Pin pytorch to 2.5.1 for IsaacLab
7865
conda install pytorch==2.5.1 torchvision==0.20.1 pytorch-cuda=12.4 -c pytorch -c nvidia -y
7966

.github/workflows/test-linux-libs.yml

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -91,40 +91,40 @@ jobs:
9191
9292
bash .github/unittest/linux_libs/scripts_brax/run_all.sh
9393
94-
unittests-d4rl:
95-
strategy:
96-
matrix:
97-
python_version: ["3.10"]
98-
cuda_arch_version: ["12.8"]
99-
if: ${{ github.event_name == 'push' || contains(github.event.pull_request.labels.*.name, 'Data') }}
100-
uses: pytorch/test-infra/.github/workflows/linux_job_v2.yml@main
101-
with:
102-
repository: pytorch/rl
103-
runner: "linux.g5.4xlarge.nvidia.gpu"
104-
docker-image: "nvidia/cuda:12.4.0-devel-ubuntu22.04"
105-
timeout: 120
106-
script: |
107-
if [[ "${{ github.ref }}" =~ release/* ]]; then
108-
export RELEASE=1
109-
export TORCH_VERSION=stable
110-
else
111-
export RELEASE=0
112-
export TORCH_VERSION=nightly
113-
fi
94+
# unittests-d4rl:
95+
# strategy:
96+
# matrix:
97+
# python_version: ["3.10"]
98+
# cuda_arch_version: ["12.8"]
99+
# if: ${{ github.event_name == 'push' || contains(github.event.pull_request.labels.*.name, 'Data') }}
100+
# uses: pytorch/test-infra/.github/workflows/linux_job_v2.yml@main
101+
# with:
102+
# repository: pytorch/rl
103+
# runner: "linux.g5.4xlarge.nvidia.gpu"
104+
# docker-image: "nvidia/cuda:12.4.0-devel-ubuntu22.04"
105+
# timeout: 120
106+
# script: |
107+
# if [[ "${{ github.ref }}" =~ release/* ]]; then
108+
# export RELEASE=1
109+
# export TORCH_VERSION=stable
110+
# else
111+
# export RELEASE=0
112+
# export TORCH_VERSION=nightly
113+
# fi
114114

115-
set -euo pipefail
116-
export PYTHON_VERSION="3.10"
117-
export CU_VERSION="cu128"
118-
export TAR_OPTIONS="--no-same-owner"
119-
export UPLOAD_CHANNEL="nightly"
120-
export TF_CPP_MIN_LOG_LEVEL=0
121-
export BATCHED_PIPE_TIMEOUT=60
122-
export TD_GET_DEFAULTS_TO_NONE=1
115+
# set -euo pipefail
116+
# export PYTHON_VERSION="3.10"
117+
# export CU_VERSION="cu128"
118+
# export TAR_OPTIONS="--no-same-owner"
119+
# export UPLOAD_CHANNEL="nightly"
120+
# export TF_CPP_MIN_LOG_LEVEL=0
121+
# export BATCHED_PIPE_TIMEOUT=60
122+
# export TD_GET_DEFAULTS_TO_NONE=1
123123

124-
bash .github/unittest/linux_libs/scripts_d4rl/setup_env.sh
125-
bash .github/unittest/linux_libs/scripts_d4rl/install.sh
126-
bash .github/unittest/linux_libs/scripts_d4rl/run_test.sh
127-
bash .github/unittest/linux_libs/scripts_d4rl/post_process.sh
124+
# bash .github/unittest/linux_libs/scripts_d4rl/setup_env.sh
125+
# bash .github/unittest/linux_libs/scripts_d4rl/install.sh
126+
# bash .github/unittest/linux_libs/scripts_d4rl/run_test.sh
127+
# bash .github/unittest/linux_libs/scripts_d4rl/post_process.sh
128128

129129
unittests-envpool:
130130
strategy:

0 commit comments

Comments
 (0)