Verified Commit 701fa50e authored by Tommaso Tocci's avatar Tommaso Tocci
Browse files

tmp

parent 41ebc748

ifs/CMakeLists.txt

+1 −1
Original line number Diff line number Diff line
@@ -114,7 +114,7 @@ if(USE_BMI) 
    add_definitions(-DRPC_PROTOCOL="bmi+tcp")

endif()



if (NOT USE_OFI_VERBS AND NOT USE_OFI_PSM2 AND NOT USE_CCI AND NOT USE_BMI)

if (NOT USE_OFI_VERBS AND NOT USE_OFI_PSM2 AND NOT USE_CCI AND NOT USE_BMI AND NOT USE_OFI_TCP)

    message("* No Mercury NA plugin selected. BMI automatically selected ... Use -DUSE_{BMI,CCI,OFI_VERBS,OFI_PSM2}:BOOL=ON for other plugins")

    find_package(BMI REQUIRED)

    set(NA_LIB

ifs/include/preload/preload_context.hpp

+0 −6
Original line number Diff line number Diff line
@@ -6,7 +6,6 @@ 
#include <memory>

#include <vector>

#include <string>

#include <margo.h>



/* Forward declarations */

class OpenFileMap;
@@ -52,9 +51,6 @@ class PreloadContext { 
    std::shared_ptr<Distributor> distributor_;

    std::shared_ptr<FsConfig> fs_conf_;



    //Remove from here

    std::map<uint64_t, hg_addr_t> rpc_addresses_;



    std::string cwd_;

    std::vector<std::string> mountdir_components_;

    std::string mountdir_;
@@ -93,8 +89,6 @@ class PreloadContext { 


    void initialized(const bool& flag);

    bool initialized() const;



    std::map<uint64_t, hg_addr_t>& rpc_addresses();

};

ifs/scripts/compile_dep.sh

+1 −3
Original line number Diff line number Diff line
@@ -258,10 +258,8 @@ if [ "$NA_LAYER" == "ofi" ] || [ "$NA_LAYER" == "all" ]; then 
        #libfabric

        CURR=${SOURCE}/libfabric

        prepare_build_dir ${CURR}

        cd ${CURR}

        ./autogen.sh

        cd ${CURR}/build

        ../configure --prefix=${INSTALL}

        ../configure --prefix=${INSTALL} --enable-tcp=yes

        make -j${CORES}

        make install

        [ "${PERFORM_TEST}" ] && make check

ifs/scripts/dl_dep.sh

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

    # No need to get libfabric for mogon2 as it is already installed

    if [[ ("${CLUSTER}" != "mogon2") ]]; then

        wgetdeps "libfabric" "https://github.com/ofiwg/libfabric/archive/v1.6.0.tar.gz" &

        wgetdeps "libfabric" "https://github.com/ofiwg/libfabric/releases/download/v1.6.2/libfabric-1.6.2.tar.gz" &

    fi

fi

# get Mercury

ifs/src/daemon/adafs_daemon.cpp

+4 −3
Original line number Diff line number Diff line
@@ -158,11 +158,12 @@ bool init_rpc_server() { 
    hg_size_t addr_self_cstring_sz = 128;

    char addr_self_cstring[128];

    ADAFS_DATA->spdlogger()->debug("{}() Initializing Margo RPC server...", __func__);

    // Start Margo (this will also initialize Argobots and Mercury internally)

    struct hg_init_info hg_options;

    hg_options.auto_sm = HG_FALSE;

    // IMPORTANT: this struct needs to be zeroed before use

    struct hg_init_info hg_options = {};

    hg_options.auto_sm = HG_TRUE;

    hg_options.stats = HG_FALSE;

    hg_options.na_class = nullptr;

    // Start Margo (this will also initialize Argobots and Mercury internally)

    auto mid = margo_init_info(protocol_port.c_str(), MARGO_SERVER_MODE, &hg_options, 1, DAEMON_RPC_HANDLER_XSTREAMS);

    if (mid == MARGO_INSTANCE_NULL) {

        ADAFS_DATA->spdlogger()->error("{}() margo_init failed to initialize the Margo RPC server", __func__);