Merge pull request #13 from calculquebec/next

calculquebec · Dec 13, 2024 · 85c0daf · 85c0daf
2 parents 747d133 + d391fb7
commit 85c0daf
Show file tree

Hide file tree

Showing 31 changed files with 349 additions and 127 deletions.
diff --git a/acc301/main.tf b/acc301/main.tf
@@ -2,7 +2,9 @@ locals {
   name = "acc301"
 
   custom = {
-    nnode_gpu = 55
+    nnodes = {
+      gpu = 55
+    }
   }
 }
 
diff --git a/cgpu101/config.yaml b/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

diff --git a/cgpu101/main.tf b/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 }
+    }
   }
 }
diff --git a/cip101/config.yaml b/cip101/config.yaml
@@ -30,3 +30,7 @@ profile::software_stack::lmod_default_modules: ['StdEnv/2023', 'mii']
 profile::accounts::skel_archives:
     - filename: main.zip
       source: https://github.com/calculquebec/cip101-exercices/archive/refs/heads/main.zip
+
+formation_extra::stripped_skel_archives:
+    - filename: cip101_skel_extra.tar.gz
+      source: https://github.com/calculquebec/formation_skels/archive/refs/heads/cip101.tar.gz
diff --git a/cip101/main.tf b/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 = {

diff --git a/cip201/main.tf b/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 }
+    }
   }
 }
diff --git a/ciq101/main.tf b/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
+    }
   }
 }
diff --git a/cirq/main.tf b/cirq/main.tf
@@ -3,6 +3,8 @@ locals {
 
   custom = {
     home_size = 200
-    nnode_cpu = 1
+    nnodes = {
+      cpu = 1
+    }
   }
 }
diff --git a/common/Puppetfile b/common/Puppetfile
@@ -0,0 +1,3 @@
+mod 'puppet-formation_extra',
+    :git => 'https://github.com/calculquebec/puppet-formation_extra.git',
+    :ref => 'main'