fixup! fix(hpc): numpy
This commit is contained in:
parent
1b15932369
commit
7e902aa8b6
3 changed files with 3 additions and 6 deletions
1
env/hpc/requirements.txt
vendored
1
env/hpc/requirements.txt
vendored
|
|
@ -6,6 +6,7 @@ gymnasium>=1.2.3
|
||||||
ipykernel==7.2.0
|
ipykernel==7.2.0
|
||||||
jax==0.9.0.1
|
jax==0.9.0.1
|
||||||
numpy>=2.0.0
|
numpy>=2.0.0
|
||||||
|
scipy>=1.14.0
|
||||||
protobuf>=5.0.0
|
protobuf>=5.0.0
|
||||||
warp-lang
|
warp-lang
|
||||||
mujoco-warp
|
mujoco-warp
|
||||||
|
|
|
||||||
|
|
@ -39,10 +39,6 @@ set -euo pipefail
|
||||||
VENV_LIB_DIR="$VIRTUAL_ENV/lib/python$(python -c 'import sys; print(f"{sys.version_info.major}.{sys.version_info.minor}")')/site-packages"
|
VENV_LIB_DIR="$VIRTUAL_ENV/lib/python$(python -c 'import sys; print(f"{sys.version_info.major}.{sys.version_info.minor}")')/site-packages"
|
||||||
export PYTHONPATH="$VENV_LIB_DIR:$PYTHONPATH"
|
export PYTHONPATH="$VENV_LIB_DIR:$PYTHONPATH"
|
||||||
|
|
||||||
# Overlay modern NumPy/Protobuf versions
|
|
||||||
echo ">>> Applying library overlays (NumPy, Protobuf)..."
|
|
||||||
pip install --upgrade --no-deps numpy protobuf
|
|
||||||
|
|
||||||
echo '>>> Installing ipykernel...'
|
echo '>>> Installing ipykernel...'
|
||||||
CLUSTER_ID="${VSC_INSTITUTE_CLUSTER:-generic}"
|
CLUSTER_ID="${VSC_INSTITUTE_CLUSTER:-generic}"
|
||||||
python -m ipykernel install --user --name="sel3_${CLUSTER_ID}" \
|
python -m ipykernel install --user --name="sel3_${CLUSTER_ID}" \
|
||||||
|
|
|
||||||
|
|
@ -47,8 +47,8 @@ source vsc-venv --activate \
|
||||||
--requirements "$HPC_CONFIG_DIR/requirements.txt"
|
--requirements "$HPC_CONFIG_DIR/requirements.txt"
|
||||||
set -euo pipefail
|
set -euo pipefail
|
||||||
|
|
||||||
# Force the venv path to the front of PYTHONPATH to override system modules (e.g. NumPy 1.2x)
|
# Force the venv path to the front of PYTHONPATH so venv packages take priority
|
||||||
# This is required because VSC system modules are appended to PYTHONPATH and would otherwise shadow your venv
|
# over system module packages (e.g. SciPy-bundle) that may be injected by loaded modules.
|
||||||
VENV_LIB_DIR="$VIRTUAL_ENV/lib/python$(python -c 'import sys; print(f"{sys.version_info.major}.{sys.version_info.minor}")')/site-packages"
|
VENV_LIB_DIR="$VIRTUAL_ENV/lib/python$(python -c 'import sys; print(f"{sys.version_info.major}.{sys.version_info.minor}")')/site-packages"
|
||||||
export PYTHONPATH="$VENV_LIB_DIR:$PYTHONPATH"
|
export PYTHONPATH="$VENV_LIB_DIR:$PYTHONPATH"
|
||||||
|
|
||||||
|
|
|
||||||
Reference in a new issue