cleanup unused CMake defines

Remove offloading defines forgotten during OpenACC and OpenMP offloading were removed.
alpaka-group · Dec 1, 2023 · e554882 · e554882
1 parent f91d4b5
commit e554882
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 15 deletions.
diff --git a/cmake/alpakaCommon.cmake b/cmake/alpakaCommon.cmake
@@ -734,13 +734,8 @@ target_compile_definitions(alpaka INTERFACE "ALPAKA_DEBUG=${alpaka_DEBUG}")
 if(alpaka_DEBUG_OFFLOAD_ASSUME_HOST)
    target_compile_definitions(alpaka INTERFACE "ALPAKA_DEBUG_OFFLOAD_ASSUME_HOST")
 endif()
-target_compile_definitions(alpaka INTERFACE "ALPAKA_OFFLOAD_MAX_BLOCK_SIZE=${alpaka_OFFLOAD_MAX_BLOCK_SIZE}")
+
 target_compile_definitions(alpaka INTERFACE "ALPAKA_BLOCK_SHARED_DYN_MEMBER_ALLOC_KIB=${alpaka_BLOCK_SHARED_DYN_MEMBER_ALLOC_KIB}")
-if(alpaka_OFFLOAD_USE_BUILTIN_SHARED_MEM STREQUAL "DYN_FIXED")
-    target_compile_definitions(alpaka INTERFACE ALPAKA_OFFLOAD_BUILTIN_SHARED_MEM_FIXED)
-elseif(alpaka_OFFLOAD_USE_BUILTIN_SHARED_MEM STREQUAL "DYN_ALLOC")
-    target_compile_definitions(alpaka INTERFACE ALPAKA_OFFLOAD_BUILTIN_SHARED_MEM_ALLOC)
-endif()
 
 if(alpaka_CI)
     target_compile_definitions(alpaka INTERFACE "ALPAKA_CI")

diff --git a/script/docker_ci.sh b/script/docker_ci.sh
@@ -78,14 +78,6 @@ if [ ! -z "${alpaka_ACC_CPU_B_SEQ_T_OMP2_ENABLE+x}" ]
 then
     ALPAKA_DOCKER_ENV_LIST+=("--env" "alpaka_ACC_CPU_B_SEQ_T_OMP2_ENABLE=${alpaka_ACC_CPU_B_SEQ_T_OMP2_ENABLE}")
 fi
-if [ ! -z "${alpaka_OFFLOAD_MAX_BLOCK_SIZE+x}" ]
-then
-    ALPAKA_DOCKER_ENV_LIST+=("--env" "alpaka_OFFLOAD_MAX_BLOCK_SIZE=${alpaka_OFFLOAD_MAX_BLOCK_SIZE}")
-fi
-if [ ! -z "${alpaka_DEBUG_OFFLOAD_ASSUME_HOST+x}" ]
-then
-    ALPAKA_DOCKER_ENV_LIST+=("--env" "alpaka_DEBUG_OFFLOAD_ASSUME_HOST=${alpaka_DEBUG_OFFLOAD_ASSUME_HOST}")
-fi
 if [ ! -z "${alpaka_ACC_GPU_CUDA_ENABLE+x}" ]
 then
     ALPAKA_DOCKER_ENV_LIST+=("--env" "alpaka_ACC_GPU_CUDA_ENABLE=${alpaka_ACC_GPU_CUDA_ENABLE}")

diff --git a/script/run_generate.sh b/script/run_generate.sh
@@ -84,7 +84,6 @@ cd build/
     "$(env2cmake alpaka_ACC_CPU_B_SEQ_T_SEQ_ENABLE)" "$(env2cmake alpaka_ACC_CPU_B_SEQ_T_THREADS_ENABLE)" \
     "$(env2cmake alpaka_ACC_CPU_B_TBB_T_SEQ_ENABLE)" \
     "$(env2cmake alpaka_ACC_CPU_B_OMP2_T_SEQ_ENABLE)" "$(env2cmake alpaka_ACC_CPU_B_SEQ_T_OMP2_ENABLE)" \
-    "$(env2cmake alpaka_OFFLOAD_MAX_BLOCK_SIZE)" "$(env2cmake alpaka_DEBUG_OFFLOAD_ASSUME_HOST)" \
     "$(env2cmake TBB_DIR)" \
     "$(env2cmake alpaka_RELOCATABLE_DEVICE_CODE)" \
     "$(env2cmake alpaka_ACC_GPU_CUDA_ENABLE)" "$(env2cmake alpaka_ACC_GPU_CUDA_ONLY_MODE)" "$(env2cmake CMAKE_CUDA_ARCHITECTURES)" "$(env2cmake CMAKE_CUDA_COMPILER)" "$(env2cmake CMAKE_CUDA_FLAGS)" \