Skip to content
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

Jump to bottom

working ishmem_init & ishmem_finalize on borealis #599

Merged
merged 4 commits into from
Oct 31, 2023
Merged

working ishmem_init & ishmem_finalize on borealis #599

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
27d97a5
compiling and linking with ishmem and its dependencies
lslusarczyk Oct 24, 2023
229d4bb
working ishmem_init and ishmem_finalize on borealis
lslusarczyk Oct 26, 2023
1c7ef92
Merge remote-tracking branch 'official/main' into ishmem
lslusarczyk Oct 26, 2023
73f252b
Merge remote-tracking branch 'origin/main' into ishmem
lslusarczyk Oct 31, 2023
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
10 changes: 10 additions & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,6 +194,16 @@ if(ENABLE_ISHMEM)

add_custom_target(shmem DEPENDS ishmem)

function(add_shmem_test test_name name processes)
add_test(
NAME ${test_name}
# FIXME, can not use ${MPIEXEC_EXECUTABLE} on Borealis because it gives
# two ranks 0 and failure in ISHMEM init
COMMAND
mpiexec ${MPIEXEC_NUMPROC_FLAG} ${processes} ${MPIEXEC_PREFLAGS}
${CMAKE_BINARY_DIR}/bin/ishmrun ./${name} ${ARGN} COMMAND_EXPAND_LISTS)
endfunction()

endif()

function(add_mhp_ctest test_name name processes)
Expand Down
12 changes: 11 additions & 1 deletion include/dr/mhp/global.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@
#pragma once

#include <unistd.h>

#ifdef DRISHMEM
#include <ishmem.h>
#endif
#include <dr/detail/sycl_utils.hpp>
#include <dr/mhp/sycl_support.hpp>

Expand Down Expand Up @@ -71,6 +73,10 @@ inline void initialize_mpi() {
MPI_Init(nullptr, nullptr);
we_initialized_mpi_ = true;
}

#ifdef DRISHMEM
ishmem_init();
#endif
}

// Finalize MPI *if* we initialized it and it has not been finalized.
Expand All @@ -81,6 +87,10 @@ inline void finalize_mpi() {
if (we_initialized_mpi_ && !finalized) {
MPI_Finalize();
}

#ifdef DRISHMEM
ishmem_finalize();
#endif
}

} // namespace __detail
Expand Down
9 changes: 7 additions & 2 deletions test/gtest/mhp/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,9 +68,14 @@ endforeach()

if(ENABLE_ISHMEM)
add_executable(mhp-shmem-test mhp-tests.cpp ../common/zip.cpp)
target_link_libraries(
mhp-shmem-test GTest::gtest_main cxxopts DR::mpi ze_loader fabric
pmi_simple sma)
target_link_libraries(mhp-shmem-test ${CMAKE_BINARY_DIR}/lib/libishmem.a)
target_compile_definitions(mhp-shmem-test PRIVATE DRISHMEM)

target_link_libraries(mhp-shmem-test GTest::gtest_main cxxopts DR::mpi
ze_loader fabric)
add_shmem_test(mhp-shmem-test-1 mhp-shmem-test 1 --sycl)
add_shmem_test(mhp-shmem-test-2 mhp-shmem-test 2 --sycl)
endif()

add_mhp_ctest(mhp-quick-test-1 mhp-quick-test 1)
Expand Down