Merge branch 'dev' into reduction-map

Conflicts:
	benchmarks/CMakeLists.txt
	examples/CMakeLists.txt
	tests/CMakeLists.txt

benchmarks/CMakeLists.txt

@@ -17,25 +17,13 @@ if (benchmark_ADDED)
   set_target_properties(benchmark PROPERTIES CXX_STANDARD 14)
 endif()
 
-###################################################################################################
-# Auto-detect available GPU compute architectures
-set(GPU_ARCHS "" CACHE STRING "List of GPU architectures (semicolon-separated) to be compiled for. Empty string means to auto-detect the GPUs on the current system")
-
-if("${GPU_ARCHS}" STREQUAL "")
-  include(../cmake/EvalGpuArchs.cmake)
-  evaluate_gpu_archs(GPU_ARCHS)
-endif()
-
-message("GPU_ARCHS = ${GPU_ARCHS}")
-
 ###################################################################################################
 # - compiler function -----------------------------------------------------------------------------
 
 function(ConfigureBench BENCH_NAME BENCH_SRC)
     add_executable(${BENCH_NAME} "${BENCH_SRC}")
     set_target_properties(${BENCH_NAME} PROPERTIES
                                         POSITION_INDEPENDENT_CODE ON
-                                        CUDA_ARCHITECTURES "${GPU_ARCHS}"
                                         RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/gbenchmarks")
     target_include_directories(${BENCH_NAME} PRIVATE
                                              "${CMAKE_CURRENT_SOURCE_DIR}")

examples/CMakeLists.txt

@@ -5,8 +5,7 @@
 
 function(ConfigureExample EXAMPLE_NAME EXAMPLE_SRC)
     add_executable(${EXAMPLE_NAME} "${EXAMPLE_SRC}")
-    set_target_properties(${EXAMPLE_NAME} PROPERTIES 
-                                          CUDA_ARCHITECTURES "${GPU_ARCHS}"
+    set_target_properties(${EXAMPLE_NAME} PROPERTIES
                                           RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/examples")
     target_include_directories(${EXAMPLE_NAME} PRIVATE
                                              "${CMAKE_CURRENT_SOURCE_DIR}")

tests/CMakeLists.txt

@@ -27,7 +27,6 @@ function(ConfigureTest TEST_NAME TEST_SRC)
                    $<TARGET_OBJECTS:CatchMain>) # Link in the CatchMain object file
     target_link_libraries(${TEST_NAME} Catch2::Catch2 cuco CUDA::cudart)
     set_target_properties(${TEST_NAME} PROPERTIES
-                                       CUDA_ARCHITECTURES "${GPU_ARCHS}"
                                        RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/tests")
     target_compile_options(${TEST_NAME} PRIVATE --expt-extended-lambda --expt-relaxed-constexpr -Xcompiler -Wno-subobject-linkage)
     catch_discover_tests(${TEST_NAME})
@@ -36,9 +35,13 @@ endfunction(ConfigureTest)
 ###################################################################################################
 ### test sources ##################################################################################
 ###################################################################################################
+set(STATIC_MAP_TEST_SRC
+    "${CMAKE_CURRENT_SOURCE_DIR}/static_map/static_map_test.cu")
 
-ConfigureTest(STATIC_MAP_TEST "${CMAKE_CURRENT_SOURCE_DIR}/static_map/static_map_test.cu")
+ConfigureTest(STATIC_MAP_TEST "${STATIC_MAP_TEST_SRC}")
+####################################################################################################
+set(DYNAMIC_MAP_TEST_SRC
+    "${CMAKE_CURRENT_SOURCE_DIR}/dynamic_map/dynamic_map_test.cu")
 
-ConfigureTest(STATIC_REDUCTION_MAP_TEST "${CMAKE_CURRENT_SOURCE_DIR}/static_reduction_map/static_reduction_map_test.cu")
-
-ConfigureTest(DYNAMIC_MAP_TEST "${CMAKE_CURRENT_SOURCE_DIR}/dynamic_map/dynamic_map_test.cu")
+ConfigureTest(DYNAMIC_MAP_TEST "${DYNAMIC_MAP_TEST_SRC}")
+####################################################################################################