Merge pull request #390 from mboisson/StdEnv2023

Upgrade default Compute Canada environment to StdEnv/2023

data/software_stack/computecanada.yaml

@@ -1,21 +1,18 @@
 profile::software_stack::initial_profile: "/cvmfs/soft.computecanada.ca/config/profile/bash.sh"
 profile::software_stack::lmod_default_modules:
-    - gentoo/2020
-    - imkl/2020.1.217
-    - gcc/9.3.0
-    - openmpi/4.0.3
+    - StdEnv/2023
 
-jupyterhub::kernel::venv::python: /cvmfs/soft.computecanada.ca/easybuild/software/2020/%{facts.cpu_ext}/Core/python/3.9.6/bin/python
+jupyterhub::kernel::venv::python: /cvmfs/soft.computecanada.ca/easybuild/software/2023/%{facts.cpu_microarch}/Compiler/gcccore/python/3.11.5/bin/python
 jupyterhub::kernel::venv::prefix: /opt/ipython-kernel-computecanada
 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"
+  PYTHONPATH: "/cvmfs/soft.computecanada.ca/easybuild/python/site-packages:/cvmfs/soft.computecanada.ca/custom/python/site-packages"
+  PIP_CONFIG_FILE: "/cvmfs/soft.computecanada.ca/config/python/pip-%{facts.cpu_microarch}-gentoo2023.conf"
 
 jupyterhub::jupyterhub_config_hash:
   SlurmFormSpawner:
     ui_args:
       rstudio:
-        modules: ['gcc/9.3.0', 'rstudio-server']
+        modules: ['rstudio-server']
       code-server:
         modules: ['code-server']
 

site/profile/facts.d/cpu_ext.sh

@@ -8,4 +8,14 @@ case "$cpu_ext" in
         cpu_ext="sse3"
         ;;
 esac
-echo "{ 'cpu_ext' : '${cpu_ext}' }"
+
+case "$cpu_ext" in
+    avx512)
+        cpu_microarch="x86-64-v4"
+        ;;
+    avx2)
+        cpu_microarch="x86-64-v3"
+        ;;
+esac
+
+echo "{ 'cpu_ext' : '${cpu_ext}', 'cpu_microarch': '${cpu_microarch}' }"