Commit c3524a46 authored by Marc Vef's avatar Marc Vef
Browse files

Version bump for dependency script and added mogon2 config for compile scripts

parent d438fa2e

ifs/scripts/compile_dep.sh

+17 −14
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ optional arguments: 
				defaults to 'all'

	-c <CLUSTER>, --cluster <CLUSTER>

				additional configurations for specific compute clusters

				supported clusters: {mogon1,fh2}

				supported clusters: {mogon1,mogon2,fh2}

	-j <COMPILE_CORES>, --compilecores <COMPILE_CORES>

				number of cores that are used to compile the depdencies

				defaults to number of available cores
@@ -115,7 +115,7 @@ else 
    exit

fi

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

	if [[ ( "${CLUSTER}" == "mogon1" ) || ( "${CLUSTER}" == "fh2" ) ]]; then

	if [[ ( "${CLUSTER}" == "mogon1" ) || ( "${CLUSTER}" == "fh2" ) || ( "${CLUSTER}" == "mogon2" ) ]]; then

		echo CLUSTER  = "${CLUSTER}"

    else

        echo "${CLUSTER} cluster configuration is invalid. Exiting ..."
@@ -138,7 +138,7 @@ echo "Install path = '$2'"; 
mkdir -p ${SOURCE}



# Set cluster dependencies first

if [[ ( "${CLUSTER}" == "mogon1" ) || ( "${CLUSTER}" == "fh2" ) ]]; then

if [[ ( "${CLUSTER}" == "mogon1" ) || ( "${CLUSTER}" == "fh2" ) || ( "${CLUSTER}" == "mogon2" ) ]]; then

    # get libtool

    echo "############################################################ Installing:  libtool"

    CURR=${SOURCE}/libtool
@@ -223,6 +223,8 @@ fi 


if [ "$NA_LAYER" == "ofi" ] || [ "$NA_LAYER" == "all" ]; then

    USE_OFI="-DNA_USE_OFI:BOOL=ON"

    # Mogon2 already has libfabric installed in a version that Mercury supports.

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

        echo "############################################################ Installing:  LibFabric"

        #libfabric

        CURR=${SOURCE}/libfabric
@@ -235,6 +237,7 @@ if [ "$NA_LAYER" == "ofi" ] || [ "$NA_LAYER" == "all" ]; then 
        make install || exit 1

        make check || exit 1

    fi

fi



echo "############################################################ Installing:  Mercury"

ifs/scripts/dl_dep.sh

+5 −10
Original line number Diff line number Diff line
@@ -171,22 +171,17 @@ if [ "${NA_LAYER}" == "cci" ] || [ "${NA_LAYER}" == "all" ]; then 
fi

# get libfabric

if [ "${NA_LAYER}" == "ofi" ] || [ "${NA_LAYER}" == "all" ]; then

    clonedeps "libfabric" "git clone https://github.com/ofiwg/libfabric" "tags/v1.5.2"

    clonedeps "libfabric" "git clone https://github.com/ofiwg/libfabric" "tags/v1.5.3"

fi

# get Mercury

clonedeps "mercury" "git clone --recurse-submodules https://github.com/mercury-hpc/mercury" "2a7369db11c7d9e962a8d59f1852a04c4ff57694"

clonedeps "mercury" "git clone --recurse-submodules https://github.com/mercury-hpc/mercury" "6c82baf7819a553b6b8235fbe7c180989a1e17fe"

# get Argobots

clonedeps "argobots" "git clone -b dev-get-dev-basic https://github.com/carns/argobots.git" "fd6ae0f4613187a2c73fceee8a2718d54719bcab"

clonedeps "argobots" "git clone -b dev-get-dev-basic https://github.com/carns/argobots.git" "78ceea28ed44faca12cf8ea7f5687b894c66a8c4"

# get Argobots-snoozer

clonedeps "abt-snoozer" "git clone https://xgitlab.cels.anl.gov/sds/abt-snoozer.git" "3d9240eda290bfb89f08a5673cebd888194a4bd7"

# get Margo

clonedeps "margo" "git clone https://xgitlab.cels.anl.gov/sds/margo.git" "30521c87a5d6b531b894877f40f0f34ef8ecd541"

clonedeps "margo" "git clone https://xgitlab.cels.anl.gov/sds/margo.git" "3f9fe3a13392af1ba6df1b3d3bb16503da6b627d"

# get rocksdb

clonedeps "rocksdb" "git clone https://github.com/facebook/rocksdb" "tags/v5.8"



# Commit values used before 17.01.2018

# Mercury: afd70055d21a6df2faefe38d5f6ce1ae11f365a5

# Argobots: a5a6b2036c75ad05804ccb72d2fe31cea1bfef88

# Margo: 68ef7f14178e9066cf38846d90d451e00aaca61d

clonedeps "rocksdb" "git clone https://github.com/facebook/rocksdb" "tags/v5.10.2"



echo "Nothing left to do. Exiting."

ifs/src/preload/preload.cpp

+1 −0
Original line number Diff line number Diff line
@@ -141,6 +141,7 @@ bool init_margo_client(Margo_mode mode, const string na_plugin) { 
    // Init Mercury layer (must be finalized when finished)

    hg_class_t* hg_class;

    hg_context_t* hg_context;

    // Note: localhost should not be required and actually doesn't do anything. But it is required for OFI for Mercury to start

    hg_class = HG_Init((na_plugin + "://localhost"s).c_str(), HG_FALSE);

    if (hg_class == nullptr) {

        ld_logger->error("{}() HG_Init() Failed to init Mercury client layer", __func__);