Adds interactive tutorial materials for Caliper and Thicket to the HPDC tutorial

.github/workflows/push_images.yml

@@ -42,6 +42,8 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
+      with:
+        submodules: "recursive"
 
     - name: Remove unneeded stuff to make space for container
       uses: jlumbroso/free-disk-space@v1.3.1
@@ -110,6 +112,8 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
+      with:
+        submodules: "recursive"
 
     - name: Remove unneeded stuff to make space for container
       uses: jlumbroso/free-disk-space@v1.3.1
@@ -178,6 +182,8 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
+      with:
+        submodules: "recursive"
 
     - name: Remove unneeded stuff to make space for container
       uses: jlumbroso/free-disk-space@v1.3.1
@@ -246,6 +252,8 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
+      with:
+        submodules: "recursive"
 
     - name: Remove unneeded stuff to make space for container
       uses: jlumbroso/free-disk-space@v1.3.1
@@ -313,6 +321,8 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
+      with:
+        submodules: "recursive"
 
     - name: Remove unneeded stuff to make space for container
       uses: jlumbroso/free-disk-space@v1.3.1

.github/workflows/test_build_images.yml

@@ -11,6 +11,8 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
+      with:
+        submodules: "recursive"
 
     - id: set-matrix
       run: |
@@ -35,6 +37,8 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
+      with:
+        submodules: "recursive"
 
     - name: Remove unneeded stuff to make space for container
       uses: jlumbroso/free-disk-space@v1.3.1
@@ -101,6 +105,8 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
+      with:
+        submodules: "recursive"
 
     - name: Remove unneeded stuff to make space for container
       uses: jlumbroso/free-disk-space@v1.3.1
@@ -179,6 +185,8 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
+      with:
+        submodules: "recursive"
 
     - name: Remove unneeded stuff to make space for container
       uses: jlumbroso/free-disk-space@v1.3.1
@@ -257,6 +265,8 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
+      with:
+        submodules: "recursive"
 
     - name: Remove unneeded stuff to make space for container
       uses: jlumbroso/free-disk-space@v1.3.1
@@ -322,6 +332,8 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
+      with:
+        submodules: "recursive"
 
     - name: Remove unneeded stuff to make space for container
       uses: jlumbroso/free-disk-space@v1.3.1

.gitignore

@@ -1,6 +1,8 @@
 **/.jupyter/
 **/.local/
 
+**/.ipython
+
 # Byte-compiled / optimized / DLL files
 __pycache__/
 *.py[cod]

.gitmodules

@@ -0,0 +1,6 @@
+[submodule "2025-HPDC/tutorial-code/thicket-tutorial"]
+	path = 2025-HPDC/tutorial-code/thicket-tutorial
+	url = https://github.com/LLNL/thicket-tutorial.git
+[submodule "2025-HPDC/tutorial-code/caliper-tutorial"]
+	path = 2025-HPDC/tutorial-code/caliper-tutorial
+	url = https://github.com/daboehme/caliper-tutorial.git

2025-HPDC/docker/Dockerfile.spawn

@@ -38,6 +38,46 @@ RUN /tmp/kitware-archive.sh && \
     cmake --version && \
     rm -rf /var/lib/apt/lists/*
 
+COPY ./tutorial-code/thicket-tutorial/requirements.txt /tmp/thicket-tutorial/requirements.txt
+
+RUN . /opt/global_py_venv/bin/activate && \
+    python3 -m pip install -r /tmp/thicket-tutorial/requirements.txt
+
+COPY ./tutorial-code/caliper-tutorial/apps /tmp/caliper-tutorial/apps/
+COPY ./tutorial-code/caliper-tutorial/cmake /tmp/caliper-tutorial/cmake/
+
+ENV CALI_TUTORIAL_INSTALL_PREFIX=/usr
+
+RUN cmake \
+    -B /tmp/build-basic-example \
+    -C /tmp/caliper-tutorial/cmake/basic_example.cmake \
+    -DCMAKE_INSTALL_PREFIX="${CALI_TUTORIAL_INSTALL_PREFIX}" \
+    -S /tmp/caliper-tutorial/apps/basic_example && \
+    cmake --build "/tmp/build-basic-example" && \
+    cmake --install "/tmp/build-basic-example"
+# && \
+# rm -rf /tmp/build-basic-example
+
+RUN cmake \
+    -B /tmp/build-lulesh \
+    -C /tmp/caliper-tutorial/cmake/lulesh-mpi.cmake \
+    -DCMAKE_INSTALL_PREFIX="${CALI_TUTORIAL_INSTALL_PREFIX}" \
+    -S /tmp/caliper-tutorial/apps/LULESH && \
+    cmake --build "/tmp/build-lulesh" && \
+    cmake --install "/tmp/build-lulesh"
+# && \
+# rm -rf /tmp/build-lulesh
+
+RUN cmake \
+    -B /tmp/build-xsbench \
+    -C /tmp/caliper-tutorial/cmake/xsbench-mpi.cmake \
+    -DCMAKE_INSTALL_PREFIX="${CALI_TUTORIAL_INSTALL_PREFIX}" \
+    -S /tmp/caliper-tutorial/apps/XSBench && \
+    cmake --build "/tmp/build-xsbench" && \
+    cmake --install "/tmp/build-xsbench"
+# && \
+# rm -rf /tmp/build-xsbench
+
 RUN chmod -R 777 ~/ ${HOME}
 
 WORKDIR ${HOME}
@@ -51,12 +91,10 @@ USER ${NB_USER}
 ENV SHELL=/usr/bin/bash
 ENV FLUX_URI_RESOLVE_LOCAL=t
 
-RUN git clone https://github.com/LLNL/thicket-tutorial.git ${HOME}/thicket-tutorial && \
-    cd ${HOME}/thicket-tutorial && \
-    git submodule update --init --recursive && \
-    git clone https://github.com/daboehme/caliper-tutorial.git ${HOME}/caliper-tutorial && \
-    cd ${HOME}/caliper-tutorial && \
-    git submodule update --init --recursive
+COPY ./tutorial-code/caliper-tutorial/tutorial ${HOME}/caliper-tutorial/
+COPY ./tutorial-code/thicket-tutorial/data/ ${HOME}/thicket-tutorial/data/
+COPY ./tutorial-code/thicket-tutorial/notebooks ${HOME}/thicket-tutorial/notebooks/
+COPY ./tutorial-code/thicket-tutorial/LICENSE ${HOME}/thicket-tutorial
 
 COPY tutorial-code/system-description/aws-tutorial ${HOME}/benchpark/systems/aws-tutorial
 COPY tutorial-code/system-description/AWS_Tutorial-c7i-EFA ${HOME}/benchpark/systems/all_hardware_descriptions/AWS_Tutorial-c7i-EFA