Add common interface for simple kernels

.github/bot-pr-format-base.sh

@@ -4,7 +4,7 @@ source .github/bot-pr-base.sh
 
 EXTENSION_REGEX='\.(cuh?|hpp|hpp\.inc?|cpp)$'
 FORMAT_HEADER_REGEX='^(benchmark|core|cuda|hip|include/ginkgo/core|omp|reference|dpcpp)/'
-FORMAT_REGEX='^(common|examples|test_install)/'
+FORMAT_REGEX='^(common|examples|test)/'
 
 echo "Retrieving PR file list"
 PR_FILES=$(bot_get_all_changed_files ${PR_URL})

.gitlab-ci.yml

@@ -98,6 +98,7 @@ include:
       CUDA_ARCH_STR=-DGINKGO_CUDA_ARCHITECTURES=${CUDA_ARCH};
       CUDA_HOST_STR=-DCMAKE_CUDA_HOST_COMPILER=$(which ${CXX_COMPILER});
       fi
+    - if [ -n "${SYCL_DEVICE_TYPE}" ]; then export SYCL_DEVICE_TYPE; fi
     - if [ -n "${SYCL_DEVICE_FILTER}" ]; then export SYCL_DEVICE_FILTER; fi
     - cmake ${CI_PROJECT_DIR}${CI_PROJECT_DIR_SUFFIX}
         -GNinja
@@ -121,7 +122,7 @@ include:
         (( $(ctest -N | tail -1 | sed 's/Total Tests: //') != 0 )) || exit 1
     - ctest -V
     - ninja test_install
-    - pushd test_install
+    - pushd test/test_install
     - ninja install
     - popd
     - |
@@ -145,6 +146,7 @@ include:
             ninja validate_all_examples
         fi
       fi
+    - if [ -n "${SYCL_DEVICE_TYPE}" ]; then unset SYCL_DEVICE_TYPE; fi
     - if [ -n "${SYCL_DEVICE_FILTER}" ]; then unset SYCL_DEVICE_FILTER; fi
     - if [ "${EXPORT_BUILD_DIR}" == "ON" ]; then ninja test_exportbuild; fi
   dependencies: []
@@ -718,7 +720,7 @@ build/dpcpp/cpu/release/static:
     BUILD_DPCPP: "ON"
     BUILD_TYPE: "Release"
     BUILD_SHARED_LIBS: "ON"
-    SYCL_DEVICE_FILTER: "CPU"
+    SYCL_DEVICE_TYPE: "CPU"
 
 build/dpcpp/igpu/release/static:
   <<: *default_build_with_test
@@ -733,7 +735,7 @@ build/dpcpp/igpu/release/static:
     BUILD_TYPE: "Release"
     BUILD_SHARED_LIBS: "OFF"
     DPCPP_SINGLE_MODE: "ON"
-    SYCL_DEVICE_FILTER: "GPU"
+    SYCL_DEVICE_FILTER: "Level_Zero:GPU"
 
 build/dpcpp/dgpu/debug/shared:
   <<: *default_build_with_test

CMakeLists.txt

@@ -261,6 +261,9 @@ if (GINKGO_BUILD_OMP)
 endif()
 add_subdirectory(core)           # Core Ginkgo types and top-level functions
 add_subdirectory(include)        # Public API self-contained check
+if (GINKGO_BUILD_TESTS)
+    add_subdirectory(test)       # Tests running on all executors
+endif()
 
 # Non core directories and targets
 if(GINKGO_BUILD_EXAMPLES)
@@ -330,56 +333,69 @@ ginkgo_modify_flags(CMAKE_CUDA_FLAGS_DEBUG)
 ginkgo_modify_flags(CMAKE_CUDA_FLAGS_RELEASE)
 ginkgo_install()
 
+set(GINKGO_TEST_INSTALL_SRC_DIR "${Ginkgo_SOURCE_DIR}/test/test_install/")
+set(GINKGO_TEST_INSTALL_BIN_DIR "${Ginkgo_BINARY_DIR}/test/test_install/")
+set(GINKGO_TEST_EXPORTBUILD_SRC_DIR "${Ginkgo_SOURCE_DIR}/test/test_exportbuild/")
+set(GINKGO_TEST_EXPORTBUILD_BIN_DIR "${Ginkgo_BINARY_DIR}/test/test_exportbuild/")
 if(MSVC)
-    # Set path/command with $<CONFIG>
-    set(GINKGO_TEST_INSTALL_COMMAND "${Ginkgo_BINARY_DIR}/test_install/$<CONFIG>/test_install")
-    set(GINKGO_TEST_EXPORTBUILD_COMMAND "${Ginkgo_BINARY_DIR}/test_exportbuild/$<CONFIG>/test_exportbuild")
+    set(GINKGO_TEST_INSTALL_CMD ${GINKGO_TEST_INSTALL_BIN_DIR}/$<CONFIG>/test_install)
+    set(GINKGO_TEST_EXPORTBUILD_CMD ${GINKGO_TEST_EXPORTBUILD_BIN_DIR}/$<CONFIG>/test_exportbuild)
     if(GINKGO_BUILD_CUDA)
-        set(GINKGO_TEST_INSTALL_CUDA_COMMAND "${Ginkgo_BINARY_DIR}/test_install/$<CONFIG>/test_install_cuda")
+        set(GINKGO_TEST_INSTALL_CUDA_CMD ${GINKGO_TEST_INSTALL_BIN_DIR}/$<CONFIG>/test_install_cuda)
     endif()
 else()
-    set(GINKGO_TEST_INSTALL_COMMAND "${Ginkgo_BINARY_DIR}/test_install/test_install")
-    set(GINKGO_TEST_EXPORTBUILD_COMMAND "${Ginkgo_BINARY_DIR}/test_exportbuild/test_exportbuild")
+    set(GINKGO_TEST_INSTALL_CMD ${GINKGO_TEST_INSTALL_BIN_DIR}/test_install)
+    set(GINKGO_TEST_EXPORTBUILD_CMD ${GINKGO_TEST_EXPORTBUILD_BIN_DIR}/test_exportbuild)
     if(GINKGO_BUILD_CUDA)
-        set(GINKGO_TEST_INSTALL_CUDA_COMMAND "${Ginkgo_BINARY_DIR}/test_install/test_install_cuda")
-    endif()
-    if(GINKGO_BUILD_HIP)
-        set(GINKGO_TEST_INSTALL_HIP_COMMAND "${Ginkgo_BINARY_DIR}/test_install/test_install_hip")
+        set(GINKGO_TEST_INSTALL_CUDA_CMD ${GINKGO_TEST_INSTALL_BIN_DIR}/test_install_cuda)
     endif()
 endif()
+if(GINKGO_BUILD_HIP)
+    set(GINKGO_TEST_INSTALL_HIP_CMD ${GINKGO_TEST_INSTALL_BIN_DIR}/test_install_hip)
+endif()
 
-file(MAKE_DIRECTORY ${Ginkgo_BINARY_DIR}/test_install)
+file(MAKE_DIRECTORY "${GINKGO_TEST_INSTALL_BIN_DIR}")
+file(MAKE_DIRECTORY "${GINKGO_TEST_EXPORTBUILD_BIN_DIR}")
 set(TOOLSET "")
 if (NOT "${CMAKE_GENERATOR_TOOLSET}" STREQUAL "")
     set(TOOLSET "-T${CMAKE_GENERATOR_TOOLSET}")
 endif()
 add_custom_target(test_install
-    COMMAND ${CMAKE_COMMAND} -G${CMAKE_GENERATOR} ${TOOLSET} -H${Ginkgo_SOURCE_DIR}/test_install
-    -B${Ginkgo_BINARY_DIR}/test_install
+    COMMAND ${CMAKE_COMMAND} -G${CMAKE_GENERATOR} ${TOOLSET}
+    -H${GINKGO_TEST_INSTALL_SRC_DIR}
+    -B${GINKGO_TEST_INSTALL_BIN_DIR}
     -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
     -DCMAKE_PREFIX_PATH=${CMAKE_INSTALL_PREFIX}/${GINKGO_INSTALL_CONFIG_DIR}
-    -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER} -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
+    -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
+    -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
     -DCMAKE_CUDA_COMPILER=${CMAKE_CUDA_COMPILER}
-    WORKING_DIRECTORY ${Ginkgo_BINARY_DIR}/test_install
     # `--config cfg` is ignored by single-configuration generator.
     # `$<CONFIG>` is always be the same as `CMAKE_BUILD_TYPE` in
     # single-configuration generator.
-    COMMAND ${CMAKE_COMMAND} --build ${Ginkgo_BINARY_DIR}/test_install --config $<CONFIG>
-    COMMAND ${GINKGO_TEST_INSTALL_COMMAND}
-    COMMAND ${GINKGO_TEST_INSTALL_CUDA_COMMAND}
-    COMMAND ${GINKGO_TEST_INSTALL_HIP_COMMAND}
-    COMMENT "Running a test on the installed binaries. This requires running `(sudo) make install` first.")
+    COMMAND ${CMAKE_COMMAND}
+    --build ${GINKGO_TEST_INSTALL_BIN_DIR}
+    --config $<CONFIG>
+    COMMAND ${GINKGO_TEST_INSTALL_CMD}
+    COMMAND ${GINKGO_TEST_INSTALL_CUDA_CMD}
+    COMMAND ${GINKGO_TEST_INSTALL_HIP_CMD}
+    WORKING_DIRECTORY ${GINKGO_TEST_INSTALL_BIN_DIR}
+    COMMENT "Running a test on the installed binaries. "
+    "This requires running `(sudo) make install` first.")
 
 add_custom_target(test_exportbuild
-    COMMAND ${CMAKE_COMMAND} -G${CMAKE_GENERATOR} ${TOOLSET} -H${Ginkgo_SOURCE_DIR}/test_exportbuild
-    -B${Ginkgo_BINARY_DIR}/test_exportbuild
-    -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER} -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
+    COMMAND ${CMAKE_COMMAND} -G${CMAKE_GENERATOR} ${TOOLSET}
+    -H${GINKGO_TEST_EXPORTBUILD_SRC_DIR}
+    -B${GINKGO_TEST_EXPORTBUILD_BIN_DIR}
+    -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
+    -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
     -DCMAKE_CUDA_COMPILER=${CMAKE_CUDA_COMPILER}
     # `--config cfg` is ignored by single-configuration generator.
     # `$<CONFIG>` is always be the same as `CMAKE_BUILD_TYPE` in
     # single-configuration generator.
-    COMMAND ${CMAKE_COMMAND} --build ${Ginkgo_BINARY_DIR}/test_exportbuild --config $<CONFIG>
-    COMMAND ${GINKGO_TEST_EXPORTBUILD_COMMAND}
+    COMMAND ${CMAKE_COMMAND}
+    --build ${GINKGO_TEST_EXPORTBUILD_BIN_DIR}
+    --config $<CONFIG>
+    COMMAND ${GINKGO_TEST_EXPORTBUILD_CMD}
     COMMENT "Running a test on Ginkgo's exported build directory. "
     "This requires compiling Ginkgo with `-DGINKGO_EXPORT_BUILD_DIR=ON` first.")
 

cmake/build_helpers.cmake

@@ -43,20 +43,23 @@ function(ginkgo_compile_features name)
     set_target_properties("${name}" PROPERTIES POSITION_INDEPENDENT_CODE ON)
 endfunction()
 
-function(ginkgo_check_headers target)
+function(ginkgo_check_headers target defines)
     # build object library used to "compile" the headers
     # add a proxy source file for each header in the target source list
     file(GLOB_RECURSE CUDA_HEADERS RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" CONFIGURE_DEPENDS "*.cuh")
     file(GLOB_RECURSE HIP_HEADERS RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" CONFIGURE_DEPENDS "*.hip.hpp")
     file(GLOB_RECURSE CXX_HEADERS RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" CONFIGURE_DEPENDS "*.hpp")
     list(FILTER CXX_HEADERS EXCLUDE REGEX ".*\.hip\.hpp$")
     list(FILTER CXX_HEADERS EXCLUDE REGEX "^test.*")
+    list(FILTER CXX_HEADERS EXCLUDE REGEX "^base/kernel_launch.*")
     list(FILTER CUDA_HEADERS EXCLUDE REGEX "^test.*")
+    list(FILTER CUDA_HEADERS EXCLUDE REGEX "^base/kernel_launch.*")
     list(FILTER HIP_HEADERS EXCLUDE REGEX "^test.*")
+    list(FILTER HIP_HEADERS EXCLUDE REGEX "^base/kernel_launch.*")
 
     set(SOURCES "")
     # if we have any CUDA files in there, compile everything as CUDA
-    if (CUDA_HEADERS)
+    if(CUDA_HEADERS)
         set(CUDA_HEADERS ${CUDA_HEADERS} ${CXX_HEADERS})
         set(CXX_HEADERS "")
         if (HIP_HEADERS) 
@@ -74,10 +77,13 @@ function(ginkgo_check_headers target)
         file(WRITE "${HEADER_SOURCEFILE}" "#include \"${HEADER}\"")
         list(APPEND SOURCES "${HEADER_SOURCEFILE}")
     endforeach()
-    if (SOURCES)
+    if(SOURCES)
         add_library(${target}_headers OBJECT ${SOURCES})
         target_link_libraries(${target}_headers PRIVATE ${target})
         target_include_directories(${target}_headers PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}")
+        if(defines)
+            target_compile_definitions(${target}_headers PRIVATE ${defines})
+        endif()
     endif()
 
     set(HIP_SOURCES "")
@@ -86,7 +92,7 @@ function(ginkgo_check_headers target)
         file(WRITE "${HEADER_SOURCEFILE}" "#include \"${HEADER}\"")
         list(APPEND HIP_SOURCES "${HEADER_SOURCEFILE}")
     endforeach()
-    if (HIP_SOURCES)
+    if(HIP_SOURCES)
         set_source_files_properties(${HIP_SOURCES} PROPERTIES HIP_SOURCE_PROPERTY_FORMAT TRUE)
         hip_add_library(${target}_headers_hip ${HIP_SOURCES}) # the compiler options get set by linking to ginkgo_hip
         target_link_libraries(${target}_headers_hip PRIVATE ${target} roc::hipblas roc::hipsparse hip::hiprand roc::rocrand)