Skip to content

Commit 770d8bb

Browse files
yhmtsaiyhmtsai
committed
move most of new jobs to full pipeline. use LD_LIBRARY_PATH now
1 parent 3a24fd0 commit 770d8bb

3 files changed

Lines changed: 22 additions & 22 deletions

File tree

‎.gitlab-ci.yml‎

Lines changed: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ build/cuda118/nompi/gcc/cuda/debug/shared:
152152
extends:
153153
- .build_and_test_tum_template
154154
- .default_variables
155-
- .quick_test_condition
155+
- .full_test_condition
156156
- .use_tum-nvidia
157157
variables:
158158
BUILD_CUDA: "ON"
@@ -165,7 +165,7 @@ build/cuda120/openmpi/gcc/cuda/release/static:
165165
extends:
166166
- .build_and_test_tum_template
167167
- .default_variables
168-
- .quick_test_condition
168+
- .full_test_condition
169169
- .use_tum-nvidia
170170
variables:
171171
BUILD_CUDA: "ON"
@@ -180,20 +180,20 @@ build/cuda122/openmpi/gcc/cuda/release/shared:
180180
extends:
181181
- .build_and_test_tum_template
182182
- .default_variables
183-
- .quick_test_condition
183+
- .full_test_condition
184184
- .use_tum-nvidia
185185
variables:
186186
BUILD_CUDA: "ON"
187187
BUILD_HWLOC: "OFF"
188188
ENABLE_HALF: "ON"
189189
BUILD_TYPE: "Release"
190-
MODULE_LOAD: "cmake/3.20.6 cuda/12.4.1 gcc/12.4.0"
190+
MODULE_LOAD: "cmake/3.20.6 cuda/12.2.2 gcc/12.4.0 openmpi/5.0.7"
191191

192192
build/cuda124/mpich/gcc/cuda/release/shared:
193193
extends:
194194
- .build_and_test_tum_template
195195
- .default_variables
196-
- .quick_test_condition
196+
- .full_test_condition
197197
- .use_tum-nvidia
198198
variables:
199199
BUILD_CUDA: "ON"
@@ -208,7 +208,7 @@ build/cuda126/nompi/gcc/cuda/release/shared:
208208
extends:
209209
- .build_and_test_tum_template
210210
- .default_variables
211-
- .quick_test_condition
211+
- .full_test_condition
212212
- .use_tum-nvidia
213213
variables:
214214
BUILD_CUDA: "ON"
@@ -303,7 +303,7 @@ build/amd/openmpi/gcc/rocm600/release/static:
303303
extends:
304304
- .build_and_test_tum_template
305305
- .default_variables
306-
- .quick_test_condition
306+
- .full_test_condition
307307
- .use_tum-amd
308308
variables:
309309
BUILD_HIP: "ON"
@@ -317,7 +317,7 @@ build/amd/nompi/gcc/rocm573/debug/shared:
317317
extends:
318318
- .build_and_test_tum_template
319319
- .default_variables
320-
- .quick_test_condition
320+
- .full_test_condition
321321
- .use_tum-amd
322322
variables:
323323
BUILD_HIP: "ON"
@@ -332,7 +332,7 @@ build/amd/openmpi/gcc/rocm634_wo_omp/release/shared:
332332
extends:
333333
- .build_and_test_tum_template
334334
- .default_variables
335-
- .quick_test_condition
335+
- .full_test_condition
336336
- .use_tum-amd
337337
variables:
338338
BUILD_HIP: "ON"
@@ -465,7 +465,7 @@ build/nogpu/nompi/gcc/omp/debug/static:
465465
extends:
466466
- .build_and_test_tum_template
467467
- .default_variables
468-
- .quick_test_condition
468+
- .full_test_condition
469469
- .use_tum-cpu
470470
variables:
471471
BUILD_OMP: "ON"
@@ -479,7 +479,7 @@ build/nogpu/nompi/gcc/omp/release/static:
479479
extends:
480480
- .build_and_test_tum_template
481481
- .default_variables
482-
- .quick_test_condition
482+
- .full_test_condition
483483
- .use_tum-cpu
484484
variables:
485485
BUILD_OMP: "ON"
@@ -494,7 +494,7 @@ build/nogpu/nompi/gcc/noomp/release/shared:
494494
extends:
495495
- .build_and_test_tum_template
496496
- .default_variables
497-
- .quick_test_condition
497+
- .full_test_condition
498498
- .use_tum-cpu
499499
variables:
500500
BUILD_TYPE: "Release"
@@ -505,14 +505,14 @@ build/nogpu/nompi/gcc12/noomp/release/shared:
505505
extends:
506506
- .build_and_test_tum_template
507507
- .default_variables
508-
- .quick_test_condition
508+
- .full_test_condition
509509
- .use_tum-cpu
510510
variables:
511511
BUILD_TYPE: "Release"
512512
BUILD_HWLOC: "OFF"
513513
MODULE_LOAD: "cmake/3.18.6 gcc/12.4.0"
514514

515-
build/nogpu/nompi/gcc13/noomp/release/shared:
515+
build/nogpu/mpi/gcc13/noomp/release/shared:
516516
extends:
517517
- .build_and_test_tum_template
518518
- .default_variables
@@ -521,7 +521,8 @@ build/nogpu/nompi/gcc13/noomp/release/shared:
521521
variables:
522522
BUILD_TYPE: "Release"
523523
BUILD_HWLOC: "OFF"
524-
MODULE_LOAD: "cmake/3.18.6 gcc/13.3.0"
524+
BUILD_MPI: "ON"
525+
MODULE_LOAD: "cmake/3.18.6 gcc/13.3.0 openmpi"
525526

526527
# spack oneapi 2023.1
527528
build/icpx20231/gpu/release/shared:
@@ -544,7 +545,7 @@ build/dpcpp20231/gpu/release/shared:
544545
extends:
545546
- .build_and_test_tum_template
546547
- .default_variables
547-
- .quick_test_condition
548+
- .full_test_condition
548549
- .use_tum-intel-fp32
549550
variables:
550551
CXX_COMPILER: "dpcpp"
@@ -561,7 +562,7 @@ build/icpx202402/gpu/release/shared:
561562
extends:
562563
- .build_and_test_tum_template
563564
- .default_variables
564-
- .quick_test_condition
565+
- .full_test_condition
565566
- .use_tum-intel
566567
variables:
567568
CXX_COMPILER: "icpx"
@@ -578,7 +579,7 @@ build/icpx202421/gpu/release/shared:
578579
extends:
579580
- .build_and_test_tum_template
580581
- .default_variables
581-
- .quick_test_condition
582+
- .full_test_condition
582583
- .use_tum-intel
583584
variables:
584585
CXX_COMPILER: "icpx"

‎.gitlab/scripts.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -200,9 +200,9 @@
200200
- ctest --output-on-failure --timeout 6000 ${CTEST_EXTRA_ARGS}
201201
- ninja test_exportbuild
202202
# cuda module from spack does not add LD_LIBRARY_PATH
203-
# - if [[ "${BUILD_CUDA}" == "ON" ]]; then
204-
# export LD_LIBRARY_PATH=${CUDA_HOME}/lib64${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH};
205-
# fi
203+
- if [[ "${BUILD_CUDA}" == "ON" ]]; then
204+
export LD_LIBRARY_PATH=${CUDA_HOME}/lib64${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH};
205+
fi
206206
- ninja test_install
207207
- pushd test/test_install
208208
- ninja install

‎hip/get_info.cmake‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
ginkgo_print_module_header(${detailed_log} "HIP")
22
ginkgo_print_variable(${detailed_log} "GINKGO_HIP_CUSTOM_THRUST_NAMESPACE")
33
ginkgo_print_module_footer(${detailed_log} "HIP variables:")
4-
ginkgo_print_variable(${detailed_log} "CMAKE_HIP_FLAGS")
54
ginkgo_print_flags(${detailed_log} "CMAKE_HIP_FLAGS")
65
ginkgo_print_flags(${detailed_log} "CMAKE_HIP_COMPILER")
76
ginkgo_print_variable(${detailed_log} "CMAKE_HIP_COMPILER_VERSION")

0 commit comments

Comments
 (0)