From 030410930887be453616133cd44b75b81edc6a72 Mon Sep 17 00:00:00 2001 From: Simon Pintarelli Date: Thu, 14 Nov 2024 11:05:13 +0100 Subject: [PATCH 01/17] add jupyterlab mc --- recipes/jupyterlab/v4.1.8/mc/compilers.yaml | 5 ++++ recipes/jupyterlab/v4.1.8/mc/config.yaml | 6 +++++ .../jupyterlab/v4.1.8/mc/environments.yaml | 27 +++++++++++++++++++ .../jupyterlab/v4.1.8/mc/extra/reframe.yaml | 6 +++++ recipes/jupyterlab/v4.1.8/mc/modules.yaml | 23 ++++++++++++++++ recipes/jupyterlab/v4.1.8/mc/post-install | 7 +++++ 6 files changed, 74 insertions(+) create mode 100644 recipes/jupyterlab/v4.1.8/mc/compilers.yaml create mode 100644 recipes/jupyterlab/v4.1.8/mc/config.yaml create mode 100644 recipes/jupyterlab/v4.1.8/mc/environments.yaml create mode 100644 recipes/jupyterlab/v4.1.8/mc/extra/reframe.yaml create mode 100644 recipes/jupyterlab/v4.1.8/mc/modules.yaml create mode 100644 recipes/jupyterlab/v4.1.8/mc/post-install diff --git a/recipes/jupyterlab/v4.1.8/mc/compilers.yaml b/recipes/jupyterlab/v4.1.8/mc/compilers.yaml new file mode 100644 index 00000000..bbe4e268 --- /dev/null +++ b/recipes/jupyterlab/v4.1.8/mc/compilers.yaml @@ -0,0 +1,5 @@ +bootstrap: + spec: gcc@11 +gcc: + specs: + - gcc@13 diff --git a/recipes/jupyterlab/v4.1.8/mc/config.yaml b/recipes/jupyterlab/v4.1.8/mc/config.yaml new file mode 100644 index 00000000..5b8473c5 --- /dev/null +++ b/recipes/jupyterlab/v4.1.8/mc/config.yaml @@ -0,0 +1,6 @@ +name: jupyterlab +spack: + commit: releases/v0.22 + repo: https://github.com/spack/spack.git +store: /user-tools +description: Jupyterlab diff --git a/recipes/jupyterlab/v4.1.8/mc/environments.yaml b/recipes/jupyterlab/v4.1.8/mc/environments.yaml new file mode 100644 index 00000000..8f1389cc --- /dev/null +++ b/recipes/jupyterlab/v4.1.8/mc/environments.yaml @@ -0,0 +1,27 @@ +gcc-env: + compiler: + - toolchain: gcc + spec: gcc@13 + mpi: + spec: cray-mpich@8.1.30 + gpu: Null + unify: true + specs: + - cmake + - fftw + - fmt + - hdf5+hl + - ninja@1.11 + - openblas threads=openmp + - python@3.12 + - py-pybind11 + - osu-micro-benchmarks@5.9 + variants: + - +mpi + views: + develop: + link: roots + uenv: + add_compilers: true + prefix_paths: + LD_LIBRARY_PATH: [lib, lib64] diff --git a/recipes/jupyterlab/v4.1.8/mc/extra/reframe.yaml b/recipes/jupyterlab/v4.1.8/mc/extra/reframe.yaml new file mode 100644 index 00000000..927906ec --- /dev/null +++ b/recipes/jupyterlab/v4.1.8/mc/extra/reframe.yaml @@ -0,0 +1,6 @@ +default: + features: [osu-micro-benchmarks, mpi, serial, openmp] + cc: mpicc + cxx: mpic++ + ftn: mpifort + activation: uenv view develop diff --git a/recipes/jupyterlab/v4.1.8/mc/modules.yaml b/recipes/jupyterlab/v4.1.8/mc/modules.yaml new file mode 100644 index 00000000..623307b0 --- /dev/null +++ b/recipes/jupyterlab/v4.1.8/mc/modules.yaml @@ -0,0 +1,23 @@ +modules: + # Paths to check when creating modules for all module sets + prefix_inspections: + bin: + - PATH + lib: + - LD_LIBRARY_PATH + lib64: + - LD_LIBRARY_PATH + + default: + arch_folder: false + # Where to install modules + roots: + tcl: /user-environment/modules + tcl: + all: + autoload: none + hash_length: 0 + exclude_implicits: true + exclude: ['%gcc@7.5.0', 'gcc %gcc@7.5.0'] + projections: + all: '{name}/{version}' diff --git a/recipes/jupyterlab/v4.1.8/mc/post-install b/recipes/jupyterlab/v4.1.8/mc/post-install new file mode 100644 index 00000000..3b362328 --- /dev/null +++ b/recipes/jupyterlab/v4.1.8/mc/post-install @@ -0,0 +1,7 @@ +export PATH=/user-environment/env/default/bin:$PATH +pip install --no-cache jupyterhub==4.1.5 pyfirecrest==2.1.0 SQLAlchemy==1.4.52 oauthenticator==16.0.7 jupyterlab==4.1.8 + +git clone https://github.com/eth-cscs/firecrestspawner.git +cd firecrestspawner +git checkout test-eiger +pip install . \ No newline at end of file From 227e8865efbd4797bccc035b515befb0806f226c Mon Sep 17 00:00:00 2001 From: Simon Pintarelli Date: Thu, 14 Nov 2024 11:09:15 +0100 Subject: [PATCH 02/17] config entry --- config.yaml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/config.yaml b/config.yaml index f07589c9..9e9ab179 100644 --- a/config.yaml +++ b/config.yaml @@ -328,7 +328,12 @@ uenvs: "v6.5.0": recipes: gh200: v6.5.0/gh200 + develop: False + jupyterlab: + "v4.1.8": + recipes: + zen2: v4.1.8/mc + gh200: v4.1.8/mc deploy: - todi: [gh200] daint: [gh200] - develop: False + eiger: [zen2] From b5744e30bcbe534929ec4a701e375b705413c985 Mon Sep 17 00:00:00 2001 From: Simon Pintarelli Date: Thu, 14 Nov 2024 13:23:51 +0100 Subject: [PATCH 03/17] cleanup packages --- recipes/jupyterlab/v4.1.8/mc/environments.yaml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/recipes/jupyterlab/v4.1.8/mc/environments.yaml b/recipes/jupyterlab/v4.1.8/mc/environments.yaml index 8f1389cc..f41ec881 100644 --- a/recipes/jupyterlab/v4.1.8/mc/environments.yaml +++ b/recipes/jupyterlab/v4.1.8/mc/environments.yaml @@ -9,13 +9,11 @@ gcc-env: specs: - cmake - fftw - - fmt - hdf5+hl - ninja@1.11 - openblas threads=openmp - python@3.12 - - py-pybind11 - - osu-micro-benchmarks@5.9 + - py-pip variants: - +mpi views: From acab94e11eb8af6ce18ed7765d4b3f430c9deb5f Mon Sep 17 00:00:00 2001 From: Simon Pintarelli Date: Thu, 14 Nov 2024 15:27:11 +0100 Subject: [PATCH 04/17] fix paths --- recipes/jupyterlab/v4.1.8/mc/environments.yaml | 2 +- recipes/jupyterlab/v4.1.8/mc/post-install | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes/jupyterlab/v4.1.8/mc/environments.yaml b/recipes/jupyterlab/v4.1.8/mc/environments.yaml index f41ec881..3053e36a 100644 --- a/recipes/jupyterlab/v4.1.8/mc/environments.yaml +++ b/recipes/jupyterlab/v4.1.8/mc/environments.yaml @@ -17,7 +17,7 @@ gcc-env: variants: - +mpi views: - develop: + jupyter: link: roots uenv: add_compilers: true diff --git a/recipes/jupyterlab/v4.1.8/mc/post-install b/recipes/jupyterlab/v4.1.8/mc/post-install index 3b362328..8900bec2 100644 --- a/recipes/jupyterlab/v4.1.8/mc/post-install +++ b/recipes/jupyterlab/v4.1.8/mc/post-install @@ -1,4 +1,4 @@ -export PATH=/user-environment/env/default/bin:$PATH +export PATH=/user-tools/env/jupyter/bin:$PATH pip install --no-cache jupyterhub==4.1.5 pyfirecrest==2.1.0 SQLAlchemy==1.4.52 oauthenticator==16.0.7 jupyterlab==4.1.8 git clone https://github.com/eth-cscs/firecrestspawner.git From 9cd9ac6e520335bd1a957c4c4335615b1137c9f7 Mon Sep 17 00:00:00 2001 From: Simon Pintarelli Date: Thu, 14 Nov 2024 15:49:43 +0100 Subject: [PATCH 05/17] skip test-eiger branch --- recipes/jupyterlab/v4.1.8/mc/post-install | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/recipes/jupyterlab/v4.1.8/mc/post-install b/recipes/jupyterlab/v4.1.8/mc/post-install index 8900bec2..60b1e09c 100644 --- a/recipes/jupyterlab/v4.1.8/mc/post-install +++ b/recipes/jupyterlab/v4.1.8/mc/post-install @@ -3,5 +3,4 @@ pip install --no-cache jupyterhub==4.1.5 pyfirecrest==2.1.0 SQLAlchemy==1.4.52 o git clone https://github.com/eth-cscs/firecrestspawner.git cd firecrestspawner -git checkout test-eiger -pip install . \ No newline at end of file +pip install . From fdafd32138ab42533814c611026c095232bc9221 Mon Sep 17 00:00:00 2001 From: Simon Pintarelli Date: Thu, 14 Nov 2024 15:51:44 +0100 Subject: [PATCH 06/17] cleanup --- recipes/jupyterlab/v4.1.8/mc/environments.yaml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/recipes/jupyterlab/v4.1.8/mc/environments.yaml b/recipes/jupyterlab/v4.1.8/mc/environments.yaml index 3053e36a..ae1d96e3 100644 --- a/recipes/jupyterlab/v4.1.8/mc/environments.yaml +++ b/recipes/jupyterlab/v4.1.8/mc/environments.yaml @@ -2,9 +2,7 @@ gcc-env: compiler: - toolchain: gcc spec: gcc@13 - mpi: - spec: cray-mpich@8.1.30 - gpu: Null + mpi: null unify: true specs: - cmake @@ -14,8 +12,6 @@ gcc-env: - openblas threads=openmp - python@3.12 - py-pip - variants: - - +mpi views: jupyter: link: roots From 25fc164a57d1457a6fd8c1c21f482d27d7230cc3 Mon Sep 17 00:00:00 2001 From: Simon Pintarelli Date: Thu, 14 Nov 2024 15:54:24 +0100 Subject: [PATCH 07/17] fix config --- config.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/config.yaml b/config.yaml index 9e9ab179..0a52edc1 100644 --- a/config.yaml +++ b/config.yaml @@ -337,3 +337,4 @@ uenvs: deploy: daint: [gh200] eiger: [zen2] + mount: "/user-tools" From f56052b3f9f180978c746c658a22a2a058a0eeec Mon Sep 17 00:00:00 2001 From: Simon Pintarelli Date: Thu, 14 Nov 2024 16:20:48 +0100 Subject: [PATCH 08/17] remove packages --- recipes/jupyterlab/v4.1.8/mc/environments.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/recipes/jupyterlab/v4.1.8/mc/environments.yaml b/recipes/jupyterlab/v4.1.8/mc/environments.yaml index ae1d96e3..4d84eab9 100644 --- a/recipes/jupyterlab/v4.1.8/mc/environments.yaml +++ b/recipes/jupyterlab/v4.1.8/mc/environments.yaml @@ -6,10 +6,7 @@ gcc-env: unify: true specs: - cmake - - fftw - - hdf5+hl - ninja@1.11 - - openblas threads=openmp - python@3.12 - py-pip views: From 13a1dd8824eb641937d01234fd55faec6c3b9834 Mon Sep 17 00:00:00 2001 From: Simon Pintarelli Date: Thu, 21 Nov 2024 10:34:04 +0100 Subject: [PATCH 09/17] build on todi --- config.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/config.yaml b/config.yaml index 0a52edc1..8a879856 100644 --- a/config.yaml +++ b/config.yaml @@ -337,4 +337,5 @@ uenvs: deploy: daint: [gh200] eiger: [zen2] + todi: [gh200] mount: "/user-tools" From 19c0948abcdaf5346d3da776899b7a7aa2fdd7af Mon Sep 17 00:00:00 2001 From: Simon Pintarelli Date: Fri, 22 Nov 2024 01:18:25 +0100 Subject: [PATCH 10/17] fix conflicting modules --- recipes/jupyterlab/v4.1.8/mc/modules.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/jupyterlab/v4.1.8/mc/modules.yaml b/recipes/jupyterlab/v4.1.8/mc/modules.yaml index 623307b0..3c396112 100644 --- a/recipes/jupyterlab/v4.1.8/mc/modules.yaml +++ b/recipes/jupyterlab/v4.1.8/mc/modules.yaml @@ -18,6 +18,6 @@ modules: autoload: none hash_length: 0 exclude_implicits: true - exclude: ['%gcc@7.5.0', 'gcc %gcc@7.5.0'] + exclude: ['%gcc@7.5.0', 'gcc %gcc@7.5.0', '%gcc@11'] projections: all: '{name}/{version}' From aa8f1c3d8658b52b113e6e548a5e5d52f113c0fb Mon Sep 17 00:00:00 2001 From: Simon Pintarelli Date: Mon, 25 Nov 2024 09:50:27 +0100 Subject: [PATCH 11/17] remove cmake, ninja --- recipes/jupyterlab/v4.1.8/mc/environments.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/recipes/jupyterlab/v4.1.8/mc/environments.yaml b/recipes/jupyterlab/v4.1.8/mc/environments.yaml index 4d84eab9..e0f08339 100644 --- a/recipes/jupyterlab/v4.1.8/mc/environments.yaml +++ b/recipes/jupyterlab/v4.1.8/mc/environments.yaml @@ -5,8 +5,6 @@ gcc-env: mpi: null unify: true specs: - - cmake - - ninja@1.11 - python@3.12 - py-pip views: From b69eae1ebb4ec8cf986626954a9aa03d4136ac64 Mon Sep 17 00:00:00 2001 From: Simon Pintarelli Date: Tue, 7 Jan 2025 17:50:49 +0100 Subject: [PATCH 12/17] update spack v0.22 -> 0.23 --- recipes/jupyterlab/v4.1.8/mc/config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/jupyterlab/v4.1.8/mc/config.yaml b/recipes/jupyterlab/v4.1.8/mc/config.yaml index 5b8473c5..029e45f2 100644 --- a/recipes/jupyterlab/v4.1.8/mc/config.yaml +++ b/recipes/jupyterlab/v4.1.8/mc/config.yaml @@ -1,6 +1,6 @@ name: jupyterlab spack: - commit: releases/v0.22 + commit: releases/v0.23 repo: https://github.com/spack/spack.git store: /user-tools description: Jupyterlab From 065ff5057776aae1a4e7730e9fcb1eba0186e271 Mon Sep 17 00:00:00 2001 From: Simon Pintarelli Date: Tue, 7 Jan 2025 17:51:48 +0100 Subject: [PATCH 13/17] cleanup --- recipes/jupyterlab/v4.1.8/mc/extra/reframe.yaml | 6 ------ 1 file changed, 6 deletions(-) delete mode 100644 recipes/jupyterlab/v4.1.8/mc/extra/reframe.yaml diff --git a/recipes/jupyterlab/v4.1.8/mc/extra/reframe.yaml b/recipes/jupyterlab/v4.1.8/mc/extra/reframe.yaml deleted file mode 100644 index 927906ec..00000000 --- a/recipes/jupyterlab/v4.1.8/mc/extra/reframe.yaml +++ /dev/null @@ -1,6 +0,0 @@ -default: - features: [osu-micro-benchmarks, mpi, serial, openmp] - cc: mpicc - cxx: mpic++ - ftn: mpifort - activation: uenv view develop From 8afbafe26ae19c7cab0cad868bb9aa6a043798fb Mon Sep 17 00:00:00 2001 From: Simon Pintarelli Date: Tue, 7 Jan 2025 17:52:32 +0100 Subject: [PATCH 14/17] update config.yaml --- config.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/config.yaml b/config.yaml index 8a879856..c86ff6da 100644 --- a/config.yaml +++ b/config.yaml @@ -338,4 +338,6 @@ uenvs: daint: [gh200] eiger: [zen2] todi: [gh200] + daint: [gh200] + pilatus: [zen2] mount: "/user-tools" From a5e66859ea37263e3389bb037d032ed21c58e297 Mon Sep 17 00:00:00 2001 From: Simon Pintarelli Date: Tue, 4 Feb 2025 09:51:39 +0100 Subject: [PATCH 15/17] update config.yaml --- config.yaml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/config.yaml b/config.yaml index c86ff6da..03451731 100644 --- a/config.yaml +++ b/config.yaml @@ -336,8 +336,6 @@ uenvs: gh200: v4.1.8/mc deploy: daint: [gh200] + santis: [gh200] eiger: [zen2] - todi: [gh200] - daint: [gh200] - pilatus: [zen2] mount: "/user-tools" From e6968daa1e12ca0db03821b2430e93e3a8788e91 Mon Sep 17 00:00:00 2001 From: Simon Pintarelli Date: Tue, 4 Feb 2025 09:53:21 +0100 Subject: [PATCH 16/17] fix config.yaml --- config.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/config.yaml b/config.yaml index 03451731..adf08439 100644 --- a/config.yaml +++ b/config.yaml @@ -328,6 +328,9 @@ uenvs: "v6.5.0": recipes: gh200: v6.5.0/gh200 + deploy: + todi: [gh200] + daint: [gh200] develop: False jupyterlab: "v4.1.8": From 3e18ed9dd636576aa9ba053aa767fe2fc189fd54 Mon Sep 17 00:00:00 2001 From: Simon Pintarelli Date: Tue, 4 Feb 2025 10:38:27 +0100 Subject: [PATCH 17/17] pin versions in post-install --- recipes/jupyterlab/v4.1.8/mc/post-install | 6 +- recipes/jupyterlab/v4.1.8/mc/requirements.txt | 110 ++++++++++++++++++ 2 files changed, 114 insertions(+), 2 deletions(-) create mode 100644 recipes/jupyterlab/v4.1.8/mc/requirements.txt diff --git a/recipes/jupyterlab/v4.1.8/mc/post-install b/recipes/jupyterlab/v4.1.8/mc/post-install index 60b1e09c..c317b4ba 100644 --- a/recipes/jupyterlab/v4.1.8/mc/post-install +++ b/recipes/jupyterlab/v4.1.8/mc/post-install @@ -1,6 +1,8 @@ export PATH=/user-tools/env/jupyter/bin:$PATH -pip install --no-cache jupyterhub==4.1.5 pyfirecrest==2.1.0 SQLAlchemy==1.4.52 oauthenticator==16.0.7 jupyterlab==4.1.8 +# pip install --no-cache jupyterhub==4.1.5 pyfirecrest==2.1.0 SQLAlchemy==1.4.52 oauthenticator==16.0.7 jupyterlab==4.1.8 +pip install -r requirements.txt -git clone https://github.com/eth-cscs/firecrestspawner.git +git clone --filter=tree:0 https://github.com/eth-cscs/firecrestspawner.git +git -C firecrestspawner checkout 0.1.2 cd firecrestspawner pip install . diff --git a/recipes/jupyterlab/v4.1.8/mc/requirements.txt b/recipes/jupyterlab/v4.1.8/mc/requirements.txt new file mode 100644 index 00000000..54f859e4 --- /dev/null +++ b/recipes/jupyterlab/v4.1.8/mc/requirements.txt @@ -0,0 +1,110 @@ +alembic==1.14.1 +anyio==4.8.0 +argon2-cffi==23.1.0 +argon2-cffi-bindings==21.2.0 +arrow==1.3.0 +asttokens==3.0.0 +async-generator==1.10 +async-lru==2.0.4 +attrs==25.1.0 +babel==2.17.0 +beautifulsoup4==4.13.1 +bleach==6.2.0 +certifi==2025.1.31 +certipy==0.2.1 +cffi==1.17.1 +charset-normalizer==3.4.1 +click==8.1.8 +colorama==0.4.6 +comm==0.2.2 +commonmark==0.9.1 +cryptography==44.0.0 +debugpy==1.8.12 +decorator==5.1.1 +defusedxml==0.7.1 +executing==2.2.0 +fastjsonschema==2.21.1 +fqdn==1.5.1 +greenlet==3.1.1 +h11==0.14.0 +httpcore==1.0.7 +httpx==0.28.1 +idna==3.10 +ipykernel==6.29.5 +ipython==8.32.0 +isoduration==20.11.0 +jedi==0.19.2 +Jinja2==3.1.5 +json5==0.10.0 +jsonpointer==3.0.0 +jsonschema==4.23.0 +jsonschema-specifications==2024.10.1 +jupyter-events==0.12.0 +jupyter-lsp==2.2.5 +jupyter-telemetry==0.1.0 +jupyter_client==8.6.3 +jupyter_core==5.7.2 +jupyter_server==2.15.0 +jupyter_server_terminals==0.5.3 +jupyterhub==4.1.5 +jupyterlab==4.1.8 +jupyterlab_pygments==0.3.0 +jupyterlab_server==2.27.3 +Mako==1.3.8 +MarkupSafe==3.0.2 +matplotlib-inline==0.1.7 +mistune==3.1.1 +nbclient==0.10.2 +nbconvert==7.16.6 +nbformat==5.10.4 +nest-asyncio==1.6.0 +notebook_shim==0.2.4 +oauthenticator==16.0.7 +oauthlib==3.2.2 +overrides==7.7.0 +packaging==24.2 +pamela==1.2.0 +pandocfilters==1.5.1 +parso==0.8.4 +pexpect==4.9.0 +platformdirs==4.3.6 +prometheus_client==0.21.1 +prompt_toolkit==3.0.50 +psutil==6.1.1 +ptyprocess==0.7.0 +pure_eval==0.2.3 +pycparser==2.22 +pyfirecrest==2.1.0 +Pygments==2.19.1 +PyJWT==2.10.1 +python-dateutil==2.9.0.post0 +python-json-logger==3.2.1 +PyYAML==6.0.2 +pyzmq==26.2.1 +referencing==0.36.2 +requests==2.32.3 +rfc3339-validator==0.1.4 +rfc3986-validator==0.1.1 +rich==12.6.0 +rpds-py==0.22.3 +ruamel.yaml==0.18.10 +Send2Trash==1.8.3 +shellingham==1.5.4 +six==1.17.0 +sniffio==1.3.1 +soupsieve==2.6 +SQLAlchemy==1.4.52 +stack-data==0.6.3 +terminado==0.18.1 +tinycss2==1.4.0 +tornado==6.4.2 +traitlets==5.14.3 +typer==0.7.0 +types-python-dateutil==2.9.0.20241206 +typing_extensions==4.12.2 +uri-template==1.3.0 +urllib3==2.3.0 +wcwidth==0.2.13 +webcolors==24.11.1 +webencodings==0.5.1 +websocket-client==1.8.0