Verified Commit 0bc9b21a authored by Marc Vef's avatar Marc Vef
Browse files

General version bump

parent 1da7ece4

scripts/compile_dep.sh

+11 −0
Original line number Diff line number Diff line
@@ -372,6 +372,17 @@ if check_dependency "capstone" "${DEP_CONFIG[@]}"; then 
    make -j"${CORES}" install

fi



# build json-c for Margo

if check_dependency "json-c" "${DEP_CONFIG[@]}"; then

    # XXX NOT WORKING

    echo "############################################################ Installing:  json-c"

    CURR=${SOURCE}/json-c

    prepare_build_dir ${CURR}

    cd ${CURR}/build

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

    make -j${CORES} install

fi



# build BMI

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

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

scripts/dl_dep.sh

+13 −8
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ VERBOSE=false 
VALID_DEP_OPTIONS="mogon2 mogon1 ngio direct all ci"



MOGON1_DEPS=(

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

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

    "syscall_intercept" "date"

)
@@ -372,6 +372,11 @@ if check_dependency "capstone" "${DEP_CONFIG[@]}"; then 
    wgetdeps "capstone" "https://github.com/aquynh/capstone/archive/4.0.1.tar.gz" &

fi



# get json-c for Margo

if check_dependency "json-c" "${DEP_CONFIG[@]}"; then

    wgetdeps "json-c" "https://github.com/json-c/json-c/archive/json-c-0.15-20200726.tar.gz" &

fi



## Direct GekkoFS dependencies



# get BMI
@@ -384,7 +389,7 @@ fi 
# get libfabric

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

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

        clonedeps "libfabric" "https://github.com/ofiwg/libfabric.git" "" "-b v1.9.1" &

        clonedeps "libfabric" "https://github.com/ofiwg/libfabric.git" "" "-b v1.11.1" &

    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
@@ -395,29 +400,29 @@ if [ "${NA_LAYER}" == "ofi" ] || [ "${NA_LAYER}" == "all" ]; then 
fi



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

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

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

fi



# get Mercury

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

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

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

fi



# get Argobots

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

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

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

fi



# get Margo

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

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

    clonedeps "margo" "https://github.com/mochi-hpc/mochi-margo" "084b61323933a0e014653eecf8f6b66a94196a2d" &

fi



# get rocksdb

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

    wgetdeps "rocksdb" "https://github.com/facebook/rocksdb/archive/v6.11.4.tar.gz" &

    wgetdeps "rocksdb" "https://github.com/facebook/rocksdb/archive/v6.15.5.tar.gz" &

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

    wgetdeps "rocksdb" "https://github.com/facebook/rocksdb/archive/v6.2.2.tar.gz" &

    wgetdeps "rocksdb" "https://github.com/facebook/rocksdb/archive/v6.11.4.tar.gz" &

fi



# get syscall_intercept