Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: UoB-HPC/BabelStream
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: c1952cdf6ee65dad84a454f2cedc6072458f680f
Choose a base ref
..
head repository: UoB-HPC/BabelStream
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 09868f4ba23954acf6f765f6788e23ff47b30aa3
Choose a head ref
Showing with 8 additions and 6 deletions.
  1. +3 −3 src/ci-test-compile.sh
  2. +5 −3 src/std/model.cmake
6 changes: 3 additions & 3 deletions src/ci-test-compile.sh
View file
Original file line number Diff line number Diff line change
@@ -153,7 +153,7 @@ build_gcc() {
esac
# some distributions like Ubuntu bionic implements std par with TBB, so conditionally link it here
run_build $name "${GCC_CXX:?}" std "$cxx $dpl_conditional_flags -DUSE_ONEDPL=$use_onedpl -DSTDIMPL=DATA17"
run_build $name "${GCC_CXX:?}" std "$cxx $dpl_conditional_flags -DUSE_ONEDPL=$use_onedpl -DSTDIMPL=DATA20"
run_build $name "${GCC_CXX:?}" std "$cxx $dpl_conditional_flags -DUSE_ONEDPL=$use_onedpl -DSTDIMPL=DATA23"
run_build $name "${GCC_CXX:?}" std "$cxx $dpl_conditional_flags -DUSE_ONEDPL=$use_onedpl -DSTDIMPL=INDICES"
done

@@ -253,7 +253,7 @@ build_clang() {
esac
run_build $name "${CLANG_CXX:?}" std "$cxx $dpl_conditional_flags -DUSE_ONEDPL=$use_onedpl -DSTDIMPL=DATA17"
# Requires GCC 14
# run_build $name "${CLANG_CXX:?}" std "$cxx $dpl_conditional_flags -DUSE_ONEDPL=$use_onedpl -DSTDIMPL=DATA20"
# run_build $name "${CLANG_CXX:?}" std "$cxx $dpl_conditional_flags -DUSE_ONEDPL=$use_onedpl -DSTDIMPL=DATA23"
run_build $name "${CLANG_CXX:?}" std "$cxx $dpl_conditional_flags -DUSE_ONEDPL=$use_onedpl -DSTDIMPL=INDICES"
done

@@ -273,7 +273,7 @@ build_nvhpc() {
local cxx="-DCMAKE_CXX_COMPILER=${NVHPC_NVCXX:?}"
run_build $name "${NVHPC_NVCXX:?}" std "$cxx -DNVHPC_OFFLOAD=$NV_ARCH_CCXY -DSTDIMPL=DATA17"
# Requires GCC 14
# run_build $name "${NVHPC_NVCXX:?}" std "$cxx -DNVHPC_OFFLOAD=$NV_ARCH_CCXY -DSTDIMPL=DATA20"
# run_build $name "${NVHPC_NVCXX:?}" std "$cxx -DNVHPC_OFFLOAD=$NV_ARCH_CCXY -DSTDIMPL=DATA23"
run_build $name "${NVHPC_NVCXX:?}" std "$cxx -DNVHPC_OFFLOAD=$NV_ARCH_CCXY -DSTDIMPL=INDICES"

run_build $name "${NVHPC_NVCXX:?}" acc "$cxx -DTARGET_DEVICE=gpu -DTARGET_PROCESSOR=px -DCUDA_ARCH=$NV_ARCH_CCXY"
8 changes: 5 additions & 3 deletions src/std/model.cmake
View file
Original file line number Diff line number Diff line change
@@ -38,8 +38,8 @@ register_flag_optional(USE_ONEDPL

register_flag_optional(STDIMPL
"Implementation strategy (default = DATA20):
DATA17 - Parallel algorithms over data (requires C++17).
DATA20 - (default) Parallel algorithms over data (requires C++20).
DATA17 - Parallel algorithms over data (requires C++17).
DATA23 - (default) Parallel algorithms over data (requires C++20).
INDICES - Parallel algorithms over indices (requires C++20)."
"DATA20"
)
@@ -48,8 +48,10 @@ macro(setup)
register_definitions(${STDIMPL})
if (${STDIMPL} STREQUAL "DATA17")
set(CMAKE_CXX_STANDARD 17)
else ()
else if (${STDIMPL} STREQUAL "INDICES")
set(CMAKE_CXX_STANDARD 20)
else if (${STDIMPL} STREQUAL "DATA23")
set(CMAKE_CXX_STANDARD 23)
endif ()
if (NVHPC_OFFLOAD)
set(NVHPC_FLAGS -stdpar=gpu -gpu=${NVHPC_OFFLOAD})