Commit 624260e7 authored by Marc Vef's avatar Marc Vef
Browse files

Merge branch 'update_mercury' into 'master' 

Update mercury and drop margo handles patch

See merge request zdvresearch_bsc/adafs!125
parents 30f79cc8 c8e382b6

ifs/scripts/compile_dep.sh

+0 −2
Original line number Diff line number Diff line
@@ -289,8 +289,6 @@ echo "############################################################ Installing: 
CURR=${SOURCE}/margo

prepare_build_dir ${CURR}

cd ${CURR}

echo "########## Applying margo handle cache fix"

git apply ${PATCH_DIR}/handle_cache.patch

./prepare.sh

cd ${CURR}/build

../configure --prefix=${INSTALL} PKG_CONFIG_PATH=${INSTALL}/lib/pkgconfig CFLAGS="-Wall -O3"

ifs/scripts/dl_dep.sh

+1 −1
Original line number Diff line number Diff line
@@ -195,7 +195,7 @@ if [ "${NA_LAYER}" == "ofi" ] || [ "${NA_LAYER}" == "all" ]; then 
    fi

fi

# get Mercury

clonedeps "mercury" "https://github.com/mercury-hpc/mercury" "8e998d251d3d8cda34a833286cb87da0caf4765a"  "--recurse-submodules" &

clonedeps "mercury" "https://github.com/mercury-hpc/mercury" "0de22781cd08931416aba8050c5a6647c23abcb9"  "--recurse-submodules" &

# get Argobots

wgetdeps "argobots" "https://github.com/pmodels/argobots/archive/v1.0rc1.tar.gz" &

# get Margo

ifs/src/preload/preload_util.cpp

+1 −5
Original line number Diff line number Diff line
@@ -261,11 +261,7 @@ margo_create_wrap_helper(const hg_id_t rpc_id, uint64_t recipient, hg_handle_t& 
        CTX->log()->error("{}() server address not resolvable for host id {}", __func__, recipient);

        return HG_OTHER_ERROR;

    }

    // TODO The following is a work around until https://xgitlab.cels.anl.gov/sds/margo/issues/47 is fixed

    if (recipient == CTX->fs_conf()->host_id)

    ret = margo_create(ld_margo_rpc_id, svr_addr, rpc_id, &handle);

    else

        ret = margo_create_cache(ld_margo_rpc_id, svr_addr, rpc_id, &handle);

    if (ret != HG_SUCCESS) {

        CTX->log()->error("{}() creating handle FAILED", __func__);

        return HG_OTHER_ERROR;