Verified Commit 4d75b40f authored by Marc Vef's avatar Marc Vef
Browse files

Updating scripts for psm2. Version bumps to Mercury, Margo to March 2020

parent dad26735

hermes @ 0af45bfa

Compare a25a82d4 to 0af45bfa
Original line number Diff line number Diff line 
Subproject commit a25a82d401b4a0d986088c6802a08fd79185a278
 
Subproject commit 0af45bfa667f7ff9c78167ef94d975bffbd879f0

scripts/compile_dep.sh

+5 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ MOGON1_DEPS=( 


MOGON2_DEPS=(

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

    "syscall_intercept" "date"

    "syscall_intercept" "date" "psm2"

)



DIRECT_DEPS=(
@@ -337,6 +337,10 @@ if check_dependency "ofi" "${DEP_CONFIG[@]}"; then 
        OFI_CONFIG="../configure --prefix=${INSTALL} --enable-tcp=yes"

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

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

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

            OFI_CONFIG="${OFI_CONFIG} --enable-psm2=yes --with-psm2-src=${SOURCE}/psm2"

        elif check_dependency "psm2-system" "${DEP_CONFIG[@]}"; then

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

        fi

         ${OFI_CONFIG}

        make -j${CORES}

scripts/dl_dep.sh

+6 −3
Original line number Diff line number Diff line
@@ -82,7 +82,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
@@ -333,9 +332,13 @@ if [ "${NA_LAYER}" == "ofi" ] || [ "${NA_LAYER}" == "all" ]; then 
    fi

fi



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

    wgetdeps "psm2" "https://github.com/intel/opa-psm2/archive/PSM2_11.2.86.tar.gz" &

fi



# get Mercury

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

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

    clonedeps "mercury" "https://github.com/mercury-hpc/mercury" "41caa143a07ed179a3149cac4af0dc7aa3f946fd" "--recurse-submodules" &

fi



# get Argobots
@@ -345,7 +348,7 @@ fi 


# get Margo

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

    clonedeps "margo" "https://xgitlab.cels.anl.gov/sds/margo.git" "016dbdce22da3fe4f97b46c20a53bced9370a217" &

    clonedeps "margo" "https://xgitlab.cels.anl.gov/sds/margo.git" "v0.6.3" &

fi



# get rocksdb