Commit 4d5cb9d1 authored by Marc Vef's avatar Marc Vef
Browse files

added fh2 to clone and compile scripts

parent 7e32d5f9

ifs/scripts/clone_dep.sh

+6 −3
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ usage() { 
    echo "Usage:

    ./clone_dep [ clone_path ] [ NA_Plugin ]

    Valid NA_Plugin arguments: {bmi,cci,ofi,all}

    Valid cluster arguments: {mogon1}"

    Valid cluster arguments: {mogon1,fh2}"

}



if [[ ( -z ${1+x} ) || ( -z ${2+x} ) ]]; then
@@ -74,7 +74,7 @@ else 
    exit

fi

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

    if [ "$CLUSTER" == "mogon1" ]; then

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

        echo "$CLUSTER cluster configuration selected"

    else

        echo "$CLUSTER cluster configuration is invalid. Exiting ..."
@@ -91,7 +91,7 @@ echo "Cloning output is logged at /tmp/adafs_clone.log" 
mkdir -p $GIT



# get cluster dependencies

if [ "$CLUSTER" == "mogon1" ]; then

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

    # get libtool for cci

    wgetdeps "libtool" "http://ftpmirror.gnu.org/libtool/libtool-2.4.6.tar.gz"

    # get libev for mercury
@@ -105,6 +105,9 @@ if [ "$CLUSTER" == "mogon1" ]; then 
	# get snappy for rocksdb

    wgetdeps "snappy" "https://github.com/google/snappy/archive/1.1.7.tar.gz"

fi

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

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

#fi



# get BMI

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

ifs/scripts/compile_dep.sh

+6 −9
Original line number Diff line number Diff line
@@ -3,9 +3,10 @@ 
usage() {



    echo "Usage:

    ./compile_dep [ clone_path ] [ install_path ] [ na_plugin ] [ cluster ]

	./compile_dep [ clone_path ] [ install_path ] [ na_plugin ] [ cluster ] [ compile_cores (optional) ]

    Valid na_plugin arguments: {bmi,cci,ofi,all}

    Valid cluster arguments: {mogon1}"

    Valid cluster arguments: {mogon1,fh2}

	Valid compile_cores arguments: numeric > 0; defaults to processor count of node"

}



prepare_build_dir() {
@@ -26,6 +27,7 @@ if [[ ! (-z ${4+x} ) ]]; then 
    CLUSTER=$4

fi





#LOG=/tmp/adafs_install.log

#echo "" &> $LOG

GIT=$1
@@ -46,7 +48,7 @@ else 
fi



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

    if [ "$CLUSTER" == "mogon1" ]; then

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

        echo "$CLUSTER cluster configuration selected"

    else

        echo "$CLUSTER cluster configuration is invalid. Exiting ..."
@@ -65,12 +67,7 @@ echo "Install path is set to '$2'"; 
mkdir -p $GIT



# Set cluster dependencies first

if [ "$CLUSTER" == "mogon1" ]; then

	# Make sure these modules are enabled

    #module load devel/CMake/3.8.0 || exit 1

    #module load mpi/OpenMPI/2.0.2-GCC-6.3.0 || exit 1

    #module load devel/Boost/1.63.0-foss-2017a || exit 1 # because of mercury

    echo "Done"

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

    # get libtool

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

    CURR=$GIT/libtool