Merge branch 'master' of https://github.com/csc-training/summerschool

.github/workflows/pages-html.yml

@@ -0,0 +1,21 @@
+name: Deploy HTML slides to Pages
+
+on:
+  # Runs on pushes targeting the default branch
+  push:
+    branches: ["master"]
+
+  # Allows you to run this workflow manually from the Actions tab
+  workflow_dispatch:
+
+# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
+permissions:
+  contents: read
+  pages: write
+  id-token: write
+
+jobs:
+  pages-html:
+    uses: ./.github/workflows/pages.yml
+    with:
+      include_pdf: false

.github/workflows/pages-pdf.yml

@@ -0,0 +1,17 @@
+name: Deploy HTML and PDF slides to Pages
+
+on:
+  # Allows you to run this workflow manually from the Actions tab
+  workflow_dispatch:
+
+# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
+permissions:
+  contents: read
+  pages: write
+  id-token: write
+
+jobs:
+  pages-pdf:
+    uses: ./.github/workflows/pages.yml
+    with:
+      include_pdf: true

.github/workflows/pages.yml

@@ -2,12 +2,11 @@
 name: Deploy slides to Pages
 
 on:
-  # Runs on pushes targeting the default branch
-  push:
-    branches: ["master"]
-
-  # Allows you to run this workflow manually from the Actions tab
-  workflow_dispatch:
+  workflow_call:
+    inputs:
+      include_pdf:
+        required: true
+        type: boolean
 
 # Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
 permissions:
@@ -23,23 +22,38 @@ concurrency:
 
 jobs:
   build:
+    timeout-minutes: 30
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/csc-training/slidefactory:3.0.0-beta.5
+      image: ghcr.io/csc-training/slidefactory:3.0.0-beta.9
     steps:
       - name: Checkout
         uses: actions/checkout@v4
       - name: Setup Pages
         id: pages
         uses: actions/configure-pages@v4
       - name: Build slides
+        env:
+          INCLUDE_PDF: ${{ inputs.include_pdf }}
         run: |
+          SLIDE_ZIP=slides.zip
+
+          git config --global --add safe.directory $PWD
+          GIT_DATE=$(git show -s --format=%ci $GITHUB_SHA)
+          echo "Updated on $GIT_DATE ([$GITHUB_SHA]($GITHUB_SERVER_URL/$GITHUB_REPOSITORY/commit/$GITHUB_SHA))" >> index.md
+          echo "" >> index.md
+
           mkdir build
 
           mkdir -p build/theme/csc-plain
           cp /slidefactory/theme/csc-plain/csc.css build/theme/csc-plain/
           cp -r /slidefactory/theme/csc-plain/img build/theme/csc-plain/
 
+          if [[ "$INCLUDE_PDF" == "true" ]]; then
+            echo "[Download a zip file containing all slides]($SLIDE_ZIP)" >> index.md
+            echo "" >> index.md
+          fi
+
           for d in \
                    intro-to-hpc \
                    computer-platforms \
@@ -55,12 +69,28 @@ jobs:
             echo "## $d" >> index.md
             /slidefactory/slidefactory.py --format html $d/docs/*.md -o build/$d/ --theme_url ../theme/csc-plain/csc.css
 
+            if [[ "$INCLUDE_PDF" == "true" ]]; then
+              /slidefactory/slidefactory.py --format pdf $d/docs/*.md -o build/$d/
+            fi
+
             for f in build/$d/*.html; do
               echo "* [${f##*/}](${f#build/}){target=\"_blank\"}" >> index.md
+              if [[ "$INCLUDE_PDF" == "true" ]]; then
+                f_pdf=${f%.*}.pdf
+                echo "  ([PDF](${f_pdf#build/}){target=\"_blank\"})" >> index.md
+              fi
             done
 
             echo "" >> index.md
+
           done
+
+          if [[ "$INCLUDE_PDF" == "true" ]]; then
+            cd build
+            zip $SLIDE_ZIP */*.pdf
+            cd -
+          fi
+
           cat index.md
           pandoc --standalone --metadata title="CSC Summer School in High-Performance Computing" index.md -o build/index.html
           rm index.md

gpu-openmp/docs/01-GPU-intro.md

@@ -113,7 +113,7 @@ CPU - manycores
 </div>
 
 <div class="column">
-![ <span style=" font-size:0.5em;">image credits: Nemez @GPUsAreMagic https://nemez.net/die/RocketLake</span> ](img/core_die_shot.jpg){width=57%}
+![ <span style=" font-size:0.5em;">image credits: Nemez @GPUsAreMagic https://nemez.net/die/RocketLake</span> ](img/core_die_shot_small.jpg){width=57%}
 
 </div>
 
@@ -135,7 +135,7 @@ CPU - manycores
 
 
 <div class="column">
-![ <span style=" font-size:0.5em;">image credits: Nemez @GPUsAreMagic https://nemez.net/die/Ampere</span> ](img/gpu_die_shot.jpg){width=70%}
+![ <span style=" font-size:0.5em;">image credits: Nemez @GPUsAreMagic https://nemez.net/die/Ampere</span> ](img/gpu_die_shot_small.jpg){width=70%}
 
 </div>