Verified Commit 241e0af1 authored by Marc Vef's avatar Marc Vef
Browse files

adding temporary na_sm patches to compile script

parent 471f0d07

scripts/compile_dep.sh

+5 −0
Original line number Diff line number Diff line
@@ -361,6 +361,10 @@ if check_dependency "mercury" "${DEP_CONFIG[@]}"; then 
    echo "############################################################ Installing:  Mercury"

    CURR=${SOURCE}/mercury

    prepare_build_dir "${CURR}"

    # temporary patches

    cd "${CURR}"

    git apply --verbose "${PATCH_DIR}"/mercury_buf_warning.patch

    git apply --verbose "${PATCH_DIR}"/mercury_na_sm_dir.patch

    cd "${CURR}"/build

    PKG_CONFIG_PATH=${INSTALL}/lib/pkgconfig $CMAKE \

        -DCMAKE_BUILD_TYPE:STRING=Release \
@@ -371,6 +375,7 @@ if check_dependency "mercury" "${DEP_CONFIG[@]}"; then 
        -DMERCURY_USE_BOOST_PP:BOOL=ON \

        -DMERCURY_USE_EAGER_BULK:BOOL=ON \

        -DBUILD_SHARED_LIBS:BOOL=ON \

        -DNA_SM_TMP_DIRECTORY:STRING="/dev/shm" \

        -DCMAKE_INSTALL_PREFIX=${INSTALL} \

        ${USE_BMI} ${USE_OFI} \

        ..

scripts/patches/mercury_buf_warning.patch

0 → 100644
+15 −0
Original line number Diff line number Diff line 
diff --git a/src/mercury_bulk.c b/src/mercury_bulk.c

index 7223bef..fce79fa 100644

--- a/src/mercury_bulk.c

+++ b/src/mercury_bulk.c

@@ -1632,8 +1632,8 @@ HG_Bulk_deserialize(hg_class_t *hg_class, hg_bulk_t *handle, const void *buf,

         }

     }

 

-    HG_CHECK_WARNING(buf_size_left > 0, "Buf size left greater than 0, %zd",

-        buf_size_left);

+    //HG_CHECK_WARNING(buf_size_left > 0, "Buf size left greater than 0, %zd",

+    //    buf_size_left);

 

     *handle = (hg_bulk_t) hg_bulk;

scripts/patches/mercury_na_sm_dir.patch

0 → 100644
+31 −0
Original line number Diff line number Diff line 
diff --git a/src/mercury_core.c b/src/mercury_core.c

index 446440b..057aeb1 100644

--- a/src/mercury_core.c

+++ b/src/mercury_core.c

@@ -33,6 +33,7 @@



 #include <stdlib.h>

 #include <string.h>

+#include <sys/stat.h>



 /****************/

 /* Local Macros */

@@ -807,6 +808,7 @@ static hg_return_t

 hg_core_get_sm_uuid(uuid_t *sm_uuid)

 {

     const char *sm_path = NA_SM_TMP_DIRECTORY "/" NA_SM_SHM_PREFIX "/uuid.cfg";

+    const char *sm_path_dir = NA_SM_TMP_DIRECTORY "/" NA_SM_SHM_PREFIX;

     char uuid_str[HG_CORE_UUID_MAX_LEN + 1];

     FILE *uuid_config;

     uuid_t new_uuid;

@@ -816,6 +818,10 @@ hg_core_get_sm_uuid(uuid_t *sm_uuid)

     if (!uuid_config) {

         /* Generate a new one */

         uuid_generate(new_uuid);

+        struct stat st = {0};

+        if (stat(sm_path_dir, &st) == -1) {

+            mkdir(sm_path_dir, 0777);

+        }



         uuid_config = fopen(sm_path, "w");

         HG_CHECK_ERROR(uuid_config == NULL, done, ret, HG_NOENTRY,