Skip to content

Commit d5c7c9a

Browse files
aobolenskaobolensk
committed
Print count during batch testing
1 parent 47d2a27 commit d5c7c9a

4 files changed

Lines changed: 69 additions & 328 deletions

File tree

‎.github/workflows/mac.yml‎

Lines changed: 6 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -106,46 +106,14 @@ jobs:
106106
run: |
107107
mkdir -p install
108108
tar -xzvf macos-clang-sanitizer-install.tar.gz -C install
109-
- name: Run func tests (MPI, num_proc=1)
110-
run: python3 scripts/run_tests.py --running-type="processes"
109+
- name: Run func tests (MPI)
110+
run: python3 scripts/run_tests.py --running-type="processes" --counts 1 2 3 4
111111
env:
112-
PPC_NUM_PROC: 1
113-
PPC_NUM_THREADS: 3
114-
- name: Run func tests (MPI, num_proc=2)
115-
run: python3 scripts/run_tests.py --running-type="processes"
116-
env:
117-
PPC_NUM_PROC: 2
118-
PPC_NUM_THREADS: 2
119-
- name: Run func tests (MPI, num_proc=3)
120-
run: python3 scripts/run_tests.py --running-type="processes"
121-
env:
122-
PPC_NUM_PROC: 3
123-
PPC_NUM_THREADS: 1
124-
- name: Run func tests (MPI, num_proc=4)
125-
run: python3 scripts/run_tests.py --running-type="processes"
126-
env:
127-
PPC_NUM_PROC: 4
128112
PPC_NUM_THREADS: 1
129-
- name: Run tests (threads, num_threads=1)
130-
run: python3 scripts/run_tests.py --running-type="threads"
131-
env:
132-
PPC_NUM_PROC: 1
133-
PPC_NUM_THREADS: 1
134-
- name: Run tests (threads, num_threads=2)
135-
run: python3 scripts/run_tests.py --running-type="threads"
136-
env:
137-
PPC_NUM_PROC: 1
138-
PPC_NUM_THREADS: 2
139-
- name: Run tests (threads, num_threads=3)
140-
run: python3 scripts/run_tests.py --running-type="threads"
141-
env:
142-
PPC_NUM_PROC: 1
143-
PPC_NUM_THREADS: 3
144-
- name: Run tests (threads, num_threads=4)
145-
run: python3 scripts/run_tests.py --running-type="threads"
113+
- name: Run tests (threads)
114+
run: python3 scripts/run_tests.py --running-type="threads" --counts 1 2 3 4
146115
env:
147116
PPC_NUM_PROC: 1
148-
PPC_NUM_THREADS: 4
149117
macos-clang-test-extended:
150118
needs:
151119
- macos-clang-test
@@ -168,23 +136,7 @@ jobs:
168136
run: |
169137
mkdir -p install
170138
tar -xzvf macos-clang-sanitizer-install.tar.gz -C install
171-
- name: Run tests (threads, num_threads=5)
172-
run: python3 scripts/run_tests.py --running-type="threads"
173-
env:
174-
PPC_NUM_PROC: 1
175-
PPC_NUM_THREADS: 5
176-
- name: Run tests (threads, num_threads=7)
177-
run: python3 scripts/run_tests.py --running-type="threads"
178-
env:
179-
PPC_NUM_PROC: 1
180-
PPC_NUM_THREADS: 7
181-
- name: Run tests (threads, num_threads=11)
182-
run: python3 scripts/run_tests.py --running-type="threads"
183-
env:
184-
PPC_NUM_PROC: 1
185-
PPC_NUM_THREADS: 11
186-
- name: Run tests (threads, num_threads=13)
187-
run: python3 scripts/run_tests.py --running-type="threads"
139+
- name: Run tests (threads extended)
140+
run: python3 scripts/run_tests.py --running-type="threads" --counts 5 7 11 13
188141
env:
189142
PPC_NUM_PROC: 1
190-
PPC_NUM_THREADS: 13

‎.github/workflows/ubuntu.yml‎

Lines changed: 19 additions & 176 deletions
Original file line numberDiff line numberDiff line change
@@ -120,46 +120,14 @@ jobs:
120120
run: |
121121
mkdir -p install
122122
tar -xzvf ubuntu-gcc-install-${{ matrix.os }}.tar.gz -C install
123-
- name: Run func tests (MPI, num_proc=1)
124-
run: python3 scripts/run_tests.py --running-type="processes"
125-
env:
126-
PPC_NUM_PROC: 1
127-
PPC_NUM_THREADS: 3
128-
- name: Run func tests (MPI, num_proc=2)
129-
run: python3 scripts/run_tests.py --running-type="processes"
130-
env:
131-
PPC_NUM_PROC: 2
132-
PPC_NUM_THREADS: 2
133-
- name: Run func tests (MPI, num_proc=3)
134-
run: python3 scripts/run_tests.py --running-type="processes"
135-
env:
136-
PPC_NUM_PROC: 3
137-
PPC_NUM_THREADS: 1
138-
- name: Run func tests (MPI, num_proc=4)
139-
run: python3 scripts/run_tests.py --running-type="processes"
123+
- name: Run func tests (MPI)
124+
run: python3 scripts/run_tests.py --running-type="processes" --counts 1 2 3 4
140125
env:
141-
PPC_NUM_PROC: 4
142126
PPC_NUM_THREADS: 1
143-
- name: Run func tests (threads, num_threads=1)
144-
run: python3 scripts/run_tests.py --running-type="threads"
127+
- name: Run func tests (threads)
128+
run: python3 scripts/run_tests.py --running-type="threads" --counts 1 2 3 4
145129
env:
146130
PPC_NUM_PROC: 1
147-
PPC_NUM_THREADS: 1
148-
- name: Run func tests (threads, num_threads=2)
149-
run: python3 scripts/run_tests.py --running-type="threads"
150-
env:
151-
PPC_NUM_PROC: 1
152-
PPC_NUM_THREADS: 2
153-
- name: Run func tests (threads, num_threads=3)
154-
run: python3 scripts/run_tests.py --running-type="threads"
155-
env:
156-
PPC_NUM_PROC: 1
157-
PPC_NUM_THREADS: 3
158-
- name: Run func tests (threads, num_threads=4)
159-
run: python3 scripts/run_tests.py --running-type="threads"
160-
env:
161-
PPC_NUM_PROC: 1
162-
PPC_NUM_THREADS: 4
163131
ubuntu-gcc-test-extended:
164132
needs:
165133
- ubuntu-gcc-test
@@ -182,26 +150,10 @@ jobs:
182150
run: |
183151
mkdir -p install
184152
tar -xzvf ubuntu-gcc-install-${{ matrix.os }}.tar.gz -C install
185-
- name: Run func tests (threads, num_threads=5)
186-
run: python3 scripts/run_tests.py --running-type="threads"
153+
- name: Run func tests (threads extended)
154+
run: python3 scripts/run_tests.py --running-type="threads" --counts 5 7 11 13
187155
env:
188156
PPC_NUM_PROC: 1
189-
PPC_NUM_THREADS: 5
190-
- name: Run func tests (threads, num_threads=7)
191-
run: python3 scripts/run_tests.py --running-type="threads"
192-
env:
193-
PPC_NUM_PROC: 1
194-
PPC_NUM_THREADS: 7
195-
- name: Run func tests (threads, num_threads=11)
196-
run: python3 scripts/run_tests.py --running-type="threads"
197-
env:
198-
PPC_NUM_PROC: 1
199-
PPC_NUM_THREADS: 11
200-
- name: Run func tests (threads, num_threads=13)
201-
run: python3 scripts/run_tests.py --running-type="threads"
202-
env:
203-
PPC_NUM_PROC: 1
204-
PPC_NUM_THREADS: 13
205157
ubuntu-clang-build:
206158
runs-on: ${{ matrix.os }}
207159
strategy:
@@ -273,46 +225,14 @@ jobs:
273225
run: |
274226
mkdir -p install
275227
tar -xzvf ubuntu-clang-install-${{ matrix.os }}.tar.gz -C install
276-
- name: Run func tests (MPI, num_proc=1)
277-
run: python3 scripts/run_tests.py --running-type="processes"
278-
env:
279-
PPC_NUM_PROC: 1
280-
PPC_NUM_THREADS: 3
281-
- name: Run func tests (MPI, num_proc=2)
282-
run: python3 scripts/run_tests.py --running-type="processes"
283-
env:
284-
PPC_NUM_PROC: 2
285-
PPC_NUM_THREADS: 2
286-
- name: Run func tests (MPI, num_proc=3)
287-
run: python3 scripts/run_tests.py --running-type="processes"
228+
- name: Run func tests (MPI)
229+
run: python3 scripts/run_tests.py --running-type="processes" --counts 1 2 3 4
288230
env:
289-
PPC_NUM_PROC: 3
290231
PPC_NUM_THREADS: 1
291-
- name: Run func tests (MPI, num_proc=4)
292-
run: python3 scripts/run_tests.py --running-type="processes"
293-
env:
294-
PPC_NUM_PROC: 4
295-
PPC_NUM_THREADS: 1
296-
- name: Run tests (threads, num_threads=1)
297-
run: python3 scripts/run_tests.py --running-type="threads"
298-
env:
299-
PPC_NUM_PROC: 1
300-
PPC_NUM_THREADS: 1
301-
- name: Run tests (threads, num_threads=2)
302-
run: python3 scripts/run_tests.py --running-type="threads"
232+
- name: Run tests (threads)
233+
run: python3 scripts/run_tests.py --running-type="threads" --counts 1 2 3 4
303234
env:
304235
PPC_NUM_PROC: 1
305-
PPC_NUM_THREADS: 2
306-
- name: Run tests (threads, num_threads=3)
307-
run: python3 scripts/run_tests.py --running-type="threads"
308-
env:
309-
PPC_NUM_PROC: 1
310-
PPC_NUM_THREADS: 3
311-
- name: Run tests (threads, num_threads=4)
312-
run: python3 scripts/run_tests.py --running-type="threads"
313-
env:
314-
PPC_NUM_PROC: 1
315-
PPC_NUM_THREADS: 4
316236
ubuntu-clang-test-extended:
317237
needs:
318238
- ubuntu-clang-test
@@ -337,26 +257,10 @@ jobs:
337257
run: |
338258
mkdir -p install
339259
tar -xzvf ubuntu-clang-install-${{ matrix.os }}.tar.gz -C install
340-
- name: Run tests (threads, num_threads=5)
341-
run: python3 scripts/run_tests.py --running-type="threads"
342-
env:
343-
PPC_NUM_PROC: 1
344-
PPC_NUM_THREADS: 5
345-
- name: Run tests (threads, num_threads=7)
346-
run: python3 scripts/run_tests.py --running-type="threads"
260+
- name: Run tests (threads extended)
261+
run: python3 scripts/run_tests.py --running-type="threads" --counts 5 7 11 13
347262
env:
348263
PPC_NUM_PROC: 1
349-
PPC_NUM_THREADS: 7
350-
- name: Run tests (threads, num_threads=11)
351-
run: python3 scripts/run_tests.py --running-type="threads"
352-
env:
353-
PPC_NUM_PROC: 1
354-
PPC_NUM_THREADS: 11
355-
- name: Run tests (threads, num_threads=13)
356-
run: python3 scripts/run_tests.py --running-type="threads"
357-
env:
358-
PPC_NUM_PROC: 1
359-
PPC_NUM_THREADS: 13
360264
ubuntu-clang-sanitizer-build:
361265
needs:
362266
- ubuntu-clang-build
@@ -435,42 +339,16 @@ jobs:
435339
mkdir -p install
436340
tar -xzvf ubuntu-clang-sanitizer-install-${{ matrix.os }}.tar.gz -C install
437341
- name: Run tests (MPI)
438-
run: python3 scripts/run_tests.py --running-type="processes" --additional-mpi-args="--oversubscribe"
342+
run: python3 scripts/run_tests.py --running-type="processes" --counts 2 --additional-mpi-args="--oversubscribe"
439343
env:
440-
PPC_NUM_PROC: 2
441344
PPC_NUM_THREADS: 2
442345
PPC_ASAN_RUN: 1
443346
ASAN_OPTIONS: abort_on_error=1
444347
UBSAN_OPTIONS: halt_on_error=1
445-
- name: Run tests (threads, num_threads=1)
446-
run: python3 scripts/run_tests.py --running-type="threads"
447-
env:
448-
PPC_NUM_PROC: 1
449-
PPC_NUM_THREADS: 1
450-
PPC_ASAN_RUN: 1
451-
ASAN_OPTIONS: abort_on_error=1
452-
UBSAN_OPTIONS: halt_on_error=1
453-
- name: Run tests (threads, num_threads=2)
454-
run: python3 scripts/run_tests.py --running-type="threads"
455-
env:
456-
PPC_NUM_PROC: 1
457-
PPC_NUM_THREADS: 2
458-
PPC_ASAN_RUN: 1
459-
ASAN_OPTIONS: abort_on_error=1
460-
UBSAN_OPTIONS: halt_on_error=1
461-
- name: Run tests (threads, num_threads=3)
462-
run: python3 scripts/run_tests.py --running-type="threads"
463-
env:
464-
PPC_NUM_PROC: 1
465-
PPC_NUM_THREADS: 3
466-
PPC_ASAN_RUN: 1
467-
ASAN_OPTIONS: abort_on_error=1
468-
UBSAN_OPTIONS: halt_on_error=1
469-
- name: Run tests (threads, num_threads=4)
470-
run: python3 scripts/run_tests.py --running-type="threads"
348+
- name: Run tests (threads)
349+
run: python3 scripts/run_tests.py --running-type="threads" --counts 1 2 3 4
471350
env:
472351
PPC_NUM_PROC: 1
473-
PPC_NUM_THREADS: 4
474352
PPC_ASAN_RUN: 1
475353
ASAN_OPTIONS: abort_on_error=1
476354
UBSAN_OPTIONS: halt_on_error=1
@@ -499,29 +377,10 @@ jobs:
499377
run: |
500378
mkdir -p install
501379
tar -xzvf ubuntu-clang-sanitizer-install-${{ matrix.os }}.tar.gz -C install
502-
- name: Run tests (threads, num_threads=5)
503-
run: python3 scripts/run_tests.py --running-type="threads"
380+
- name: Run tests (threads extended)
381+
run: python3 scripts/run_tests.py --running-type="threads" --counts 5 7 11 13
504382
env:
505383
PPC_NUM_PROC: 1
506-
PPC_NUM_THREADS: 5
507-
PPC_ASAN_RUN: 1
508-
- name: Run tests (threads, num_threads=7)
509-
run: python3 scripts/run_tests.py --running-type="threads"
510-
env:
511-
PPC_NUM_PROC: 1
512-
PPC_NUM_THREADS: 7
513-
PPC_ASAN_RUN: 1
514-
- name: Run tests (threads, num_threads=11)
515-
run: python3 scripts/run_tests.py --running-type="threads"
516-
env:
517-
PPC_NUM_PROC: 1
518-
PPC_NUM_THREADS: 11
519-
PPC_ASAN_RUN: 1
520-
- name: Run tests (threads, num_threads=13)
521-
run: python3 scripts/run_tests.py --running-type="threads"
522-
env:
523-
PPC_NUM_PROC: 1
524-
PPC_NUM_THREADS: 13
525384
PPC_ASAN_RUN: 1
526385
ubuntu-gcc-build-codecov:
527386
needs:
@@ -557,26 +416,10 @@ jobs:
557416
env:
558417
PPC_NUM_PROC: 2
559418
PPC_NUM_THREADS: 2
560-
- name: Run tests (threads, num_threads=1)
561-
run: python3 scripts/run_tests.py --running-type="threads"
562-
env:
563-
PPC_NUM_PROC: 1
564-
PPC_NUM_THREADS: 1
565-
- name: Run tests (threads, num_threads=2)
566-
run: python3 scripts/run_tests.py --running-type="threads"
567-
env:
568-
PPC_NUM_PROC: 1
569-
PPC_NUM_THREADS: 2
570-
- name: Run tests (threads, num_threads=3)
571-
run: python3 scripts/run_tests.py --running-type="threads"
572-
env:
573-
PPC_NUM_PROC: 1
574-
PPC_NUM_THREADS: 3
575-
- name: Run tests (threads, num_threads=4)
576-
run: python3 scripts/run_tests.py --running-type="threads"
419+
- name: Run tests (threads)
420+
run: python3 scripts/run_tests.py --running-type="threads" --counts 1 2 3 4
577421
env:
578422
PPC_NUM_PROC: 1
579-
PPC_NUM_THREADS: 4
580423
- name: Generate gcovr Coverage Data
581424
run: |
582425
mkdir cov-report

0 commit comments

Comments
 (0)