Merge branch 'common' into juno

calculquebec · Dec 11, 2024 · 88f5ee9 · 88f5ee9
2 parents 1e0033e + d92a9e4
commit 88f5ee9
Show file tree

Hide file tree

Showing 18 changed files with 75 additions and 21 deletions.
diff --git a/cgpu101/config.yaml b/cgpu101/config.yaml
@@ -35,9 +35,9 @@ profile::software_stack::lmod_default_modules: ['StdEnv/2023', 'gcc', 'cuda/12.2
 
 profile::accounts::skel_archives:
     - filename: cache.zip
-      source: https://drive.google.com/uc?id=1vwrd7xNAy9WwFQLbSbZuBPQ0YtupiNnH&export=download
+      source: https://github.com/calculquebec/.cache/releases/download/v1/cache-v1.zip
     - filename: jupyter.zip
-      source: https://drive.google.com/uc?id=1hFNla811miJFnfSGg7Lw3GZhb7VPDYZB&export=download
+      source: https://github.com/calculquebec/jupyterlab-settings/releases/download/v1/jupyter-v1.zip
     - filename: master.zip
       source: https://github.com/calculquebec/formation_cpu-gpu/archive/refs/heads/master.zip
     - filename: cifar-10-python.tar.gz

diff --git a/cip201/main.tf b/cip201/main.tf
@@ -6,7 +6,7 @@ locals {
       cpu = 1
       cpupool = 8
       gpu = 2
-      gpupool = 1
+      gpupool = 10
     }
     mig = {
       gpu = { "2g.10gb" = 3 }

diff --git a/ciq101/config.yaml b/ciq101/config.yaml
@@ -30,6 +30,6 @@ profile::accounts::skel_archives:
     - filename: ciq101-main.zip
       source: https://github.com/calculquebec/ciq101/archive/refs/heads/main.zip
     - filename: cache.zip
-      source: https://drive.google.com/uc?id=1vwrd7xNAy9WwFQLbSbZuBPQ0YtupiNnH&export=download
+      source: https://github.com/calculquebec/.cache/releases/download/v1/cache-v1.zip
     - filename: jupyter.zip
-      source: https://drive.google.com/uc?id=1hFNla811miJFnfSGg7Lw3GZhb7VPDYZB&export=download
+      source: https://github.com/calculquebec/jupyterlab-settings/releases/download/v1/jupyter-v1.zip
diff --git a/ciq102/common.tf b/ciq102/common.tf
@@ -0,0 +1 @@
+../common/common.tf
diff --git a/ciq102/config.yaml b/ciq102/config.yaml
@@ -0,0 +1,35 @@
+jupyterhub::jupyterhub_config_hash:
+    SbatchForm:
+        account:
+            def: 'def-sponsor00'
+        runtime:
+            min: 3.5
+            def: 4.0
+            max: 5.0
+        nprocs:
+            min: 1
+            def: 1
+            max: 1
+        memory:
+            min: 1024
+            max: 4098
+            def: 4098
+        oversubscribe:
+            def: true
+            lock: true
+        ui:
+            def: 'lab'
+    SlurmFormSpawner:
+        disable_form: true
+
+jupyterhub::kernel::venv::packages: ['pennylane==0.37.0', 'numpy', 'pandas', 'matplotlib']
+
+profile::software_stack::lmod_default_modules: ['StdEnv/2023', 'python/3.11']
+
+profile::accounts::skel_archives:
+    - filename: ciq102-introduction-pennylane-main.zip
+      source: https://github.com/calculquebec/ciq102-introduction-pennylane/archive/refs/heads/main.zip
+    - filename: cache.zip
+      source: https://github.com/calculquebec/.cache/releases/download/v1/cache-v1.zip
+    - filename: jupyter.zip
+      source: https://github.com/calculquebec/jupyterlab-settings/releases/download/v1/jupyter-v1.zip
diff --git a/ciq102/main.tf b/ciq102/main.tf
@@ -0,0 +1,10 @@
+locals {
+  name = "ciq102"
+
+  custom = {
+    nnode_cpu = 0
+    nnode_cpupool = 4
+    nnode_gpupool = 0
+    image_cpu = "snapshot-cpunode-2024-R810.ciq102"
+  }
+}
diff --git a/cirq/config.yaml b/cirq/config.yaml
@@ -26,6 +26,6 @@ jupyterhub::kernel::venv::packages: ['cirq==1.1.0']
 
 profile::accounts::skel_archives:
     - filename: cache.zip
-      source: https://drive.google.com/uc?id=1vwrd7xNAy9WwFQLbSbZuBPQ0YtupiNnH&export=download
+      source: https://github.com/calculquebec/.cache/releases/download/v1/cache-v1.zip
     - filename: jupyter.zip
-      source: https://drive.google.com/uc?id=1hFNla811miJFnfSGg7Lw3GZhb7VPDYZB&export=download
+      source: https://github.com/calculquebec/jupyterlab-settings/releases/download/v1/jupyter-v1.zip
diff --git a/dat101/cli/cloud.tf b/dat101/cli/cloud.tf
@@ -0,0 +1,8 @@
+terraform {
+  cloud {
+    organization = "CalculQuebec"
+    workspaces {
+      name = "dat101"
+    }
+  }
+}
diff --git a/dat101/main.tf b/dat101/main.tf
@@ -3,7 +3,7 @@ locals {
 
   custom = {
     nnodes = {
-      cpu = 55
+      cpu = 16
     }
 
     instances_type_map = {

diff --git a/dat201/config.yaml b/dat201/config.yaml
@@ -30,8 +30,8 @@ profile::accounts::skel_archives:
     - filename: data-analysis-python-main.zip
       source: https://github.com/calculquebec/data-analysis-python/archive/refs/heads/main.zip
     - filename: cache.zip
-      source: https://drive.google.com/uc?id=1vwrd7xNAy9WwFQLbSbZuBPQ0YtupiNnH&export=download
+      source: https://github.com/calculquebec/.cache/releases/download/v1/cache-v1.zip
     - filename: jupyter.zip
-      source: https://drive.google.com/uc?id=1hFNla811miJFnfSGg7Lw3GZhb7VPDYZB&export=download
+      source: https://github.com/calculquebec/jupyterlab-settings/releases/download/v1/jupyter-v1.zip
     - filename: next.zip
       source: https://github.com/vega/vega-datasets/archive/refs/heads/next.zip
diff --git a/dat202/config.yaml b/dat202/config.yaml
@@ -37,6 +37,6 @@ profile::accounts::skel_archives:
     - filename: main.zip
       source: https://github.com/calculquebec/cq_formation_spark/archive/refs/heads/main.zip
     - filename: cache.zip
-      source: https://drive.google.com/uc?id=1vwrd7xNAy9WwFQLbSbZuBPQ0YtupiNnH&export=download
+      source: https://github.com/calculquebec/.cache/releases/download/v1/cache-v1.zip
     - filename: jupyter.zip
-      source: https://drive.google.com/uc?id=1hFNla811miJFnfSGg7Lw3GZhb7VPDYZB&export=download
+      source: https://github.com/calculquebec/jupyterlab-settings/releases/download/v1/jupyter-v1.zip
diff --git a/example/config.yaml b/example/config.yaml
@@ -33,9 +33,9 @@ profile::freeipa::mokey::require_verify_admin: false
 
 profile::accounts::skel_archives:
     - filename: cache.zip
-      source: https://drive.google.com/uc?id=1vwrd7xNAy9WwFQLbSbZuBPQ0YtupiNnH&export=download
+      source: https://github.com/calculquebec/.cache/releases/download/v1/cache-v1.zip
     - filename: jupyter.zip
-      source: https://drive.google.com/uc?id=1hFNla811miJFnfSGg7Lw3GZhb7VPDYZB&export=download
+      source: https://github.com/calculquebec/jupyterlab-settings/releases/download/v1/jupyter-v1.zip
     - filename: master.zip
       source: https://github.com/calculquebec/formation_cpu-gpu/archive/refs/heads/master.zip
     - filename: cifar-10-python.tar.gz

diff --git a/lab101/config.yaml b/lab101/config.yaml
@@ -37,7 +37,7 @@ profile::accounts::skel_archives:
       source: https://github.com/calculquebec/lab101-exercices/archive/refs/heads/main.zip
 
     - filename: jupyter.zip
-      source: https://drive.google.com/uc?export=download&id=1hFNla811miJFnfSGg7Lw3GZhb7VPDYZB
+      source: https://github.com/calculquebec/jupyterlab-settings/releases/download/v1/jupyter-v1.zip
 
     - filename: matplotlib.zip
       source: https://drive.google.com/uc?export=download&id=1vwrd7xNAy9WwFQLbSbZuBPQ0YtupiNnH
diff --git a/pyt101/config.yaml b/pyt101/config.yaml
@@ -32,7 +32,7 @@ profile::software_stack::lmod_default_modules: ['StdEnv/2020']
 
 profile::accounts::skel_archives:
     - filename: jupyter.zip
-      source: https://drive.google.com/uc?export=download&id=1hFNla811miJFnfSGg7Lw3GZhb7VPDYZB
+      source: https://github.com/calculquebec/jupyterlab-settings/releases/download/v1/jupyter-v1.zip
 
     - filename: matplotlib.zip
       source: https://drive.google.com/uc?export=download&id=1vwrd7xNAy9WwFQLbSbZuBPQ0YtupiNnH
diff --git a/pyt301/config.yaml b/pyt301/config.yaml
@@ -36,6 +36,6 @@ profile::accounts::skel_archives:
     - filename: main.zip
       source: https://github.com/calculquebec/cq-intro-python-gpu/archive/refs/heads/main.zip
     - filename: cache.zip
-      source: https://drive.google.com/uc?id=1vwrd7xNAy9WwFQLbSbZuBPQ0YtupiNnH&export=download
+      source: https://github.com/calculquebec/.cache/releases/download/v1/cache-v1.zip
     - filename: jupyter.zip
-      source: https://drive.google.com/uc?id=1hFNla811miJFnfSGg7Lw3GZhb7VPDYZB&export=download
+      source: https://github.com/calculquebec/jupyterlab-settings/releases/download/v1/jupyter-v1.zip
diff --git a/pyt302/config.yaml b/pyt302/config.yaml
@@ -29,4 +29,4 @@ jupyterhub::kernel::venv::packages: ['cupy']
 
 profile::accounts::skel_archives:
     - filename: jupyter.zip
-      source: https://drive.google.com/uc?id=1hFNla811miJFnfSGg7Lw3GZhb7VPDYZB&export=download
+      source: https://github.com/calculquebec/jupyterlab-settings/releases/download/v1/jupyter-v1.zip
diff --git a/r101/config.yaml b/r101/config.yaml
@@ -29,4 +29,4 @@ profile::accounts::skel_archives:
       source: https://github.com/hgingras/Formation-R/archive/refs/heads/main.zip
 
     - filename: jupyter.zip
-      source: https://drive.google.com/uc?export=download&id=1hFNla811miJFnfSGg7Lw3GZhb7VPDYZB
+      source: https://github.com/calculquebec/jupyterlab-settings/releases/download/v1/jupyter-v1.zip
diff --git a/snowflurry/config.yaml b/snowflurry/config.yaml
@@ -31,4 +31,4 @@ profile::accounts::skel_archives:
       source: https://github.com/calculquebec/cq-formation-intro-snowflake/archive/refs/heads/main.zip
 
     - filename: jupyter.zip
-      source: https://drive.google.com/uc?export=download&id=1hFNla811miJFnfSGg7Lw3GZhb7VPDYZB
+      source: https://github.com/calculquebec/jupyterlab-settings/releases/download/v1/jupyter-v1.zip