From 912574339eeb32a0762e2a201e7631578ec161f0 Mon Sep 17 00:00:00 2001 From: Tibo De Peuter Date: Sat, 4 Apr 2026 21:30:41 +0200 Subject: [PATCH] fix(hpc): package versions mismatches --- env/hpc/requirements.txt | 4 ++++ pyproject.toml | 4 ++++ scripts/hpc/install.sh | 3 +++ uv.lock | 40 +++++++++++++++++++++++++++++++++++++++- 4 files changed, 50 insertions(+), 1 deletion(-) diff --git a/env/hpc/requirements.txt b/env/hpc/requirements.txt index 57f6339..9927f3d 100644 --- a/env/hpc/requirements.txt +++ b/env/hpc/requirements.txt @@ -5,6 +5,10 @@ flax>=0.12.2 gymnasium>=1.2.3 ipykernel==7.2.0 jax==0.9.0.1 +numpy>=2.0.0 +protobuf>=5.0.0 +warp-lang +mujoco-warp matplotlib==3.10.8 mediapy==1.2.6 optax>=0.2.6 diff --git a/pyproject.toml b/pyproject.toml index 43c977b..8191bca 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -12,6 +12,10 @@ dependencies = [ "gymnasium>=1.2.3", "ipykernel==7.2.0", "jax==0.9.0.1", + "numpy>=2.0.0", + "protobuf>=5.0.0", + "warp-lang", + "mujoco-warp", "matplotlib==3.10.8", "mediapy==1.2.6", "optax>=0.2.6", diff --git a/scripts/hpc/install.sh b/scripts/hpc/install.sh index d896064..c1f2f22 100644 --- a/scripts/hpc/install.sh +++ b/scripts/hpc/install.sh @@ -21,6 +21,9 @@ source vsc-venv --activate \ --modules env/hpc/modules.txt \ --requirements env/hpc/requirements.txt +# Force upgrade shared system dependencies to ensure venv precedence +pip install --upgrade --no-deps numpy protobuf + echo 'Installing ipykernel...' python -m ipykernel install --user --name="sel3_${VSC_INSTITUTE_CLUSTER}" \ --display-name "SEL3 (${VSC_INSTITUTE_CLUSTER})" diff --git a/uv.lock b/uv.lock index e59c767..f7ebb69 100644 --- a/uv.lock +++ b/uv.lock @@ -22,11 +22,15 @@ dependencies = [ { name = "jax" }, { name = "matplotlib" }, { name = "mediapy" }, + { name = "mujoco-warp" }, + { name = "numpy" }, { name = "optax" }, + { name = "protobuf" }, { name = "pyopengl" }, { name = "pyopengl-accelerate" }, { name = "tyro" }, { name = "wandb" }, + { name = "warp-lang" }, ] [package.optional-dependencies] @@ -53,11 +57,15 @@ requires-dist = [ { name = "jax", extras = ["cuda13"], marker = "extra == 'cuda'", specifier = "==0.9.0.1" }, { name = "matplotlib", specifier = "==3.10.8" }, { name = "mediapy", specifier = "==1.2.6" }, + { name = "mujoco-warp" }, + { name = "numpy", specifier = ">=2.0.0" }, { name = "optax", specifier = ">=0.2.6" }, + { name = "protobuf", specifier = ">=5.0.0" }, { name = "pyopengl", specifier = ">=3.1.10" }, { name = "pyopengl-accelerate", specifier = ">=3.1.10" }, { name = "tyro", specifier = ">=1.0.10" }, { name = "wandb", specifier = "==0.24.2" }, + { name = "warp-lang" }, ] provides-extras = ["cuda"] @@ -1262,6 +1270,22 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/c2/7c/ad82beb7c4c9186d9fbef4799109d799692d70276bb1b3ee18a0674170d8/mujoco_mjx-3.6.0-py3-none-any.whl", hash = "sha256:c81000af0653f162b76009f48c153e9e6d19bfa8febe851e12466c81cbb7336a", size = 7013366, upload-time = "2026-03-11T01:46:19.148Z" }, ] +[[package]] +name = "mujoco-warp" +version = "3.6.0" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "absl-py" }, + { name = "etils", extra = ["epath"] }, + { name = "mujoco" }, + { name = "numpy" }, + { name = "warp-lang" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/0e/de/b853418268e9777cad2792ee3a145c8397e3d4517d136499645847ffd7f2/mujoco_warp-3.6.0.tar.gz", hash = "sha256:3c4111a4e13dc61268ddac52593ac5032c05a7d80f0c5e3c98bf5881e32b5d06", size = 1887269, upload-time = "2026-03-11T01:11:44.343Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/a3/b5/06c1e23c0cc4a06da268aa5f0fe05348d89c9ecbd3ecfb4c6d2b14ea23b2/mujoco_warp-3.6.0-py3-none-any.whl", hash = "sha256:371a405b186332cbfaa9630aabf35967405ef847cb7ea7c018ec67426a2ea160", size = 1965960, upload-time = "2026-03-11T01:11:42.527Z" }, +] + [[package]] name = "mypy-extensions" version = "1.1.0" @@ -1630,7 +1654,7 @@ name = "pexpect" version = "4.9.0" source = { registry = "https://pypi.org/simple" } dependencies = [ - { name = "ptyprocess" }, + { name = "ptyprocess", marker = "sys_platform != 'emscripten' and sys_platform != 'win32'" }, ] sdist = { url = "https://files.pythonhosted.org/packages/42/92/cc564bf6381ff43ce1f4d06852fc19a2f11d180f23dc32d9588bee2f149d/pexpect-4.9.0.tar.gz", hash = "sha256:ee7d41123f3c9911050ea2c2dac107568dc43b2d3b0c7557a33212c398ead30f", size = 166450, upload-time = "2023-11-25T09:07:26.339Z" } wheels = [ @@ -2428,6 +2452,20 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/3a/9a/f3919d7ee7ba99dabf0aac7e299c6c328f5eae94f9f6b28c76005f882d5d/wandb-0.24.2-py3-none-win_arm64.whl", hash = "sha256:b42614b99f8b9af69f88c15a84283a973c8cd5750e9c4752aa3ce21f13dbac9a", size = 20268261, upload-time = "2026-02-05T00:12:14.353Z" }, ] +[[package]] +name = "warp-lang" +version = "1.12.0" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "numpy" }, +] +wheels = [ + { url = "https://files.pythonhosted.org/packages/7d/15/fadf3e3ba5c1c907530c20c98402aaef792da74bbbe382c848cef6e5affe/warp_lang-1.12.0-py3-none-macosx_11_0_arm64.whl", hash = "sha256:c78c3701d5cad86c30ef5017410d294ec46a396bb0d502ee1c98743494f3a62f", size = 24168341, upload-time = "2026-03-06T19:42:16.333Z" }, + { url = "https://files.pythonhosted.org/packages/98/13/deab9dbae5c6aa753ac8ea1d3b1f85d20c5bab7bdebd8916ce242fbe1f0b/warp_lang-1.12.0-py3-none-manylinux_2_28_x86_64.whl", hash = "sha256:a1436f60a1881cd94f787e751a83fc0987626be2d3e2b4e74c64a6947c6d1266", size = 136485344, upload-time = "2026-03-06T19:43:02.427Z" }, + { url = "https://files.pythonhosted.org/packages/45/ce/9f5c57cac849edaba2f3335cb649b7019b09195b3af02221258482254559/warp_lang-1.12.0-py3-none-manylinux_2_34_aarch64.whl", hash = "sha256:a2d6decba693aba5b828573c4414fd6a3f4c4a934db9c322736ef2b3fa99fe76", size = 137735580, upload-time = "2026-03-06T19:44:22.279Z" }, + { url = "https://files.pythonhosted.org/packages/7e/3f/1ddc888fe769447ae33915a9567a9dd7467e1fc7fc8010d39e01b339667f/warp_lang-1.12.0-py3-none-win_amd64.whl", hash = "sha256:697248edd2f1e2952f50e3db33b214af76173641a8894aacc467bed6dc247f8a", size = 119793582, upload-time = "2026-03-06T19:45:37.288Z" }, +] + [[package]] name = "wcwidth" version = "0.6.0"