Commit 062ceb34 authored by incardon's avatar incardon

Fixing Master

parent c13482b1
......@@ -23,19 +23,26 @@ fi
mkdir openfpm_numerics/src/config
if [ "$2" == "gin" ]
then
echo "Compiling on gin\n"
echo "1" >> input_install
echo "1" >> input_install
echo "12" >> input_install
echo "y" >> input_install
source ~/.bashrc
module load gcc/4.9.2
mkdir $HOME/$5
if [ x"$4" == x"full" ]; then
./install -i $HOME/$5 -s -c "--prefix=/home/jenkins/openfpm_install"
./install -i $HOME/$5 -s -c "--prefix=/home/jenkins/openfpm_install" < input_install
elif [ x"$3" == x"numerics" ]; then
./install -i $HOME/$5 -m -s -c "--prefix=/home/jenkins/openfpm_install"
./install -i $HOME/$5 -m -s -c "--prefix=/home/jenkins/openfpm_install" < input_install
make $3
else
./install -i $HOME/$5 -m -s -c "--prefix=/home/jenkins/openfpm_install --no-recursion"
./install -i $HOME/$5 -m -s -c "--prefix=/home/jenkins/openfpm_install --no-recursion" < input_install
make $3
fi
if [ $? -ne 0 ]; then
......@@ -50,30 +57,15 @@ then
exit 1 ;
fi
elif [ "$2" == "wetcluster" ]
then
echo "Compiling on wetcluster"
## produce the module path
source ~/.bashrc
module load gcc/4.9.2
module load openmpi/1.8.1
module load boost/1.54.0
sh ./autogen.sh
./install -m -s -c "--with-boost=/sw/apps/boost/1.54.0/ CXX=mpic++ --no-recursion"
make $3
if [ $? -ne 0 ]; then
curl -X POST --data "payload={\"icon_emoji\": \":jenkins:\", \"username\": \"jenkins\" , \"attachments\":[{ \"title\":\"Error:\", \"color\": \"#FF0000\", \"text\":\"$2 failed to complete the openfpm_pdata test \" }] }" https://hooks.slack.com/services/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
exit 1 ;
fi
elif [ "$2" == "taurus" ]
then
echo "Compiling on taurus"
echo "1" >> input_install
echo "1" >> input_install
echo "24" >> input_install
echo "y" >> input_install
source /etc/profile
echo "$PATH"
module load eigen/3.2.0
......@@ -86,7 +78,7 @@ then
export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/home/incard/PARMETIS/lib:/home/incard/METIS/lib:/home/incard/HDF5/lib"
mkdir /scratch/p_ppm/$5
./install -m -i "/scratch/p_ppm/$5" -s -c"CXX=mpic++ --no-recursion"
./install -m -i "/scratch/p_ppm/$5" -s -c"CXX=mpic++ --no-recursion" < input_install
make $3
source $HOME/openfpm_vars
......@@ -99,14 +91,19 @@ else
echo "Compiling general"
source ~/.bashrc
echo "1" >> input_install
echo "1" >> input_install
echo "4" >> input_install
echo "y" >> input_install
mkdir $HOME/$5
if [ x"$4" == x"full" ]; then
./install -i $HOME/$5 -s -c "--prefix=/Users/jenkins/openfpm_install"
./install -i $HOME/$5 -s -c "--prefix=/Users/jenkins/openfpm_install" < input_install
elif [ x"$3" == x"numerics" ]; then
./install -i $HOME/$5 -m -s -c "--prefix=/home/jenkins/openfpm_install"
./install -i $HOME/$5 -m -s -c "--prefix=/home/jenkins/openfpm_install" < input_install
make $3
else
./install -i $HOME/$5 -m -s -c "--prefix=/Users/jenkins/openfpm_install --no-recursion"
./install -i $HOME/$5 -m -s -c "--prefix=/Users/jenkins/openfpm_install --no-recursion" < input_install
make $3
fi
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment