Merge branch 'Release_0.9.0' of git.mpi-cbg.de:openfpm/openfpm_pdata into Release_0.9.0

script/install_PETSC.sh

@@ -19,12 +19,15 @@ discover_os
 
 ##### if we are on osx we use gsed
 
+ldflags_petsc=
 if [ x"$platform" == x"osx" ]; then
   sed_command=gsed
+  ldflags_petsc=LDFLAGS="-lcurl"
 else
   sed_command=sed
 fi
 
+
 ####
 
 ## If some dependencies has been installed feed them to PETSC
@@ -345,9 +348,16 @@ fi
 tar -xf petsc-lite-3.7.6.tar.gz
 cd petsc-3.7.6
 
-echo "./configure COPTFLAGS="-O3 -g" CXXOPTFLAGS="-O3 -g" FOPTFLAGS="-O3 -g" --with-cxx-dialect=C++11 $petsc_openmp  --with-mpi-dir=$mpi_dir $configure_options --with-mumps-lib="$MUMPS_extra_lib"  --prefix=$1/PETSC --with-debugging=0"
+echo "./configure COPTFLAGS="-O3 -g" CXXOPTFLAGS="-O3 -g" FOPTFLAGS="-O3 -g" $ldflags_petsc  --with-cxx-dialect=C++11 $petsc_openmp  --with-mpi-dir=$mpi_dir $configure_options --with-mumps-lib="$MUMPS_extra_lib"  --prefix=$1/PETSC --with-debugging=0"
+
+python_command=python
+# if python2 exist use python2
+command -v python2 >/dev/null
+if [ $? -eq 0 ]; then
+  python_command=python2
+fi
 
-python2 configure COPTFLAGS="-O3 -g" CXXOPTFLAGS="-O3 -g" FOPTFLAGS="-O3 -g"  --with-cxx-dialect=C++11 $petsc_openmp --with-mpi-dir=$mpi_dir $configure_options --with-mumps-lib="$MUMPS_extra_lib" --prefix=$1/PETSC --with-debugging=0
+$python_command configure COPTFLAGS="-O3 -g" CXXOPTFLAGS="-O3 -g" FOPTFLAGS="-O3 -g" $ldflags_petsc  --with-cxx-dialect=C++11 $petsc_openmp --with-mpi-dir=$mpi_dir $configure_options --with-mumps-lib="$MUMPS_extra_lib" --prefix=$1/PETSC --with-debugging=0
 make all test
 make install
 
@@ -355,6 +365,8 @@ make install
 if [ ! "$(ls -A $1/PETSC)" ]; then
    rm -rf $1/PETSC
 else
+   #Mark the installation
+   echo 1 > $1/PETSC/version
    exit 0
 fi
 

script/install_SUITESPARSE.sh

@@ -23,18 +23,18 @@ cd SuiteSparse
 
 # configuration
 
-if [ x"$platform" = x"osx"  ]; then
-    # installation for OSX
+#if [ x"$platform" = x"osx"  ]; then
+#    # installation for OSX
 
 #    sed -i "" -e "s| LAPACK = -llapack|LAPACK = |" SuiteSparse_config/SuiteSparse_config_Mac.mk
 #    sed -i "" -e "s| BLAS = -lopenblas|BLAS = -L"$1"/OPENBLAS/lib -lopenblas|" SuiteSparse_config/SuiteSparse_config_Mac.mk
 
     ### Overwrite SuiteSparse_config.mk
 
-    rm SuiteSparse_config/SuiteSparse_config.mk
-    mv SuiteSparse_config/SuiteSparse_config_Mac.mk SuiteSparse_config/SuiteSparse_config.mk
+#    rm SuiteSparse_config/SuiteSparse_config.mk
+#    mv SuiteSparse_config/SuiteSparse_config_Mac.mk SuiteSparse_config/SuiteSparse_config.mk
 
-else
+#else
     
     # Installation for linux
 
@@ -50,7 +50,7 @@ else
 #      sed -i "/\sBLAS\s=\s\-lopenblas/c\BLAS = -L$1/OPENBLAS/lib -lopenblas -lpthread" SuiteSparse_config/SuiteSparse_config.mk
 #    fi
 
-fi
+#fi
 
 export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$1/OPENBLAS/lib"