...
 
Commits (5)
......@@ -522,7 +522,7 @@ else
installation_report="$installation_report \033[91;1mHYPRE\033[0m Installed: \033[1m NO \033[0m\n"
fi
bash_path="$bash_path$PATH\""
bash_path="$bash_path\$PATH\""
bash_library="$bash_library\""
##### Writing openfpm_vars file
......
#! /bin/bash
function haveProg() {
[ -x "$(command -v $1)" ]
}
function gpp_clang()
{
if [ x"$dgc_compiler" == x"g++" ]; then
......@@ -15,12 +19,10 @@ function gpp_clang()
fi
}
function detect_compiler()
{
gpp_found=0
icpc_found=0
dgc_ret=0
if [ x"$CXX" != x"" -o x"$CC" != x"" -o x"$F77" != x"" -o x"$FC" != x"" ]; then
......@@ -64,11 +66,10 @@ function detect_compiler()
fi
# First we try to understand if g++ command line is linked to clang
g++ --version | grep "Apple LLVM"
if [ $? == 0 ]; then
echo "Apple LLVM based g++"
if haveProg g++; then
g++ --version | grep "Apple LLVM" >/dev/null 2>&1
if [ $? == 0 ]; then
echo "Apple LLVM based g++"
# we try the detect the version
......@@ -105,13 +106,13 @@ function detect_compiler()
dgc_ret=1
gpp_found=1
fi
else
dgc_ret=2
else
dgc_ret=2
fi
fi
fi
g++ --version | grep g++
if [ $? == 0 -a x"g++" == x"g++" ]; then
g++ --version | grep "g++" > /dev/null 2>&1
if [ $? == 0 -a $gpp_found -ne 1 ]; then
dgc_major=$(g++ --version | grep g++ | sed 's/.*\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\).*/\1/g')
dgc_middle=$(g++ --version | grep g++ | sed 's/.*\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\).*/\2/g')
dgc_minor=$(g++ --version | grep g++ | sed 's/.*\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\).*/\3/g')
......@@ -144,10 +145,10 @@ function detect_compiler()
dgc_ret=0
gpp_found=0
fi
fi
fi
g++ --version | grep g++
if [ $? == 0 -a x"g++" == x"clang" ]; then
g++ --version | grep "clang" > /dev/null 2>&1
if [ $? == 0 $gpp_found -ne 1 ]; then
dgc_major=$(g++ --version | grep g++ | sed 's/.*\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\).*/\1/g')
dgc_middle=$(g++ --version | grep g++ | sed 's/.*\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\).*/\2/g')
dgc_minor=$(g++ --version | grep g++ | sed 's/.*\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\).*/\3/g')
......@@ -176,10 +177,12 @@ function detect_compiler()
dgc_ret=0
gpp_found=0
fi
fi
fi
icpc --version | grep icpc
if [ $? == 0 -a x"icpc" == x"icpc" ]; then
if haveProg icpc; then
icpc --version | grep icpc > /dev/null 2>&1
if [ $? == 0 ]; then
dgc_major=$(icpc --version | grep icpc | sed 's/.*\([0-9][0-9]\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\).*/\1/g')
dgc_middle=$(icpc --version | grep icpc | sed 's/.*\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\).*/\2/g')
dgc_minor=$(icpc --version | grep icpc | sed 's/.*\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\).*/\3/g')
......@@ -204,6 +207,7 @@ function detect_compiler()
dgc_ret=1
icpc_found=1
fi
fi
fi
### If we detect more than one valid compiler ask to choose
......
......@@ -17,7 +17,7 @@ patch -p1 < openblas.diff
# configuration
make CC=gcc CXX=g++
make
mkdir $1/OPENBLAS
make install PREFIX=$1/OPENBLAS
......
......@@ -48,6 +48,7 @@ function update_openfpm()
git stash -u
git submodule foreach 'git stash'
git submodule foreach git pull origin master
git pull origin
git checkout $branch
......
openfpm.mpi-cbg.de/upload/update_0.8
openfpm.mpi-cbg.de/upload/upgrade_0.8