Skip to content

Commit b1e1726

Browse files
ilumsdenilumsden
authored
Adds interactive tutorial materials for Caliper and Thicket to the HPDC tutorial (#7)
* Adds Caliper and Thicket tutorial materials * Tries to fix copy of Thicket tutorial LICENSE file * Fixes CI to use recursive submodule checkout * Removes parallel builds of Caliper tutorial apps to prevent weird make issues. * Tries fixing the issue that prevents the license of Thicket Tutorial from copying * Comments out the copying of the Thicket tutorial's LICENSE file * Tries to fix the CI issues * Fixes CI to update submodules everywhere
1 parent 1686fb4 commit b1e1726

File tree

8 files changed

+76
-7
lines changed

8 files changed

+76
-7
lines changed

‎.github/workflows/push_images.yml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,8 @@ jobs:
4242

4343
steps:
4444
- uses: actions/checkout@v4
45+
with:
46+
submodules: "recursive"
4547

4648
- name: Remove unneeded stuff to make space for container
4749
uses: jlumbroso/free-disk-space@v1.3.1
@@ -110,6 +112,8 @@ jobs:
110112

111113
steps:
112114
- uses: actions/checkout@v4
115+
with:
116+
submodules: "recursive"
113117

114118
- name: Remove unneeded stuff to make space for container
115119
uses: jlumbroso/free-disk-space@v1.3.1
@@ -178,6 +182,8 @@ jobs:
178182

179183
steps:
180184
- uses: actions/checkout@v4
185+
with:
186+
submodules: "recursive"
181187

182188
- name: Remove unneeded stuff to make space for container
183189
uses: jlumbroso/free-disk-space@v1.3.1
@@ -246,6 +252,8 @@ jobs:
246252

247253
steps:
248254
- uses: actions/checkout@v4
255+
with:
256+
submodules: "recursive"
249257

250258
- name: Remove unneeded stuff to make space for container
251259
uses: jlumbroso/free-disk-space@v1.3.1
@@ -313,6 +321,8 @@ jobs:
313321

314322
steps:
315323
- uses: actions/checkout@v4
324+
with:
325+
submodules: "recursive"
316326

317327
- name: Remove unneeded stuff to make space for container
318328
uses: jlumbroso/free-disk-space@v1.3.1

‎.github/workflows/test_build_images.yml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ jobs:
1111

1212
steps:
1313
- uses: actions/checkout@v4
14+
with:
15+
submodules: "recursive"
1416

1517
- id: set-matrix
1618
run: |
@@ -35,6 +37,8 @@ jobs:
3537

3638
steps:
3739
- uses: actions/checkout@v4
40+
with:
41+
submodules: "recursive"
3842

3943
- name: Remove unneeded stuff to make space for container
4044
uses: jlumbroso/free-disk-space@v1.3.1
@@ -101,6 +105,8 @@ jobs:
101105

102106
steps:
103107
- uses: actions/checkout@v4
108+
with:
109+
submodules: "recursive"
104110

105111
- name: Remove unneeded stuff to make space for container
106112
uses: jlumbroso/free-disk-space@v1.3.1
@@ -179,6 +185,8 @@ jobs:
179185

180186
steps:
181187
- uses: actions/checkout@v4
188+
with:
189+
submodules: "recursive"
182190

183191
- name: Remove unneeded stuff to make space for container
184192
uses: jlumbroso/free-disk-space@v1.3.1
@@ -257,6 +265,8 @@ jobs:
257265

258266
steps:
259267
- uses: actions/checkout@v4
268+
with:
269+
submodules: "recursive"
260270

261271
- name: Remove unneeded stuff to make space for container
262272
uses: jlumbroso/free-disk-space@v1.3.1
@@ -322,6 +332,8 @@ jobs:
322332

323333
steps:
324334
- uses: actions/checkout@v4
335+
with:
336+
submodules: "recursive"
325337

326338
- name: Remove unneeded stuff to make space for container
327339
uses: jlumbroso/free-disk-space@v1.3.1

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
**/.jupyter/
22
**/.local/
33

4+
**/.ipython
5+
46
# Byte-compiled / optimized / DLL files
57
__pycache__/
68
*.py[cod]

‎.gitmodules‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
[submodule "2025-HPDC/tutorial-code/thicket-tutorial"]
2+
path = 2025-HPDC/tutorial-code/thicket-tutorial
3+
url = https://github.com/LLNL/thicket-tutorial.git
4+
[submodule "2025-HPDC/tutorial-code/caliper-tutorial"]
5+
path = 2025-HPDC/tutorial-code/caliper-tutorial
6+
url = https://github.com/daboehme/caliper-tutorial.git

‎2025-HPDC/docker/Dockerfile.spawn‎

Lines changed: 44 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,46 @@ RUN /tmp/kitware-archive.sh && \
3838
cmake --version && \
3939
rm -rf /var/lib/apt/lists/*
4040

41+
COPY ./tutorial-code/thicket-tutorial/requirements.txt /tmp/thicket-tutorial/requirements.txt
42+
43+
RUN . /opt/global_py_venv/bin/activate && \
44+
python3 -m pip install -r /tmp/thicket-tutorial/requirements.txt
45+
46+
COPY ./tutorial-code/caliper-tutorial/apps /tmp/caliper-tutorial/apps/
47+
COPY ./tutorial-code/caliper-tutorial/cmake /tmp/caliper-tutorial/cmake/
48+
49+
ENV CALI_TUTORIAL_INSTALL_PREFIX=/usr
50+
51+
RUN cmake \
52+
-B /tmp/build-basic-example \
53+
-C /tmp/caliper-tutorial/cmake/basic_example.cmake \
54+
-DCMAKE_INSTALL_PREFIX="${CALI_TUTORIAL_INSTALL_PREFIX}" \
55+
-S /tmp/caliper-tutorial/apps/basic_example && \
56+
cmake --build "/tmp/build-basic-example" && \
57+
cmake --install "/tmp/build-basic-example"
58+
# && \
59+
# rm -rf /tmp/build-basic-example
60+
61+
RUN cmake \
62+
-B /tmp/build-lulesh \
63+
-C /tmp/caliper-tutorial/cmake/lulesh-mpi.cmake \
64+
-DCMAKE_INSTALL_PREFIX="${CALI_TUTORIAL_INSTALL_PREFIX}" \
65+
-S /tmp/caliper-tutorial/apps/LULESH && \
66+
cmake --build "/tmp/build-lulesh" && \
67+
cmake --install "/tmp/build-lulesh"
68+
# && \
69+
# rm -rf /tmp/build-lulesh
70+
71+
RUN cmake \
72+
-B /tmp/build-xsbench \
73+
-C /tmp/caliper-tutorial/cmake/xsbench-mpi.cmake \
74+
-DCMAKE_INSTALL_PREFIX="${CALI_TUTORIAL_INSTALL_PREFIX}" \
75+
-S /tmp/caliper-tutorial/apps/XSBench && \
76+
cmake --build "/tmp/build-xsbench" && \
77+
cmake --install "/tmp/build-xsbench"
78+
# && \
79+
# rm -rf /tmp/build-xsbench
80+
4181
RUN chmod -R 777 ~/ ${HOME}
4282

4383
WORKDIR ${HOME}
@@ -51,12 +91,10 @@ USER ${NB_USER}
5191
ENV SHELL=/usr/bin/bash
5292
ENV FLUX_URI_RESOLVE_LOCAL=t
5393

54-
RUN git clone https://github.com/LLNL/thicket-tutorial.git ${HOME}/thicket-tutorial && \
55-
cd ${HOME}/thicket-tutorial && \
56-
git submodule update --init --recursive && \
57-
git clone https://github.com/daboehme/caliper-tutorial.git ${HOME}/caliper-tutorial && \
58-
cd ${HOME}/caliper-tutorial && \
59-
git submodule update --init --recursive
94+
COPY ./tutorial-code/caliper-tutorial/tutorial ${HOME}/caliper-tutorial/
95+
COPY ./tutorial-code/thicket-tutorial/data/ ${HOME}/thicket-tutorial/data/
96+
COPY ./tutorial-code/thicket-tutorial/notebooks ${HOME}/thicket-tutorial/notebooks/
97+
COPY ./tutorial-code/thicket-tutorial/LICENSE ${HOME}/thicket-tutorial
6098

6199
COPY tutorial-code/system-description/aws-tutorial ${HOME}/benchpark/systems/aws-tutorial
62100
COPY tutorial-code/system-description/AWS_Tutorial-c7i-EFA ${HOME}/benchpark/systems/all_hardware_descriptions/AWS_Tutorial-c7i-EFA

‎2025-HPDC/tutorial-code/caliper-tutorial‎

Submodule caliper-tutorial added at a109ff8

‎2025-HPDC/tutorial-code/stub.txt‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎2025-HPDC/tutorial-code/thicket-tutorial‎

Submodule thicket-tutorial added at e0ecadd

0 commit comments

Comments
 (0)