diff --git a/.gitignore b/.gitignore index 35a8d5ab8..4be2eed59 100644 --- a/.gitignore +++ b/.gitignore @@ -44,3 +44,10 @@ CMakeSettings.json # Python wheels stuff *.egg-info/ + + +build-*/ +cmake-build-*/ +.idea/ +.vscode/ +*.rdb \ No newline at end of file diff --git a/examples/cache/build_cache.sh b/examples/cache/build_cache.sh index 9c75e68f0..00edb612e 100644 --- a/examples/cache/build_cache.sh +++ b/examples/cache/build_cache.sh @@ -52,17 +52,19 @@ build_cache() { make -j32 make install - cd - + cd ${BUILD_DIR}/../ } start_services() { echo "Starting redis server and setting environment variables..." - nohup ${SW_DIR}/redis/src/redis-server > ${SW_DIR}redis_server.log 2>&1 & - nohup ${SW_DIR}/adios2/bin/remote_server > ${SW_DIR}remote_server.log 2>&1 & export DoRemote=1 export useKVCache=1 export PYTHONPATH=${SW_DIR}/adios2/local/lib/python3.10/dist-packages/ export LD_LIBRARY_PATH=${SW_DIR}/adios2/lib:${SW_DIR}/hiredis/lib:$LD_LIBRARY_PATH + nohup ${SW_DIR}/redis/src/redis-server > ${SW_DIR}redis_server.log 2>&1 & + nohup ${SW_DIR}/adios2/bin/adios2_remote_server > ${SW_DIR}remote_server.log 2>&1 & + sleep 5 + nohup ${SW_DIR}/redis/src/redis-cli monitor > ${SW_DIR}redis_monitor.log 2>&1 & echo "Services started and environment variables set." } @@ -70,6 +72,7 @@ start_services() { stop_services() { echo "Stopping services..." pkill -f redis-server + pkill -f redis-cli pkill -f remote_server unset DoRemote unset useKVCache diff --git a/source/adios2/CMakeLists.txt b/source/adios2/CMakeLists.txt index 53b2c0541..5fd1ce4bb 100644 --- a/source/adios2/CMakeLists.txt +++ b/source/adios2/CMakeLists.txt @@ -253,6 +253,13 @@ if (ADIOS2_HAVE_KVCACHE) target_sources(adios2_core PRIVATE toolkit/cache/KVCacheCommon.h toolkit/cache/KVCacheCommon.tcc) target_link_libraries(adios2_core PRIVATE hiredis::hiredis) + + # Ensure the rpath is set correctly + # message(STATUS "PACKAGE_PREFIX_DIR: ${PACKAGE_PREFIX_DIR}") + set_target_properties(adios2_core PROPERTIES + BUILD_RPATH "$ORIGIN:${PACKAGE_PREFIX_DIR}/lib" + INSTALL_RPATH "$ORIGIN:${PACKAGE_PREFIX_DIR}/lib" + ) endif () if(ADIOS2_HAVE_Campaign)