Skip to content

Commit

Permalink
Merge branch '742-debug-builds' into 'develop_stream'
Browse files Browse the repository at this point in the history
Enable debug builds excluding test_block_adjacent_difference/discontinuity

Closes #742

See merge request amd/libraries/rocPRIM!690
  • Loading branch information
ex-rzr authored and Naraenda committed Jul 23, 2024
2 parents c6ea6aa + dca88d6 commit 39c9d9b
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 4 deletions.
3 changes: 1 addition & 2 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -197,9 +197,8 @@ build:cmake-minimum:
- .cmake-minimum
- .build:common
parallel:
# Debug builds disabled due to excessive build times for debug test builds
matrix:
- BUILD_TYPE: Release
- BUILD_TYPE: [Debug, Release]
BUILD_TARGET: [BENCHMARK, TEST]

build:package:
Expand Down
7 changes: 5 additions & 2 deletions test/rocprim/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -236,8 +236,11 @@ add_rocprim_test("rocprim.basic_test" "test_basic.cpp;detail/get_rocprim_version

add_rocprim_test("rocprim.arg_index_iterator" test_arg_index_iterator.cpp)
add_rocprim_test("rocprim.temporary_storage_partitioning" test_temporary_storage_partitioning.cpp)
add_rocprim_test_parallel("rocprim.block_adjacent_difference" test_block_adjacent_difference.cpp.in)
add_rocprim_test_parallel("rocprim.block_discontinuity" test_block_discontinuity.cpp.in)
if(NOT CMAKE_BUILD_TYPE STREQUAL "Debug")
# clang++ from ROCm 6.1+ takes too long to build these tests in Debug mode (which passes -O0)
add_rocprim_test_parallel("rocprim.block_adjacent_difference" test_block_adjacent_difference.cpp.in)
add_rocprim_test_parallel("rocprim.block_discontinuity" test_block_discontinuity.cpp.in)
endif()
add_rocprim_test("rocprim.block_exchange" test_block_exchange.cpp)
add_rocprim_test("rocprim.block_histogram" test_block_histogram.cpp)
add_rocprim_test("rocprim.block_load_store" test_block_load_store.cpp)
Expand Down

0 comments on commit 39c9d9b

Please sign in to comment.