max/poet
1
0
Fork 0
mirror of https://git.gfz-potsdam.de/naaice/poet.git synced 2025-12-16 12:54:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

refactor: Migrate DHT implementation to LUCX

Browse Source
This commit is contained in:
Max Lübke 2025-03-03 10:11:42 +01:00
parent 8d02293cf5
commit 6c226834db
4 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ext/DHT

@ -1 +1 @@
Subproject commit 77de9eeba2b349ce88dd8bf258853f9b545c3d45 Subproject commit a22a6b2eee7c34441d6810d47ac2d9b25ce183e5

6
src/CMakeLists.txt
View File

@ -53,7 +53,7 @@ target_link_libraries(poet_coarse PRIVATE
PhreeqcRM PhreeqcRM
tug tug
OpenSSL::Crypto OpenSSL::Crypto
LMPI_DHT_OLD MPIDHT::coarse
) )
target_include_directories(poet_coarse PRIVATE "${CMAKE_CURRENT_BINARY_DIR}") target_include_directories(poet_coarse PRIVATE "${CMAKE_CURRENT_BINARY_DIR}")
install(TARGETS poet_coarse DESTINATION bin) install(TARGETS poet_coarse DESTINATION bin)
@ -66,7 +66,7 @@ target_link_libraries(poet_fine PRIVATE
PhreeqcRM PhreeqcRM
tug tug
OpenSSL::Crypto OpenSSL::Crypto
LFINE_LOCK MPIDHT::fine
) )
target_include_directories(poet_fine PRIVATE "${CMAKE_CURRENT_BINARY_DIR}") target_include_directories(poet_fine PRIVATE "${CMAKE_CURRENT_BINARY_DIR}")
install(TARGETS poet_fine DESTINATION bin) install(TARGETS poet_fine DESTINATION bin)
@ -79,7 +79,7 @@ target_link_libraries(poet_no PRIVATE
PhreeqcRM PhreeqcRM
tug tug
OpenSSL::Crypto OpenSSL::Crypto
LMPI_DHT MPIDHT::nolock
) )
target_include_directories(poet_no PRIVATE "${CMAKE_CURRENT_BINARY_DIR}") target_include_directories(poet_no PRIVATE "${CMAKE_CURRENT_BINARY_DIR}")
install(TARGETS poet_no DESTINATION bin) install(TARGETS poet_no DESTINATION bin)

2
src/Chemistry/SurrogateModels/DHT_Wrapper.cpp
View File

@ -107,7 +107,7 @@ DHT_Wrapper::DHT_Wrapper(MPI_Comm dht_comm, std::uint64_t dht_size,
DHT_Wrapper::~DHT_Wrapper() { DHT_Wrapper::~DHT_Wrapper() {
// free DHT // free DHT
#ifdef POET_DHT_UCX #ifdef POET_DHT_UCX
DHT_free(dht_object, NULL, NULL, NULL); DHT_free(dht_object, NULL);
#else #else
DHT_free(dht_object, NULL); DHT_free(dht_object, NULL);
#endif #endif

4
src/Chemistry/SurrogateModels/DHT_Wrapper.hpp
View File

@ -41,6 +41,10 @@
#include <LUCX/DHT.h> #include <LUCX/DHT.h>
#ifdef POET_DHT_UCX
#include <LUCX/Bootstrap.h>
#endif
#include <mpi.h> #include <mpi.h>
namespace poet { namespace poet {