diff --git a/.gitlab/ci/acpp-env.sh b/.gitlab/ci/acpp-env.sh new file mode 100644 index 0000000000..98b4c5a740 --- /dev/null +++ b/.gitlab/ci/acpp-env.sh @@ -0,0 +1,3 @@ +export SYCLCXX=/opt/adaptivecpp/bin/acpp +export ACPP_TARGETS=omp +export ACPP_VISIBILITY_MASK=omp diff --git a/.gitlab/ci/configure_fedora44_common_clang.cmake b/.gitlab/ci/configure_fedora44_common_clang.cmake index bd0290c19c..76f5627605 100644 --- a/.gitlab/ci/configure_fedora44_common_clang.cmake +++ b/.gitlab/ci/configure_fedora44_common_clang.cmake @@ -4,6 +4,9 @@ set(CMAKE_Fortran_COMPILER_SUPPORTS_F90 "1" CACHE BOOL "") set(CMake_TEST_C_STANDARDS "90;99;11;17;23" CACHE STRING "") set(CMake_TEST_CXX_STANDARDS "98;11;14;17;20;23;26" CACHE STRING "") +if (NOT "$ENV{CMAKE_CI_NIGHTLY}" STREQUAL "") + set(CMake_TEST_SYCL "ON" CACHE BOOL "") +endif() set(CMake_TEST_CLANG_COVERAGE "ON" CACHE BOOL "") diff --git a/.gitlab/ci/configure_fedora44_fastbuild.cmake b/.gitlab/ci/configure_fedora44_fastbuild.cmake index 20863a2fb0..af93cc0d79 100644 --- a/.gitlab/ci/configure_fedora44_fastbuild.cmake +++ b/.gitlab/ci/configure_fedora44_fastbuild.cmake @@ -1 +1,5 @@ +if (NOT "$ENV{CMAKE_CI_NIGHTLY}" STREQUAL "") + set(CMake_TEST_SYCL "ON" CACHE BOOL "") +endif() + include("${CMAKE_CURRENT_LIST_DIR}/configure_external_test.cmake") diff --git a/.gitlab/ci/configure_fedora44_makefiles.cmake b/.gitlab/ci/configure_fedora44_makefiles.cmake index 2fc9ed8a1b..bf63d26763 100644 --- a/.gitlab/ci/configure_fedora44_makefiles.cmake +++ b/.gitlab/ci/configure_fedora44_makefiles.cmake @@ -8,6 +8,7 @@ set(CMake_TEST_CTestUpdate_SVN "ON" CACHE BOOL "") if (NOT "$ENV{CMAKE_CI_NIGHTLY}" STREQUAL "") set(CMake_TEST_BIN2C_LARGE_FILE "ON" CACHE BOOL "") set(CMake_TEST_CTestUpdate_P4 "ON" CACHE BOOL "") + set(CMake_TEST_SYCL "ON" CACHE BOOL "") endif() set(CMake_TEST_ASM_NASM "ON" CACHE BOOL "") diff --git a/.gitlab/ci/configure_fedora44_ninja.cmake b/.gitlab/ci/configure_fedora44_ninja.cmake index d536871a47..59db08c58e 100644 --- a/.gitlab/ci/configure_fedora44_ninja.cmake +++ b/.gitlab/ci/configure_fedora44_ninja.cmake @@ -3,6 +3,7 @@ if (NOT "$ENV{CMAKE_CI_NIGHTLY}" STREQUAL "") set(CMake_TEST_CPACK_APPIMAGE "ON" CACHE STRING "") set(CMake_TEST_CPACK_APPIMAGE_RUNTIME_FILE "$ENV{CI_PROJECT_DIR}/.gitlab/appimagetool/lib/appimagetool/runtime" CACHE FILEPATH "") set(CMake_TEST_ISPC "ON" CACHE STRING "") + set(CMake_TEST_SYCL "ON" CACHE BOOL "") endif() set(CMake_TEST_LOCALE_CHARSET "UTF-8" CACHE STRING "") set(CMake_TEST_LOCALE_C_UTF8 ON CACHE BOOL "") diff --git a/.gitlab/ci/configure_fedora44_ninja_multi.cmake b/.gitlab/ci/configure_fedora44_ninja_multi.cmake index a99b5d1cfe..cd07493ea7 100644 --- a/.gitlab/ci/configure_fedora44_ninja_multi.cmake +++ b/.gitlab/ci/configure_fedora44_ninja_multi.cmake @@ -1,5 +1,6 @@ if (NOT "$ENV{CMAKE_CI_NIGHTLY}" STREQUAL "") set(CMake_TEST_ISPC "ON" CACHE STRING "") + set(CMake_TEST_SYCL "ON" CACHE BOOL "") endif() set(CMake_TEST_MODULE_COMPILATION "named,compile_commands,collation,partitions,internal_partitions,export_bmi,install_bmi,shared,bmionly,build_database,import_std23" CACHE STRING "") set(CMake_TEST_Rust "ON" CACHE STRING "") diff --git a/.gitlab/ci/env_fedora44_common_clang.sh b/.gitlab/ci/env_fedora44_common_clang.sh index 2200841ee7..412dc069de 100644 --- a/.gitlab/ci/env_fedora44_common_clang.sh +++ b/.gitlab/ci/env_fedora44_common_clang.sh @@ -1,3 +1,7 @@ export CC=/usr/bin/clang export CXX=/usr/bin/clang++ export FC=/usr/bin/flang + +if test "$CMAKE_CI_NIGHTLY" = "true"; then + source .gitlab/ci/acpp-env.sh +fi diff --git a/.gitlab/ci/env_fedora44_fastbuild.sh b/.gitlab/ci/env_fedora44_fastbuild.sh index 5e8b2df4a9..a4ed4d2bfc 100644 --- a/.gitlab/ci/env_fedora44_fastbuild.sh +++ b/.gitlab/ci/env_fedora44_fastbuild.sh @@ -1 +1,4 @@ source .gitlab/ci/fastbuild-env.sh +if test "$CMAKE_CI_NIGHTLY" = "true"; then + source .gitlab/ci/acpp-env.sh +fi diff --git a/.gitlab/ci/env_fedora44_makefiles.sh b/.gitlab/ci/env_fedora44_makefiles.sh index 858ac59181..e6b6284bc9 100644 --- a/.gitlab/ci/env_fedora44_makefiles.sh +++ b/.gitlab/ci/env_fedora44_makefiles.sh @@ -1,4 +1,5 @@ if test "$CMAKE_CI_NIGHTLY" = "true"; then + source .gitlab/ci/acpp-env.sh source .gitlab/ci/android-ndk-env.sh source .gitlab/ci/android-sdk-env.sh source .gitlab/ci/ispc-env.sh diff --git a/.gitlab/ci/env_fedora44_ninja.sh b/.gitlab/ci/env_fedora44_ninja.sh index 3607fb14c4..d9d3adec2b 100644 --- a/.gitlab/ci/env_fedora44_ninja.sh +++ b/.gitlab/ci/env_fedora44_ninja.sh @@ -1,4 +1,5 @@ if test "$CMAKE_CI_NIGHTLY" = "true"; then + source .gitlab/ci/acpp-env.sh source .gitlab/ci/appimagetool-env.sh source .gitlab/ci/ispc-env.sh fi diff --git a/.gitlab/ci/env_fedora44_ninja_multi.sh b/.gitlab/ci/env_fedora44_ninja_multi.sh index 217ff305df..e7b0fb113e 100644 --- a/.gitlab/ci/env_fedora44_ninja_multi.sh +++ b/.gitlab/ci/env_fedora44_ninja_multi.sh @@ -1,3 +1,4 @@ if test "$CMAKE_CI_NIGHTLY" = "true"; then + source .gitlab/ci/acpp-env.sh source .gitlab/ci/ispc-env.sh fi