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

Removing untested clusters from dependency scripts

parent 99e3706f

scripts/compile_dep.sh

+3 −26
Original line number Diff line number Diff line 
#!/bin/bash



MOGON1_DEPS=( 

    "zstd" "lz4" "snappy" "bmi" "libfabric" "mercury" "argobots" "margo" 

    "rocksdb" "syscall_intercept date"

)



MOGON2_DEPS=(

    "zstd" "lz4" "snappy" "bmi" "mercury" "argobots" "margo" "rocksdb" 

    "syscall_intercept date"

)



FH2_DEPS=(

    "zstd" "lz4" "snappy" "bmi" "libfabric" "mercury" "argobots" "margo" 

    "rocksdb" "syscall_intercept date"

)



usage_short() {

	echo "

usage: compile_dep.sh [-h] [-l] [-n <NAPLUGIN>] [-c <CLUSTER>] [-d <DEPENDENCY>] [-j <COMPILE_CORES>]
@@ -42,7 +32,7 @@ optional arguments: 
                defaults to 'all'

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

                additional configurations for specific compute clusters

                supported clusters: {mogon1,mogon2,fh2}

                supported clusters: {mogon2}

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

                build and install a specific dependency. If unspecified 

                all dependencies are built and installed.
@@ -58,13 +48,6 @@ list_dependencies() { 


    echo "Available dependencies: "



    echo -n "  Mogon 1: "

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

    do

        echo -n "$d "

    done

    echo ""



    echo -n "  Mogon 2: "

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

    do
@@ -72,12 +55,6 @@ list_dependencies() { 
    done

    echo ""



    echo -n "  fh2: "

    for d in "${FH2_DEPS[@]}"

    do

        echo -n "$d "

    done

    echo ""

}



prepare_build_dir() {
@@ -191,7 +168,7 @@ else 
    exit

fi

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

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

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

		echo CLUSTER  = "${CLUSTER}"

    else

        echo "${CLUSTER} cluster configuration is invalid. Exiting ..."
@@ -220,7 +197,7 @@ export CPATH="${CPATH}:${INSTALL}/include" 
export LIBRARY_PATH="${LIBRARY_PATH}:${INSTALL}/lib:${INSTALL}/lib64"



# Set cluster dependencies first

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

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



    # compile zstd

    if [[ ( "${DEPENDENCY}" == "" ) || ( "${DEPENDENCY}" == "zstd" ) ]]; then

scripts/dl_dep.sh

+3 −30
Original line number Diff line number Diff line
@@ -10,22 +10,11 @@ CLUSTER="" 
DEPENDENCY=""

NA_LAYER=""



MOGON1_DEPS=( 

    "zstd" "lz4" "snappy" "bmi" "libfabric" "mercury" "argobots" "margo" 

    "rocksdb" "syscall_intercept date"

)



MOGON2_DEPS=(

    "zstd" "lz4" "snappy" "bmi" "mercury" "argobots" "margo" "rocksdb" 

    "syscall_intercept date"

)



FH2_DEPS=(

    "zstd" "lz4" "snappy" "bmi" "libfabric" "mercury" "argobots" "margo" 

    "rocksdb" "syscall_intercept date"

)





# Stop all backround jobs on interruption.

# "kill -- -$$" sends a SIGTERM to the whole process group,

# thus killing also descendants.
@@ -48,13 +37,6 @@ list_dependencies() { 


    echo "Available dependencies: "



    echo -n "  Mogon 1: "

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

    do

        echo -n "$d "

    done

    echo ""



    echo -n "  Mogon 2: "

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

    do
@@ -62,12 +44,6 @@ list_dependencies() { 
    done

    echo ""



    echo -n "  fh2: "

    for d in "${FH2_DEPS[@]}"

    do

        echo -n "$d "

    done

    echo ""

}



clonedeps() {
@@ -147,7 +123,7 @@ optional arguments: 
                                defaults to 'all'

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

                                additional configurations for specific compute clusters

                                supported clusters: {mogon1,mogon2,fh2}

                                supported clusters: {mogon2}

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

                                download a specific dependency. If unspecified 

                                all dependencies are built and installed.
@@ -219,7 +195,7 @@ else 
    exit

fi

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

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

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

		echo CLUSTER  = "${CLUSTER}"

    else

        echo "${CLUSTER} cluster configuration is invalid. Exiting ..."
@@ -235,7 +211,7 @@ echo "Source path is set to \"${SOURCE}\"" 
mkdir -p ${SOURCE}



# get cluster dependencies

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

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



    # get zstd for fast compression in rocksdb

    if [[ ( "${DEPENDENCY}" == "" ) || ( "${DEPENDENCY}" == "zstd" ) ]]; then
@@ -252,9 +228,6 @@ if [[ ( "${CLUSTER}" == "mogon1" ) || ( "${CLUSTER}" == "mogon2" ) || ( "${CLUST 
            wgetdeps "snappy" "https://github.com/google/snappy/archive/1.1.7.tar.gz" &

    fi

fi

#if [ "${CLUSTER}" == "fh2" ]; then

	# no distinct 3rd party software needed as of now.

#fi



# get BMI

if [[ ( "${DEPENDENCY}" == "" ) || ( "${DEPENDENCY}" == "bmi" ) ]]; then