[WIP] Juno, do not merge until we are doing GPU classes

acc301/main.tf

@@ -2,7 +2,9 @@ locals {
   name = "acc301"
 
   custom = {
-    nnode_gpu = 55
+    nnodes = {
+      gpu = 55
+    }
   }
 }
 

cgpu101/config.yaml

@@ -8,12 +8,12 @@ jupyterhub::jupyterhub_config_hash:
             max: 5.0
         nprocs:
             min: 1
-            def: 4
-            max: 4
+            def: 6
+            max: 6
         memory:
             min: 1024
-            max: 22000
-            def: 21000
+            max: 55000
+            def: 55000
         gpus:
             def: 'gpu:1'
             choices: ['gpu:1']
@@ -26,17 +26,12 @@ jupyterhub::jupyterhub_config_hash:
         disable_form: true
         start_timeout: 900
 
-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']
+jupyterhub::kernel::venv::packages: ['cupy==12.2.0', 'jax==0.4.34', 'torchvision==0.20.1', 'matplotlib==3.9.2']
 
 profile::freeipa::mokey::enable_user_signup: false
 profile::freeipa::mokey::require_verify_admin: false
 
-profile::software_stack::lmod_default_modules: ['StdEnv/2020', 'gcc', 'cuda/11.4']
+profile::software_stack::lmod_default_modules: ['StdEnv/2023', 'gcc', 'cuda/12.2']
 
 profile::accounts::skel_archives:
     - filename: cache.zip

cgpu101/main.tf

@@ -3,8 +3,13 @@ locals {
 
   custom = {
     home_size = 200
-    nnode_cpu = 0
-    nnode_gpu = 1
-    nnode_gpupool = 40
+    nnodes = {
+      cpu = 0
+      gpu = 0
+      gpupool = 4
+    }
+    mig = {
+      gpupool = { "3g.20gb" = 2 }
+    }
   }
 }

cip101/main.tf

@@ -2,8 +2,10 @@ locals {
   name = "cip101"
 
   custom = {
-    nnode_cpu = 2
-    nnode_compute = 2
+    nnodes = {
+      cpu = 2
+      compute_node = 2
+    }
 
     instances_type_map = {
       arbutus = {

cip201/main.tf

@@ -2,9 +2,15 @@ locals {
   name = "cip201"
 
   custom = {
-    nnode_cpu = 1
-    nnode_cpupool = 8
-    nnode_gpu = 2
-    nnode_gpupool = 10
+    nnodes = {
+      cpu = 1
+      cpupool = 8
+      gpu = 2
+      gpupool = 10
+    }
+    mig = {
+      gpu = { "2g.10gb" = 3 }
+      gpupool = { "2g.10gb" = 3 }
+    }
   }
 }

ciq101/main.tf

@@ -2,8 +2,10 @@ locals {
   name = "ciq101"
 
   custom = {
-    nnode_cpu = 0
-    nnode_cpupool = 4
-    nnode_gpupool = 0
+    nnodes = {
+      cpu = 0
+      cpupool = 4
+      gpupool = 0
+    }
   }
 }

cirq/main.tf

@@ -3,6 +3,8 @@ locals {
 
   custom = {
     home_size = 200
-    nnode_cpu = 1
+    nnodes = {
+      cpu = 1
+    }
   }
 }