From fdddf9eefae02301fe1e80f3e52c47a6441a416e Mon Sep 17 00:00:00 2001 From: Maxime Boissonneault Date: Mon, 23 Sep 2024 16:29:12 -0400 Subject: [PATCH] ensure that all venv use a python from cvmfs and use our wheelhouse --- cgpu101/config.yaml | 6 +++--- cip201/config.yaml | 5 ----- ciq101/config.yaml | 8 -------- cirq/config.yaml | 5 ----- common/config.yaml | 9 +++++++++ dat201/config.yaml | 8 -------- dat202/config.yaml | 6 +++--- example/config.yaml | 9 +-------- lab101/config.yaml | 7 +++---- pyt101/config.yaml | 8 +++----- pyt301/config.yaml | 7 +++---- pyt302/config.yaml | 5 ----- 12 files changed, 25 insertions(+), 58 deletions(-) diff --git a/cgpu101/config.yaml b/cgpu101/config.yaml index 3005807..e03758e 100644 --- a/cgpu101/config.yaml +++ b/cgpu101/config.yaml @@ -26,11 +26,11 @@ jupyterhub::jupyterhub_config_hash: disable_form: true start_timeout: 900 -lookup_options: - jupyterhub::kernel::venv::pip_environment: - merge: deep +jupyterhub::kernel::venv::python: /cvmfs/soft.computecanada.ca/easybuild/software/2020/avx2/Core/python/3.10.2/bin/python3 +jupyterhub::kernel::venv::prefix: /opt/ipython-kernel-3.10 jupyterhub::kernel::venv::pip_environment: PIP_NO_INDEX: 1 + PIP_CONFIG_FILE: /cvmfs/soft.computecanada.ca/config/python/pip-avx2-gentoo.conf jupyterhub::kernel::venv::packages: ['cupy', 'jax==0.4.2', 'torchvision', 'matplotlib'] profile::freeipa::mokey::enable_user_signup: false diff --git a/cip201/config.yaml b/cip201/config.yaml index 74619b2..629a8d8 100644 --- a/cip201/config.yaml +++ b/cip201/config.yaml @@ -25,11 +25,6 @@ jupyterhub::jupyterhub_config_hash: SlurmFormSpawner: disable_form: true -lookup_options: - jupyterhub::kernel::venv::pip_environment: - merge: deep -jupyterhub::kernel::venv::pip_environment: - PIP_NO_INDEX: 1 jupyterhub::kernel::venv::packages: ['numpy', 'cupy'] profile::slurm::base::suspend_time: 7200 diff --git a/ciq101/config.yaml b/ciq101/config.yaml index d9e920f..e1a197e 100644 --- a/ciq101/config.yaml +++ b/ciq101/config.yaml @@ -22,14 +22,6 @@ jupyterhub::jupyterhub_config_hash: SlurmFormSpawner: disable_form: true -jupyterhub::kernel::venv::python: /cvmfs/soft.computecanada.ca/easybuild/software/2023/x86-64-v3/Compiler/gcccore/python/3.11.5/bin/python3 -jupyterhub::kernel::venv::prefix: /opt/ipython-kernel-3.11 -lookup_options: - jupyterhub::kernel::venv::pip_environment: - merge: deep -jupyterhub::kernel::venv::pip_environment: - PIP_NO_INDEX: 1 - PIP_CONFIG_FILE: /cvmfs/soft.computecanada.ca/config/python/pip-x86-64-v3-gentoo2023.conf jupyterhub::kernel::venv::packages: ['pennylane==0.37.0'] profile::software_stack::lmod_default_modules: ['StdEnv/2023', 'python/3.11'] diff --git a/cirq/config.yaml b/cirq/config.yaml index 994bff6..a8854a1 100644 --- a/cirq/config.yaml +++ b/cirq/config.yaml @@ -22,11 +22,6 @@ jupyterhub::jupyterhub_config_hash: SlurmFormSpawner: disable_form: true -lookup_options: - jupyterhub::kernel::venv::pip_environment: - merge: deep -jupyterhub::kernel::venv::pip_environment: - PIP_NO_INDEX: 1 jupyterhub::kernel::venv::packages: ['cirq==1.1.0'] profile::accounts::skel_archives: diff --git a/common/config.yaml b/common/config.yaml index 4d0d47a..2317d09 100644 --- a/common/config.yaml +++ b/common/config.yaml @@ -21,7 +21,16 @@ profile::freeipa::mokey::enable_user_signup: false profile::slurm::base::slurm_version: '23.02' profile::software_stack::lmod_default_modules: ['StdEnv/2023'] +jupyterhub::kernel::venv::python: /cvmfs/soft.computecanada.ca/easybuild/software/2023/x86-64-v3/Compiler/gcccore/python/3.11.5/bin/python3 +jupyterhub::kernel::venv::prefix: /opt/ipython-kernel-3.11 +lookup_options: + jupyterhub::kernel::venv::pip_environment: + merge: deep +jupyterhub::kernel::venv::pip_environment: + PIP_NO_INDEX: 1 + PIP_CONFIG_FILE: /cvmfs/soft.computecanada.ca/config/python/pip-x86-64-v3-gentoo2023.conf + prometheus::global_config: scrape_interval: '1m' scrape_timeout: '1m' diff --git a/dat201/config.yaml b/dat201/config.yaml index 78c613f..d9d2260 100644 --- a/dat201/config.yaml +++ b/dat201/config.yaml @@ -22,15 +22,7 @@ jupyterhub::jupyterhub_config_hash: SlurmFormSpawner: disable_form: true -lookup_options: - jupyterhub::kernel::venv::pip_environment: - merge: deep -jupyterhub::kernel::venv::pip_environment: - PIP_NO_INDEX: 1 - jupyterhub::kernel::venv::packages: ['numpy', 'pandas', 'matplotlib', 'plotnine', 'altair'] -jupyterhub::kernel::venv::python: "/cvmfs/soft.computecanada.ca/easybuild/software/2020/avx2/Core/python/3.11.5/bin/python" -profile::software_stack::lmod_default_modules: ['StdEnv/2020'] profile::accounts::skel_archives: - filename: analyse-donnees-python-main.zip diff --git a/dat202/config.yaml b/dat202/config.yaml index 93841fe..a7f4048 100644 --- a/dat202/config.yaml +++ b/dat202/config.yaml @@ -22,11 +22,11 @@ jupyterhub::jupyterhub_config_hash: SlurmFormSpawner: disable_form: true -lookup_options: - jupyterhub::kernel::venv::pip_environment: - merge: deep +jupyterhub::kernel::venv::python: /cvmfs/soft.computecanada.ca/easybuild/software/2020/avx2/Core/python/3.9.6/bin/python3 +jupyterhub::kernel::venv::prefix: /opt/ipython-kernel-3.9 jupyterhub::kernel::venv::pip_environment: PIP_NO_INDEX: 1 + PIP_CONFIG_FILE: /cvmfs/soft.computecanada.ca/config/python/pip-avx2-gentoo.conf jupyterhub::kernel::venv::packages: ['pyspark', 'numpy', 'pandas<2.0.0'] diff --git a/example/config.yaml b/example/config.yaml index afd1ec4..29514d2 100644 --- a/example/config.yaml +++ b/example/config.yaml @@ -26,18 +26,11 @@ jupyterhub::jupyterhub_config_hash: disable_form: true start_timeout: 900 -lookup_options: - jupyterhub::kernel::venv::pip_environment: - merge: deep -jupyterhub::kernel::venv::pip_environment: - PIP_NO_INDEX: 1 -jupyterhub::kernel::venv::packages: ['cupy', 'jax==0.4.2', 'torchvision', 'matplotlib'] +jupyterhub::kernel::venv::packages: ['cupy', 'jax==0.4.30', 'torchvision', 'matplotlib'] profile::freeipa::mokey::enable_user_signup: true profile::freeipa::mokey::require_verify_admin: false -profile::software_stack::lmod_default_modules: ['StdEnv/2020', 'gcc', 'cuda/11.4'] - profile::accounts::skel_archives: - filename: cache.zip source: https://drive.google.com/uc?id=1vwrd7xNAy9WwFQLbSbZuBPQ0YtupiNnH&export=download diff --git a/lab101/config.yaml b/lab101/config.yaml index 82cee87..0458b1b 100644 --- a/lab101/config.yaml +++ b/lab101/config.yaml @@ -22,13 +22,12 @@ jupyterhub::jupyterhub_config_hash: SlurmFormSpawner: disable_form: true -lookup_options: - jupyterhub::kernel::venv::pip_environment: - merge: deep +jupyterhub::kernel::venv::python: /cvmfs/soft.computecanada.ca/easybuild/software/2020/avx2/Core/python/3.10.2/bin/python3 +jupyterhub::kernel::venv::prefix: /opt/ipython-kernel-3.10 jupyterhub::kernel::venv::pip_environment: PIP_NO_INDEX: 1 + PIP_CONFIG_FILE: /cvmfs/soft.computecanada.ca/config/python/pip-avx2-gentoo.conf jupyterhub::kernel::venv::packages: ['numpy', 'matplotlib'] - profile::software_stack::lmod_default_modules: ['StdEnv/2020', 'ir-kernel/4.2', 'ijulia-kernel/1.8'] profile::accounts::skel_archives: diff --git a/pyt101/config.yaml b/pyt101/config.yaml index 95d0d96..9267a26 100644 --- a/pyt101/config.yaml +++ b/pyt101/config.yaml @@ -22,13 +22,11 @@ jupyterhub::jupyterhub_config_hash: SlurmFormSpawner: disable_form: true -lookup_options: - jupyterhub::kernel::venv::pip_environment: - merge: deep +jupyterhub::kernel::venv::python: /cvmfs/soft.computecanada.ca/easybuild/software/2020/avx2/Core/python/3.10.2/bin/python3 +jupyterhub::kernel::venv::prefix: /opt/ipython-kernel-3.10 jupyterhub::kernel::venv::pip_environment: - PYTHONPATH: "/cvmfs/soft.computecanada.ca/custom/python/site-packages" - PIP_CONFIG_FILE: "/cvmfs/soft.computecanada.ca/config/python/pip-%{facts.cpu_ext}-gentoo.conf" PIP_NO_INDEX: 1 + PIP_CONFIG_FILE: /cvmfs/soft.computecanada.ca/config/python/pip-avx2-gentoo.conf jupyterhub::kernel::venv::packages: ['numpy<2', 'pandas', 'matplotlib'] profile::software_stack::lmod_default_modules: ['StdEnv/2020'] diff --git a/pyt301/config.yaml b/pyt301/config.yaml index 1d66ea5..2a7aa75 100644 --- a/pyt301/config.yaml +++ b/pyt301/config.yaml @@ -25,12 +25,11 @@ jupyterhub::jupyterhub_config_hash: SlurmFormSpawner: disable_form: true - -lookup_options: - jupyterhub::kernel::venv::pip_environment: - merge: deep +jupyterhub::kernel::venv::python: /cvmfs/soft.computecanada.ca/easybuild/software/2020/avx2/Core/python/3.10.2/bin/python3 +jupyterhub::kernel::venv::prefix: /opt/ipython-kernel-3.10 jupyterhub::kernel::venv::pip_environment: PIP_NO_INDEX: 1 + PIP_CONFIG_FILE: /cvmfs/soft.computecanada.ca/config/python/pip-avx2-gentoo.conf jupyterhub::kernel::venv::packages: ['numba==0.53.1', "numpy==1.23.5", 'pycuda', 'matplotlib'] profile::software_stack::lmod_default_modules: ['StdEnv/2020', 'gcc', 'cuda'] diff --git a/pyt302/config.yaml b/pyt302/config.yaml index 0426757..61b06e4 100644 --- a/pyt302/config.yaml +++ b/pyt302/config.yaml @@ -25,11 +25,6 @@ jupyterhub::jupyterhub_config_hash: SlurmFormSpawner: disable_form: true -lookup_options: - jupyterhub::kernel::venv::pip_environment: - merge: deep -jupyterhub::kernel::venv::pip_environment: - PIP_NO_INDEX: 1 jupyterhub::kernel::venv::packages: ['cupy'] profile::accounts::skel_archives: