Skip to content

Adds C++ stdpar vesions #15

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jefflarkin wants to merge 11 commits into
base: main
Choose a base branch
from
Open

Adds C++ stdpar vesions #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
4b23b44
Merged from upstream
Dec 6, 2022
7ddd0ef
Merging with upstream
jefflarkin Mar 24, 2023
7062d14
merged with upstream
jefflarkin Apr 17, 2024
a9968ab
Added new for_each and for_each_n versions.
jefflarkin Apr 17, 2024
4510f59
Added stdpar to MPI version
jefflarkin Apr 17, 2024
78ccb36
Removed hard-coded settings.
jefflarkin Apr 17, 2024
ac41bcb
Added stdpar to cmake and fixed bug in mpi_for_each_n
jefflarkin Apr 17, 2024
aebda1b
Added versions that include for_each and for_each_n with C++23 mdspan.
jefflarkin Apr 18, 2024
17dd649
Added MPI versions with for_each(_n) and mdspan
jefflarkin Apr 18, 2024
073146f
Updated to use mdspan for MPI too
jefflarkin Apr 18, 2024
a325790
Code clean-up to help with diffing
jefflarkin Apr 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
88 changes: 88 additions & 0 deletions c/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,50 @@ endif()

add_test(NAME SERIAL_TEST COMMAND ./check_output.sh ./serial_test 1e-13 4.5e-5 )

############################################################
## Compile the serial for_each version
############################################################
if (NOT ("${STDPAR_FLAGS}" STREQUAL "") )
add_executable(serial_for_each miniWeather_serial_for_each.cpp)
set_target_properties(serial_for_each PROPERTIES COMPILE_FLAGS "${EXE_DEFS} ${STDPAR_FLAGS}")

add_executable(serial_for_each_test miniWeather_serial_for_each.cpp)
set_target_properties(serial_for_each_test PROPERTIES COMPILE_FLAGS "${TEST_DEFS} ${STDPAR_FLAGS}")

if (NOT ("${LDFLAGS}" STREQUAL "") )
target_link_libraries(serial_for_each "${LDFLAGS} ${STDPAR_FLAGS}")
target_link_libraries(serial_for_each_test "${LDFLAGS} ${STDPAR_FLAGS}")
endif()
if (NOT ("${SERIAL_LINK_FLAGS}" STREQUAL "") )
target_link_libraries(serial_for_each "${SERIAL_LINK_FLAGS} ${STDPAR_FLAGS}")
target_link_libraries(serial_for_each_test "${SERIAL_LINK_FLAGS} ${STDPAR_FLAGS}")
endif()

add_test(NAME SERIAL_FOR_EACH_TEST COMMAND ./check_output.sh ./serial_for_each_test 1e-13 4.5e-5 )
endif()


############################################################
## Compile the serial for_each_n version
############################################################
if (NOT ("${STDPAR_FLAGS}" STREQUAL "") )
add_executable(serial_for_each_n miniWeather_serial_for_each_n.cpp)
set_target_properties(serial_for_each_n PROPERTIES COMPILE_FLAGS "${EXE_DEFS} ${STDPAR_FLAGS}")

add_executable(serial_for_each_n_test miniWeather_serial_for_each_n.cpp)
set_target_properties(serial_for_each_n_test PROPERTIES COMPILE_FLAGS "${TEST_DEFS} ${STDPAR_FLAGS}")

if (NOT ("${LDFLAGS}" STREQUAL "") )
target_link_libraries(serial_for_each_n "${LDFLAGS} ${STDPAR_FLAGS}")
target_link_libraries(serial_for_each_n_test "${LDFLAGS} ${STDPAR_FLAGS}")
endif()
if (NOT ("${SERIAL_LINK_FLAGS}" STREQUAL "") )
target_link_libraries(serial_for_each_n "${SERIAL_LINK_FLAGS} ${STDPAR_FLAGS}")
target_link_libraries(serial_for_each_n_test "${SERIAL_LINK_FLAGS} ${STDPAR_FLAGS}")
endif()

add_test(NAME SERIAL_FOR_EACH_N_TEST COMMAND ./check_output.sh ./serial_for_each_n_test 1e-13 4.5e-5 )
endif()

############################################################
## Compile the MPI version
Expand All @@ -75,6 +119,50 @@ endif()

add_test(NAME MPI_TEST COMMAND ./check_output.sh ./mpi_test 1e-13 4.5e-5 )

############################################################
## Compile the mpi for_each version
############################################################
if (NOT ("${STDPAR_FLAGS}" STREQUAL "") )
add_executable(mpi_for_each miniWeather_mpi_for_each.cpp)
set_target_properties(mpi_for_each PROPERTIES COMPILE_FLAGS "${EXE_DEFS} ${STDPAR_FLAGS}")

add_executable(mpi_for_each_test miniWeather_mpi_for_each.cpp)
set_target_properties(mpi_for_each_test PROPERTIES COMPILE_FLAGS "${TEST_DEFS} ${STDPAR_FLAGS}")

if (NOT ("${LDFLAGS}" STREQUAL "") )
target_link_libraries(mpi_for_each "${LDFLAGS} ${STDPAR_FLAGS}")
target_link_libraries(mpi_for_each_test "${LDFLAGS} ${STDPAR_FLAGS}")
endif()
if (NOT ("${SERIAL_LINK_FLAGS}" STREQUAL "") )
target_link_libraries(mpi_for_each "${MPI_LINK_FLAGS} ${STDPAR_FLAGS}")
target_link_libraries(mpi_for_each_test "${MPI_LINK_FLAGS} ${STDPAR_FLAGS}")
endif()

add_test(NAME MPI_FOR_EACH_TEST COMMAND ./check_output.sh ./mpi_for_each_test 1e-13 4.5e-5 )
endif()


############################################################
## Compile the serial for_each_n version
############################################################
if (NOT ("${STDPAR_FLAGS}" STREQUAL "") )
add_executable(mpi_for_each_n miniWeather_mpi_for_each_n.cpp)
set_target_properties(mpi_for_each_n PROPERTIES COMPILE_FLAGS "${EXE_DEFS} ${STDPAR_FLAGS}")

add_executable(mpi_for_each_n_test miniWeather_mpi_for_each_n.cpp)
set_target_properties(mpi_for_each_n_test PROPERTIES COMPILE_FLAGS "${TEST_DEFS} ${STDPAR_FLAGS}")

if (NOT ("${LDFLAGS}" STREQUAL "") )
target_link_libraries(mpi_for_each_n "${LDFLAGS} ${STDPAR_FLAGS}")
target_link_libraries(mpi_for_each_n_test "${LDFLAGS} ${STDPAR_FLAGS}")
endif()
if (NOT ("${SERIAL_LINK_FLAGS}" STREQUAL "") )
target_link_libraries(mpi_for_each_n "${MPI_LINK_FLAGS} ${STDPAR_FLAGS}")
target_link_libraries(mpi_for_each_n_test "${MPI_LINK_FLAGS} ${STDPAR_FLAGS}")
endif()

add_test(NAME MPI_FOR_EACH_N_TEST COMMAND ./check_output.sh ./mpi_for_each_n_test 1e-13 4.5e-5 )
endif()

############################################################
## Compile the MPI + OpenMP version
Expand Down
Loading