Verified Commit 8d69ae7a authored by Marc Vef's avatar Marc Vef
Browse files

Adding verbs support to scripts, Add mogon1 preset

parent 9ceaca59

scripts/compile_dep.sh

+20 −4
Original line number Diff line number Diff line
@@ -9,7 +9,12 @@ SOURCE="" 
INSTALL=""

DEP_CONFIG=""



VALID_DEP_OPTIONS="mogon2 direct all"

VALID_DEP_OPTIONS="mogon2 mogon1 direct all"



MOGON1_DEPS=(

    "zstd" "lz4" "snappy" "capstone" "ofi" "mercury" "argobots" "margo" "rocksdb"

    "syscall_intercept" "date" "verbs"

)



MOGON2_DEPS=(

    "zstd" "lz4" "snappy" "capstone" "ofi" "mercury" "argobots" "margo" "rocksdb"
@@ -52,7 +57,7 @@ optional arguments: 
                defaults to 'all'

    -c <CONFIG>, --config <CONFIG>

                allows additional configurations, e.g., for specific clusters

                supported values: {mogon2, direct, all}

                supported values: {mogon1, mogon2, direct, all}

                defaults to 'direct'

    -d <DEPENDENCY>, --dependency <DEPENDENCY>

                download a specific dependency and ignore --config setting. If unspecified
@@ -69,6 +74,10 @@ list_dependencies() { 


    echo "Available dependencies: "



    echo -n "  Mogon 1: "

    for d in "${MOGON1_DEPS[@]}"; do

        echo -n "$d "

    done

    echo -n "  Mogon 2: "

    for d in "${MOGON2_DEPS[@]}"; do

        echo -n "$d "
@@ -94,7 +103,6 @@ check_dependency() { 
      if echo "${DEPENDENCY}" | grep -q "${DEP}"; then

        return

      fi

#      [[ "${DEPENDENCY}" == "${DEP}" ]] && return

  else

      # if not check if dependency is part of dependency config

      for e in "${DEP_CONFIG[@]}"; do
@@ -217,6 +225,10 @@ else 
fi

# enable predefined dependency template

case ${TMP_DEP_CONF} in

mogon1)

  DEP_CONFIG=("${MOGON1_DEPS[@]}")

  echo "'Mogon1' dependencies are compiled"

  ;;

mogon2)

  DEP_CONFIG=("${MOGON2_DEPS[@]}")

  echo "'Mogon2' dependencies are compiled"
@@ -320,7 +332,11 @@ if check_dependency "ofi" "${DEP_CONFIG[@]}"; then 
        CURR=${SOURCE}/libfabric

        prepare_build_dir ${CURR}

        cd ${CURR}/build

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

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

        if check_dependency "verbs" "${DEP_CONFIG[@]}"; then

            OFI_CONFIG="${OFI_CONFIG} --enable-verbs=yes"

        fi

         ${OFI_CONFIG}

        make -j${CORES}

        make install

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

scripts/dl_dep.sh

+23 −4
Original line number Diff line number Diff line
@@ -9,7 +9,12 @@ NA_LAYER="" 
DEP_CONFIG=""

VERBOSE=false



VALID_DEP_OPTIONS="mogon2 direct all"

VALID_DEP_OPTIONS="mogon2 mogon1 direct all"



MOGON1_DEPS=(

    "zstd" "lz4" "snappy" "capstone" "ofi-verbs" "mercury" "argobots" "margo" "rocksdb"

    "syscall_intercept" "date"

)



MOGON2_DEPS=(

    "zstd" "lz4" "snappy" "capstone" "ofi" "mercury" "argobots" "margo" "rocksdb"
@@ -48,6 +53,10 @@ list_dependencies() { 


    echo "Available dependencies: "



    echo -n "  Mogon 1: "

    for d in "${MOGON1_DEPS[@]}"; do

        echo -n "$d "

    done

    echo -n "  Mogon 2: "

    for d in "${MOGON2_DEPS[@]}"; do

        echo -n "$d "
@@ -248,6 +257,10 @@ fi 


# enable predefined dependency template

case ${TMP_DEP_CONF} in

mogon1)

  DEP_CONFIG=("${MOGON1_DEPS[@]}")

  [[ -z "${DEPENDENCY}" ]] && echo "'Mogon1' dependencies are downloaded"

  ;;

mogon2)

  DEP_CONFIG=("${MOGON2_DEPS[@]}")

  [[ -z "${DEPENDENCY}" ]] && echo "'Mogon2' dependencies are downloaded"
@@ -308,8 +321,14 @@ if check_dependency "bmi" "${DEP_CONFIG[@]}"; then 
fi



# get libfabric

if check_dependency "ofi" "${DEP_CONFIG[@]}"; then

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

    if check_dependency "ofi-experimental" "${DEP_CONFIG[@]}"; then

        wgetdeps "libfabric" "https://github.com/ofiwg/libfabric/releases/download/v1.9.1/libfabric-1.9.1.tar.bz2" &

    elif check_dependency "ofi-verbs" "${DEP_CONFIG[@]}"; then

        # libibverbs 1.2.1-1 used on mogon 1i (installed on system) which is linked to libfabric

        # libfabric 1.8 random RPCs fail to be send. 1.9 RPC client cannot be started when in an MPI environment

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

    elif check_dependency "ofi" "${DEP_CONFIG[@]}"; then

        wgetdeps "libfabric" "https://github.com/ofiwg/libfabric/releases/download/v1.8.1/libfabric-1.8.1.tar.bz2" &

    fi

fi