Merge topic 'reduce_openmp_num_threads_on_ci'

314a30ff1 Restrict the OpenMP threads # gitlab-ci tests uses

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !2046
This commit is contained in:
Robert Maynard 2020-04-16 20:48:57 +00:00 committed by Kitware Robot
commit 1d807a08eb
2 changed files with 12 additions and 2 deletions

@ -90,7 +90,6 @@ test:ubuntu1604_gcc48:
#mpi location so that `built_against_test_install` tests #mpi location so that `built_against_test_install` tests
#pass #pass
CMAKE_PREFIX_PATH: "/opt/openmpi/" CMAKE_PREFIX_PATH: "/opt/openmpi/"
dependencies: dependencies:
- build:ubuntu1604_gcc48 - build:ubuntu1604_gcc48
needs: needs:
@ -127,7 +126,6 @@ test:ubuntu1604_clang5:
- .ubuntu1604 - .ubuntu1604
- .cmake_test_linux - .cmake_test_linux
- .only-default - .only-default
dependencies: dependencies:
- build:ubuntu1604_clang5 - build:ubuntu1604_clang5
needs: needs:

@ -28,6 +28,10 @@ test:ubuntu1804_gcc9:
- .ubuntu1804 - .ubuntu1804
- .cmake_test_linux - .cmake_test_linux
- .only-default - .only-default
variables:
#Restrict OpenMP number of threads since multiple test stages
#execute on the same hardware concurrently
OMP_NUM_THREADS: 4
dependencies: dependencies:
- build:ubuntu1804_gcc9 - build:ubuntu1804_gcc9
needs: needs:
@ -98,6 +102,10 @@ test:ubuntu1804_gcc7_2:
- .ubuntu1804 - .ubuntu1804
- .cmake_test_linux - .cmake_test_linux
- .only-master - .only-master
variables:
#Restrict OpenMP number of threads since multiple test stages
#execute on the same hardware concurrently
OMP_NUM_THREADS: 4
dependencies: dependencies:
- build:ubuntu1804_gcc7_2 - build:ubuntu1804_gcc7_2
needs: needs:
@ -131,6 +139,10 @@ test:ubuntu1804_gcc6:
- .ubuntu1804 - .ubuntu1804
- .cmake_test_linux - .cmake_test_linux
- .only-master - .only-master
variables:
#Restrict OpenMP number of threads since multiple test stages
#execute on the same hardware concurrently
OMP_NUM_THREADS: 3
dependencies: dependencies:
- build:ubuntu1804_gcc6 - build:ubuntu1804_gcc6
needs: needs: