fix ci

flux-framework · Nov 23, 2023 · 5887ade · 5887ade
1 parent b9a5311
commit 5887ade
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/.github/prod-cons/dyad_consumer.sh b/.github/prod-cons/dyad_consumer.sh
@@ -8,7 +8,7 @@ export DYAD_PATH_CONSUMER=${DYAD_PATH}_consumer
 mkdir -p ${DYAD_PATH_CONSUMER}
 
 if [[ "$mode" == "${valid_modes[0]}" ]]; then
-    LD_PRELOAD=${DYAD_INSTALL_PREFIX}/lib/dyad_wrapper.so ${GITHUB_WORKSPACE}/docs/demos/ecp_feb_2023/c_cons 10 $DYAD_PATH_CONSUMER
+    LD_PRELOAD=${DYAD_INSTALL_PREFIX}/lib/libdyad_wrapper.so ${GITHUB_WORKSPACE}/docs/demos/ecp_feb_2023/c_cons 10 $DYAD_PATH_CONSUMER
 elif [[ "$mode" == "${valid_modes[1]}" ]]; then
     ${GITHUB_WORKSPACE}/docs/demos/ecp_feb_2023/cpp_cons 10 $DYAD_PATH_CONSUMER
 elif [[ "$mode" == "${valid_modes[2]}" ]]; then

diff --git a/.github/prod-cons/dyad_producer.sh b/.github/prod-cons/dyad_producer.sh
@@ -8,12 +8,12 @@ export DYAD_PATH_PRODUCER=${DYAD_PATH}_producer
 mkdir -p ${DYAD_PATH_PRODUCER}
 echo "Loading DYAD module"
 
-echo flux module load ${DYAD_INSTALL_PREFIX}/lib/libdyad.so  $DYAD_PATH_PRODUCER $DYAD_DTL_MODE
-flux module load ${DYAD_INSTALL_PREFIX}/lib/libdyad.so  $DYAD_PATH_PRODUCER $DYAD_DTL_MODE
+echo flux module load ${DYAD_INSTALL_PREFIX}/lib/dyad.so  $DYAD_PATH_PRODUCER $DYAD_DTL_MODE
+flux module load ${DYAD_INSTALL_PREFIX}/lib/dyad.so  $DYAD_PATH_PRODUCER $DYAD_DTL_MODE
 
 if [[ "$mode" == "${valid_modes[0]}" ]]; then
     echo ${GITHUB_WORKSPACE}/docs/demos/ecp_feb_2023/c_prod 10 $DYAD_PATH_PRODUCER
-    LD_PRELOAD=${DYAD_INSTALL_PREFIX}/lib/dyad_wrapper.so ${GITHUB_WORKSPACE}/docs/demos/ecp_feb_2023/c_prod 10 $DYAD_PATH_PRODUCER
+    LD_PRELOAD=${DYAD_INSTALL_PREFIX}/lib/libdyad_wrapper.so ${GITHUB_WORKSPACE}/docs/demos/ecp_feb_2023/c_prod 10 $DYAD_PATH_PRODUCER
 elif [[ "$mode" == "${test_modes[1]}" ]]; then
     echo ${GITHUB_WORKSPACE}/docs/demos/ecp_feb_2023/cpp_prod 10 $DYAD_PATH_PRODUCER
     ${GITHUB_WORKSPACE}/docs/demos/ecp_feb_2023/cpp_prod 10 $DYAD_PATH_PRODUCER

diff --git a/src/dyad/modules/CMakeLists.txt b/src/dyad/modules/CMakeLists.txt
@@ -3,6 +3,7 @@ set(DYAD_MODULE_PRIVATE_HEADERS )
 set(DYAD_MODULE_PUBLIC_HEADERS )
 
 add_library(dyad SHARED ${DYAD_MODULE_SRC})
+set_target_properties(dyad PROPERTIES PREFIX "")
 target_link_libraries(dyad PUBLIC Jansson::Jansson flux::core)
 target_link_libraries(dyad PRIVATE dyad_dtl)
 target_compile_definitions(dyad PUBLIC BUILDING_DYAD=1)