File tree Expand file tree Collapse file tree 4 files changed +5
-4
lines changed
Expand file tree Collapse file tree 4 files changed +5
-4
lines changed Original file line number Diff line number Diff line change 77 - ' master'
88 - ' develop'
99 - ' release/**'
10- - ' arm_action'
1110 tags :
1211 - ' **'
1312 pull_request :
Original file line number Diff line number Diff line change @@ -222,7 +222,7 @@ build/cuda130/nompi/gcc/cuda/release/shared:
222222 extends :
223223 - .build_and_test_tum_template
224224 - .default_variables
225- - .quick_test_condition
225+ - .full_test_condition
226226 - .use_tum-nvidia
227227 variables :
228228 BUILD_CUDA : " ON"
@@ -360,7 +360,7 @@ build/amd/nompi/gcc/rocm710/release/shared:
360360 extends :
361361 - .build_and_test_tum_template
362362 - .default_variables
363- - .quick_test_condition
363+ - .full_test_condition
364364 - .use_tum-amd-mi210
365365 variables :
366366 BUILD_HIP : " ON"
Original file line number Diff line number Diff line change @@ -226,7 +226,6 @@ if(GINKGO_BUILD_CUDA)
226226endif ()
227227if (GINKGO_BUILD_HIP)
228228 include (cmake/hip.cmake)
229- message ("HIP_VERSION ${GINKGO_HIP_VERSION} " )
230229 if (GINKGO_HIP_PLATFORM_AMD AND GINKGO_HIP_VERSION VERSION_LESS 5.7)
231230 # Hip allow custom namespace but does not fully make everything in the custom namespace before rocm-5.7
232231 # more specific pr: https://github.com/ROCm/rocThrust/pull/286
Original file line number Diff line number Diff line change @@ -156,6 +156,9 @@ target_link_libraries(
156156 CUDA::cufft
157157 nvtx::nvtx
158158)
159+ if (CUDAToolkit_VERSION VERSION_GREATER_EQUAL 13)
160+ target_link_libraries (ginkgo_cuda PRIVATE Thrust)
161+ endif ()
159162# NVTX3 is header-only and requires dlopen/dlclose in static builds
160163target_link_libraries (ginkgo_cuda PUBLIC ginkgo_device ${CMAKE_DL_LIBS} )
161164
You can’t perform that action at this time.
0 commit comments