Skip to content

Commit 0d68e95

Browse files
committed
Move to new Spack syntax to propagate flags
1 parent 1ccda57 commit 0d68e95

2 files changed

Lines changed: 8 additions & 8 deletions

File tree

.gitlab/lassen-build-and-test-extra.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
# TODO: This is likely an issue in RADIUSS Shared CI: why disable tests ?.
1717
xl_16_1_1_12_gcc_8_3_1_cuda_11_0_2:
1818
variables:
19-
SPEC: "~shared +fortran ~device_alloc +tools +cuda tests=none %xl@16.1.1.12 cxxflags=\"--gcc-toolchain=/usr/tce/packages/gcc/gcc-8.3.1\" cflags=\"--gcc-toolchain=/usr/tce/packages/gcc/gcc-8.3.1\" ^cuda@11.0.2 ${PROJECT_LASSEN_DEPS}"
19+
SPEC: "~shared +fortran ~device_alloc +tools +cuda tests=none %xl@16.1.1.12 cxxflags==\"--gcc-toolchain=/usr/tce/packages/gcc/gcc-8.3.1\" cflags==\"--gcc-toolchain=/usr/tce/packages/gcc/gcc-8.3.1\" ^cuda@11.0.2 ${PROJECT_LASSEN_DEPS}"
2020
extends: .build_and_test_on_lassen
2121

2222

@@ -39,24 +39,24 @@ ibm_clang_10_0_1_mpi:
3939

4040
ibm_clang_10_0_1_cuda_10_1_168_mpi_shmem:
4141
variables:
42-
SPEC: "~shared ~device_alloc +tools tests=basic %clang@ibm.10.0.1 +cuda +ipc_shmem +mpi cxxflags=\"--gcc-toolchain=/usr/tce/packages/gcc/gcc-8.3.1\" cflags=\"--gcc-toolchain=/usr/tce/packages/gcc/gcc-8.3.1\" ^spectrum-mpi ^cuda@10.1.168"
42+
SPEC: "~shared ~device_alloc +tools tests=basic %clang@ibm.10.0.1 +cuda +ipc_shmem +mpi cxxflags==\"--gcc-toolchain=/usr/tce/packages/gcc/gcc-8.3.1\" cflags==\"--gcc-toolchain=/usr/tce/packages/gcc/gcc-8.3.1\" ^spectrum-mpi ^cuda@10.1.168"
4343
extends: .build_and_test_on_lassen
4444

4545
# Extras.
4646
clang_9_0_0_libcpp:
4747
variables:
48-
SPEC: "~shared ~device_alloc +tools tests=basic %clang@9.0.0+libcpp cxxflags=\"-stdlib=libc++ -DGTEST_HAS_CXXABI_H_=0\" cflags=\"-DGTEST_HAS_CXXABI_H_=0\""
48+
SPEC: "~shared ~device_alloc +tools tests=basic %clang@9.0.0+libcpp cxxflags==\"-stdlib=libc++ -DGTEST_HAS_CXXABI_H_=0\" cflags==\"-DGTEST_HAS_CXXABI_H_=0\""
4949
extends: .build_and_test_on_lassen
5050

5151
clang_9_0_0_memleak:
5252
variables:
53-
SPEC: "~shared +asan +sanitizer_tests +tools ~device_alloc tests=basic %clang@9.0.0 cxxflags=-fsanitize=address"
53+
SPEC: "~shared +asan +sanitizer_tests +tools ~device_alloc tests=basic %clang@9.0.0 cxxflags==-fsanitize=address"
5454
ASAN_OPTIONS: "detect_leaks=1"
5555
extends: .build_and_test_on_lassen
5656

5757
# clang_9_0_0_datarace (build and test on lassen):
5858
# variables:
59-
# SPEC: "%clang@9.0.0 cxxflags=-fsanitize=thread"
59+
# SPEC: "%clang@9.0.0 cxxflags==\"-fsanitize=thread\""
6060
# allow_failure: true
6161
# extends: .build_and_test_on_lassen
6262

@@ -89,10 +89,10 @@ gcc_8_3_1_tpls:
8989

9090
ibm_clang_9_0_0_gcc_8_3_1_cuda_10_1_168_tpls:
9191
variables:
92-
SPEC: "~shared +fortran +cuda ~device_alloc +tools tests=basic %clang@ibm.9.0.0 cxxflags=\"--gcc-toolchain=/usr/tce/packages/gcc/gcc-8.3.1\" cflags=\"--gcc-toolchain=/usr/tce/packages/gcc/gcc-8.3.1\" ^cuda@10.1.168 ^blt@develop"
92+
SPEC: "~shared +fortran +cuda ~device_alloc +tools tests=basic %clang@ibm.9.0.0 cxxflags==\"--gcc-toolchain=/usr/tce/packages/gcc/gcc-8.3.1\" cflags==\"--gcc-toolchain=/usr/tce/packages/gcc/gcc-8.3.1\" ^cuda@10.1.168 ^blt@develop"
9393
extends: .build_and_test_on_lassen
9494

9595
xl_16_1_1_12_gcc_8_3_1_cuda_10_1_168_tpls:
9696
variables:
97-
SPEC: "~shared +fortran +cuda ~device_alloc +tools tests=basic %xl@16.1.1.12 cxxflags=\"--gcc-toolchain=/usr/tce/packages/gcc/gcc-7.3.1\" cflags=\"--gcc-toolchain=/usr/tce/packages/gcc/gcc-7.3.1\" ^cuda@10.1.168 ^cmake@3.14.5 ^blt@develop"
97+
SPEC: "~shared +fortran +cuda ~device_alloc +tools tests=basic %xl@16.1.1.12 cxxflags==\"--gcc-toolchain=/usr/tce/packages/gcc/gcc-7.3.1\" cflags==\"--gcc-toolchain=/usr/tce/packages/gcc/gcc-7.3.1\" ^cuda@10.1.168 ^cmake@3.14.5 ^blt@develop"
9898
extends: .build_and_test_on_lassen

.gitlab/ruby-build-and-test-extra.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ clang_10_0_1_sqlite_experimental:
3434
# Develop builds against specific tpl version.
3535
pgi_20_1_gcc_local_8_3_1_tpls:
3636
variables:
37-
SPEC: "~shared +fortran ~device_alloc +tools tests=basic %pgi@20.1 cxxflags=-rc=/usr/workspace/umpire/pgi/x86_64/local-gcc-8.3.1-rc cflags=-rc=/usr/workspace/umpire/pgi/x86_64/local-gcc-8.3.1-rc fflags=-rc=/usr/workspace/umpire/pgi/x86_64/local-gcc-8.3.1-rc ^blt@develop"
37+
SPEC: "~shared +fortran ~device_alloc +tools tests=basic %pgi@20.1 cxxflags==\"-rc=/usr/workspace/umpire/pgi/x86_64/local-gcc-8.3.1-rc\" cflags==\"-rc=/usr/workspace/umpire/pgi/x86_64/local-gcc-8.3.1-rc\" fflags==\"-rc=/usr/workspace/umpire/pgi/x86_64/local-gcc-8.3.1-rc\" ^blt@develop"
3838
extends: .build_and_test_on_ruby
3939

4040
clang_10_0_1_tpls:

0 commit comments

Comments
 (0)