Skip to content

Commit 8a8dc40

Browse files
committed
Merge branch 'master' of https://github.com/learning-process/parallel_programming_course into an/increase-coverage-1
# Conflicts: # modules/performance/include/performance.hpp
2 parents 203af69 + 1d7e7f8 commit 8a8dc40

17 files changed

Lines changed: 228 additions & 241 deletions

File tree

File renamed without changes.
File renamed without changes.

.github/labeler.yml

Lines changed: 88 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,94 @@
1-
'task:all':
2-
- "tasks/**/all"
3-
'task:mpi':
4-
- "tasks/**/mpi"
5-
'task:omp':
6-
- "tasks/**/omp"
7-
'task:seq':
8-
- "tasks/**/seq"
9-
'task:stl':
10-
- "tasks/**/stl"
11-
'task:tbb':
12-
- "tasks/**/tbb"
1+
"task:all":
2+
- changed-files:
3+
- any-glob-to-any-file:
4+
- "tasks/**/all"
5+
6+
"task:mpi":
7+
- changed-files:
8+
- any-glob-to-any-file:
9+
- "tasks/**/mpi"
10+
11+
"task:omp":
12+
- changed-files:
13+
- any-glob-to-any-file:
14+
- "tasks/**/omp"
15+
16+
"task:seq":
17+
- changed-files:
18+
- any-glob-to-any-file:
19+
- "tasks/**/seq"
20+
21+
"task:stl":
22+
- changed-files:
23+
- any-glob-to-any-file:
24+
- "tasks/**/stl"
25+
26+
"task:tbb":
27+
- changed-files:
28+
- any-glob-to-any-file:
29+
- "tasks/**/tbb"
30+
1331
task:
14-
- "tasks/**"
32+
- changed-files:
33+
- any-glob-to-any-file:
34+
- "tasks/**"
35+
1536
ci:
16-
- ".github/**"
17-
- "appveyor.yml"
18-
'modules:performance':
19-
- "modules/performance/**"
20-
'modules:runners':
21-
- "modules/runners/**"
22-
'modules:task':
23-
- "modules/task/**"
24-
'modules:util':
25-
- "modules/util/**"
26-
3rdparty:
27-
- "3rdparty/**"
37+
- changed-files:
38+
- any-glob-to-any-file:
39+
- ".github/**"
40+
- "appveyor.yml"
41+
42+
"modules:performance":
43+
- changed-files:
44+
- any-glob-to-any-file:
45+
- "modules/performance/**"
46+
47+
"modules:runners":
48+
- changed-files:
49+
- any-glob-to-any-file:
50+
- "modules/runners/**"
51+
52+
"modules:task":
53+
- changed-files:
54+
- any-glob-to-any-file:
55+
- "modules/task/**"
56+
57+
"modules:util":
58+
- changed-files:
59+
- any-glob-to-any-file:
60+
- "modules/util/**"
61+
62+
"3rdparty":
63+
- changed-files:
64+
- any-glob-to-any-file:
65+
- "3rdparty/**"
66+
2867
infrastructure:
29-
- "scripts/**"
30-
- "**/CMakeLists.txt"
31-
- "cmake/**"
32-
- ".clang-format"
33-
- ".clang-tidy"
34-
- ".gitignore"
35-
- ".gitmodules"
36-
- "codecov.yml"
37-
- "setup.cfg"
68+
- changed-files:
69+
- any-glob-to-any-file:
70+
- "scripts/**"
71+
- "**/CMakeLists.txt"
72+
- "cmake/**"
73+
- ".clang-format"
74+
- ".clang-tidy"
75+
- ".gitignore"
76+
- ".gitmodules"
77+
- "codecov.yml"
78+
- "setup.cfg"
79+
3880
python:
39-
- "**/requirements.txt"
81+
- changed-files:
82+
- any-glob-to-any-file:
83+
- "**/requirements.txt"
84+
4085
docs:
41-
- "docs/**"
42-
- "README.md"
86+
- changed-files:
87+
- any-glob-to-any-file:
88+
- "docs/**"
89+
- "README.md"
90+
4391
scoreboard:
44-
- "scoreboard/**"
92+
- changed-files:
93+
- any-glob-to-any-file:
94+
- "scoreboard/**"

.github/workflows/docker.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,25 +19,25 @@ jobs:
1919

2020
steps:
2121
- name: Check out code
22-
uses: actions/checkout@v3
22+
uses: actions/checkout@v4
2323

2424
- name: Set up QEMU
25-
uses: docker/setup-qemu-action@v2
25+
uses: docker/setup-qemu-action@v3
2626
with:
2727
platforms: linux/amd64,linux/arm64
2828

2929
- name: Set up Docker Buildx
30-
uses: docker/setup-buildx-action@v2
30+
uses: docker/setup-buildx-action@v3
3131

3232
- name: Log in to GHCR
33-
uses: docker/login-action@v2
33+
uses: docker/login-action@v3
3434
with:
3535
registry: ghcr.io
3636
username: ${{ github.actor }}
3737
password: ${{ secrets.DOCKER_TOKEN }}
3838

3939
- name: Build and push multi-arch image
40-
uses: docker/build-push-action@v4
40+
uses: docker/build-push-action@v6
4141
with:
4242
context: .
4343
file: ./docker/ubuntu.Dockerfile

.github/workflows/labeler.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,15 @@ jobs:
88
runs-on: ubuntu-24.04
99
permissions:
1010
contents: read
11+
issues: write
1112
pull-requests: write
1213
steps:
1314
- name: Check out repository
1415
uses: actions/checkout@v4
1516
with:
1617
fetch-depth: 0
1718
- name: Apply labels based on changed files
18-
uses: actions/labeler@v4
19+
uses: actions/labeler@v5
1920
with:
2021
repo-token: "${{ secrets.GITHUB_TOKEN }}"
2122
configuration-path: ".github/labeler.yml"

.github/workflows/mac.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,11 +68,11 @@ jobs:
6868
mkdir -p install
6969
tar -xzvf macos-clang-install.tar.gz -C install
7070
- name: Run func tests (MPI)
71-
run: python3 scripts/run_tests.py --running-type="processes" --counts 1 2 3 4
71+
run: scripts/run_tests.py --running-type="processes" --counts 1 2 3 4
7272
env:
7373
PPC_NUM_THREADS: 1
7474
- name: Run tests (threads)
75-
run: python3 scripts/run_tests.py --running-type="threads" --counts 1 2 3 4
75+
run: scripts/run_tests.py --running-type="threads" --counts 1 2 3 4
7676
env:
7777
PPC_NUM_PROC: 1
7878
clang-test-extended:
@@ -99,6 +99,6 @@ jobs:
9999
mkdir -p install
100100
tar -xzvf macos-clang-install.tar.gz -C install
101101
- name: Run tests (threads extended)
102-
run: python3 scripts/run_tests.py --running-type="threads" --counts 5 7 11 13
102+
run: scripts/run_tests.py --running-type="threads" --counts 5 7 11 13
103103
env:
104104
PPC_NUM_PROC: 1

.github/workflows/ubuntu.yml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -76,11 +76,11 @@ jobs:
7676
mkdir -p install
7777
tar -xzvf ubuntu-gcc-install-${{ matrix.os }}.tar.gz -C install
7878
- name: Run func tests (MPI)
79-
run: python3 scripts/run_tests.py --running-type="processes" --counts 1 2 3 4
79+
run: scripts/run_tests.py --running-type="processes" --counts 1 2 3 4
8080
env:
8181
PPC_NUM_THREADS: 1
8282
- name: Run func tests (threads)
83-
run: python3 scripts/run_tests.py --running-type="threads" --counts 1 2 3 4
83+
run: scripts/run_tests.py --running-type="threads" --counts 1 2 3 4
8484
env:
8585
PPC_NUM_PROC: 1
8686
gcc-test-extended:
@@ -106,7 +106,7 @@ jobs:
106106
mkdir -p install
107107
tar -xzvf ubuntu-gcc-install-${{ matrix.os }}.tar.gz -C install
108108
- name: Run func tests (threads extended)
109-
run: python3 scripts/run_tests.py --running-type="threads" --counts 5 7 11 13
109+
run: scripts/run_tests.py --running-type="threads" --counts 5 7 11 13
110110
env:
111111
PPC_NUM_PROC: 1
112112
clang-build:
@@ -178,11 +178,11 @@ jobs:
178178
mkdir -p install
179179
tar -xzvf ubuntu-clang-install-${{ matrix.os }}.tar.gz -C install
180180
- name: Run func tests (MPI)
181-
run: python3 scripts/run_tests.py --running-type="processes" --counts 1 2 3 4
181+
run: scripts/run_tests.py --running-type="processes" --counts 1 2 3 4
182182
env:
183183
PPC_NUM_THREADS: 1
184184
- name: Run tests (threads)
185-
run: python3 scripts/run_tests.py --running-type="threads" --counts 1 2 3 4
185+
run: scripts/run_tests.py --running-type="threads" --counts 1 2 3 4
186186
env:
187187
PPC_NUM_PROC: 1
188188
clang-test-extended:
@@ -210,7 +210,7 @@ jobs:
210210
mkdir -p install
211211
tar -xzvf ubuntu-clang-install-${{ matrix.os }}.tar.gz -C install
212212
- name: Run tests (threads extended)
213-
run: python3 scripts/run_tests.py --running-type="threads" --counts 5 7 11 13
213+
run: scripts/run_tests.py --running-type="threads" --counts 5 7 11 13
214214
env:
215215
PPC_NUM_PROC: 1
216216
clang-sanitizer-build:
@@ -288,14 +288,14 @@ jobs:
288288
mkdir -p install
289289
tar -xzvf ubuntu-clang-sanitizer-install-${{ matrix.os }}.tar.gz -C install
290290
- name: Run tests (MPI)
291-
run: python3 scripts/run_tests.py --running-type="processes" --counts 2 --additional-mpi-args="--oversubscribe"
291+
run: scripts/run_tests.py --running-type="processes" --counts 2 --additional-mpi-args="--oversubscribe"
292292
env:
293293
PPC_NUM_THREADS: 2
294294
PPC_ASAN_RUN: 1
295295
ASAN_OPTIONS: abort_on_error=1
296296
UBSAN_OPTIONS: halt_on_error=1
297297
- name: Run tests (threads)
298-
run: python3 scripts/run_tests.py --running-type="threads" --counts 1 2 3 4
298+
run: scripts/run_tests.py --running-type="threads" --counts 1 2 3 4
299299
env:
300300
PPC_NUM_PROC: 1
301301
PPC_ASAN_RUN: 1
@@ -327,7 +327,7 @@ jobs:
327327
mkdir -p install
328328
tar -xzvf ubuntu-clang-sanitizer-install-${{ matrix.os }}.tar.gz -C install
329329
- name: Run tests (threads extended)
330-
run: python3 scripts/run_tests.py --running-type="threads" --counts 5 7 11 13
330+
run: scripts/run_tests.py --running-type="threads" --counts 5 7 11 13
331331
env:
332332
PPC_NUM_PROC: 1
333333
PPC_ASAN_RUN: 1
@@ -361,12 +361,12 @@ jobs:
361361
run: |
362362
cmake --build build --parallel
363363
- name: Run tests (MPI)
364-
run: python3 scripts/run_tests.py --running-type="processes"
364+
run: scripts/run_tests.py --running-type="processes"
365365
env:
366366
PPC_NUM_PROC: 2
367367
PPC_NUM_THREADS: 2
368368
- name: Run tests (threads)
369-
run: python3 scripts/run_tests.py --running-type="threads" --counts 1 2 3 4
369+
run: scripts/run_tests.py --running-type="threads" --counts 1 2 3 4
370370
env:
371371
PPC_NUM_PROC: 1
372372
- name: Generate gcovr Coverage Data
@@ -396,8 +396,8 @@ jobs:
396396
name: cov-report
397397
path: 'cov-report'
398398
- name: Comment coverage report link
399-
# TODO: Support PRs from forks too
400-
if: ${{ github.event_name == 'pull_request' && !github.event.pull_request.head.repo.fork }}
399+
# TODO: Support PRs from forks and handle cases with insufficient write permissions
400+
continue-on-error: true
401401
uses: peter-evans/create-or-update-comment@v4
402402
with:
403403
token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/windows.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -51,11 +51,11 @@ jobs:
5151
run: Expand-Archive -Path .\windows-msvc-install.zip -DestinationPath . -Force
5252
shell: pwsh
5353
- name: Run func tests (MPI)
54-
run: python3 scripts/run_tests.py --running-type="processes" --counts 1 2 3 4
54+
run: scripts/run_tests.py --running-type="processes" --counts 1 2 3 4
5555
env:
5656
PPC_NUM_THREADS: 1
5757
- name: Run tests (threads)
58-
run: python3 scripts/run_tests.py --running-type="threads" --counts 1 2 3 4
58+
run: scripts/run_tests.py --running-type="threads" --counts 1 2 3 4
5959
env:
6060
PPC_NUM_PROC: 1
6161
msvc-test-extended:
@@ -76,7 +76,7 @@ jobs:
7676
run: Expand-Archive -Path .\windows-msvc-install.zip -DestinationPath . -Force
7777
shell: pwsh
7878
- name: Run tests (threads extended)
79-
run: python3 scripts/run_tests.py --running-type="threads" --counts 5 7 11 13
79+
run: scripts/run_tests.py --running-type="threads" --counts 5 7 11 13
8080
env:
8181
PPC_NUM_PROC: 1
8282
clang-build:
@@ -135,7 +135,7 @@ jobs:
135135
run: Expand-Archive -Path .\windows-clang-install.zip -DestinationPath . -Force
136136
shell: pwsh
137137
- name: Run tests (threads)
138-
run: python3 scripts/run_tests.py --running-type="threads" --counts 1 2 3 4
138+
run: scripts/run_tests.py --running-type="threads" --counts 1 2 3 4
139139
env:
140140
PPC_NUM_PROC: 1
141141
clang-test-extended:
@@ -156,6 +156,6 @@ jobs:
156156
run: Expand-Archive -Path .\windows-clang-install.zip -DestinationPath . -Force
157157
shell: pwsh
158158
- name: Run tests (threads extended)
159-
run: python3 scripts/run_tests.py --running-type="threads" --counts 5 7 11 13
159+
run: scripts/run_tests.py --running-type="threads" --counts 5 7 11 13
160160
env:
161161
PPC_NUM_PROC: 1

docs/user_guide/ci.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,13 +46,13 @@ Example usage:
4646
export PPC_NUM_PROC=2
4747
4848
# Multithreaded functional tests
49-
python3 scripts/run_tests.py --running-type="threads"
49+
scripts/run_tests.py --running-type="threads"
5050
5151
# MPI functional tests
52-
python3 scripts/run_tests.py --running-type="processes"
52+
scripts/run_tests.py --running-type="processes"
5353
5454
# Performance benchmarks
55-
python3 scripts/run_tests.py --running-type="performance"
55+
scripts/run_tests.py --running-type="performance"
5656
5757
Additional MPI arguments can be supplied with ``--additional-mpi-args`` when
5858
running in ``processes`` mode.

0 commit comments

Comments
 (0)