Commit 2d1e4b97 authored by incardon's avatar incardon

Adding lib m for intel compilation

parent aa8e5160
......@@ -394,8 +394,8 @@ else
done
if [ x"$inst_lin_alg" == x"y" ]; then
./script/install_EIGEN.sh $i_dir $ncore
./script/install_PETSC.sh $i_dir $ncore $CC $CXX $F77 $FC
CXX="$CXX" CC="$CC" FC="$FC" F77="$F77" ./script/install_EIGEN.sh $i_dir $ncore
CXX="$CXX" CC="$CC" FC="$FC" F77="$F77" ./script/install_PETSC.sh $i_dir $ncore $CC $CXX $F77 $FC
fi
### collect PETSC configuration options
......
openfpm_data @ f2155a8f
Subproject commit 98254b90ea298be282e62fc25ef69ee942a60d67
Subproject commit f2155a8fbf4d7f2a7787dc08861dca8f2d72093e
......@@ -7,7 +7,7 @@ if [ -d "$1/EIGEN" ]; then
exit 0
fi
./script/install_OPENBLAS.sh $1 $2
CXX="$CXX" CC="$CC" FC="$FC" F77="$F77" ./script/install_OPENBLAS.sh $1 $2
if [ ! -d "$1/OPENBLAS" ]; then
exit 1
fi
......
......@@ -86,7 +86,7 @@ fi
### are compiled without optimization enabled, so we provide manual installation for that packages
if [ ! -d "$1/OPENBLAS" ]; then
./script/install_OPENBLAS.sh $1
CXX="$CXX" CC="$CC" FC="$FC" F77="$F77" ./script/install_OPENBLAS.sh $1
if [ $? -eq 0 ]; then
configure_options="$configure_options --with-blas-lib=$1/OPENBLAS/lib/libopenblas.a --with-lapack-lib=$1/OPENBLAS/lib/libopenblas.a"
fi
......
......@@ -9,10 +9,14 @@ function set_mpi()
configure_options="$configure_options CXX=mpic++ "
fi
else
if [ $call_test_working_mpi_options -eq 1 ]; then
test_working_mpi_options
if [ x"$platform" == x"cygwin" ]; then
echo "We do not support installation of OpenMPI on cygwin, we assume has been preinstalled"
else
if [ $call_test_working_mpi_options -eq 1 ]; then
test_working_mpi_options
fi
./script/install_MPI.sh $1 $2 $3 $4 $5 $6 $7 "$openmpi_working_options"
fi
./script/install_MPI.sh $1 $2 $3 $4 $5 $6 $7 "$openmpi_working_options"
MPI_installed=1
export PATH="$1/MPI/bin:$PATH"
configure_options="$configure_options CXX=mpic++ --with-mpivendor=openmpi"
......
......@@ -70,6 +70,7 @@ endif()
# will also build with -std=c++11
target_compile_features(pdata PUBLIC cxx_std_11)
target_link_libraries(pdata ${MPI_C_LIBRARIES})
target_link_libraries(pdata m)
install(FILES Decomposition/CartDecomposition.hpp
Decomposition/shift_vect_converter.hpp
......
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