diff --git a/images/Makefile.am b/images/Makefile.am index b20a6f1b1857150dfa5318e1db176bc5b02b3d63..82cc2d598312ae19a610e1e825cdff82e90a5154 100644 --- a/images/Makefile.am +++ b/images/Makefile.am @@ -1,4 +1,3 @@ - LINKLIBS = $(PETSC_LIB) $(METIS_LIB) $(PARMETIS_LIB) $(PTHREAD_LIBS) $(OPT_LIBS) $(BOOST_LDFLAGS) $(BOOST_IOSTREAMS_LIB) $(CUDA_LIBS) noinst_PROGRAMS = cart_dec metis_dec dom_box vector_dist diff --git a/images/vector.cpp b/images/vector.cpp index d824ef400d5ae8de4a74269cb568d75d510cee1e..8ef3a1d60d75b2ecc31ac8d14ab1045c4e5890db 100644 --- a/images/vector.cpp +++ b/images/vector.cpp @@ -55,15 +55,15 @@ int main(int argc, char* argv[]) ++it; } - vd.write("Vector/vector_before_map"); + vd.write("Vector/vector_before_map",CSV_WRITER); vd.map(); - vd.write("Vector/vector_after_map"); + vd.write("Vector/vector_after_map",CSV_WRITER); vd.ghost_get<0>(); - vd.write("Vector/vector_ghost_fill"); + vd.write("Vector/vector_ghost_fill",CSV_WRITER); vd.getDecomposition().write("Vector/vect_decomposition"); diff --git a/install b/install index 37dc06e6a60ad4d1d981f50ddadcd1113341994d..5229ec03dcfad48c6963243acc69ae48d8f40574 100755 --- a/install +++ b/install @@ -158,32 +158,41 @@ fi lin_alg_dir="" lin_alg_lib="" +lin_alg_inc="" if [ -d "$i_dir/PETSC" ]; then configure_options="$configure_options --with-petsc=$i_dir/PETSC " lin_alg_dir="$lin_alg_dir -L$i_dir/PETSC/lib" lin_alg_lib="$lin_alg_lib -lpetsc" + lin_alg_inc="$lin_alg_inc -I$i_dir/PETSC/include" fi if [ -d "$i_dir/HYPRE" ]; then lin_alg_dir="$lin_alg_dir -L$i_dir/HYPRE/lib" + lin_alg_inc="$lin_alg_inc -I$i_dir/HYPRE/include" fi if [ -d "$i_dir/MUMPS" ]; then lin_alg_dir="$lin_alg_dir -L$i_dir/MUMPS/lib" + lin_alg_inc="$lin_alg_inc -I$i_dir/MUMPS/include" fi if [ -d "$i_dir/OPENBLAS" ]; then lin_alg_dir="$lin_alg_dir -L$i_dir/OPENBLAS/lib" lin_alg_lib="$lin_alg_lib -lopenblas" + lin_alg_inc="$lin_alg_inc -I$i_dir/OPENBLAS/include" fi if [ -d "$i_dir/SCALAPACK" ]; then lin_alg_dir="$lin_alg_dir -L$i_dir/SCALAPACK/lib" + lin_alg_inc="$lin_alg_inc -I$i_dir/SCALAPACK/include" fi if [ -d "$i_dir/SUPERLU_DIST" ]; then lin_alg_dir="$lin_alg_dir -L$i_dir/SUPERLU_DIST/lib" + lin_alg_inc="$lin_alg_inc -I$i_dir/SUPERLU_DIST/include" fi if [ -d "$i_dir/TRILINOS" ]; then lin_alg_dir="$lin_alg_dir -L$i_dir/TRILINOS/lib" + lin_alg_inc="$lin_alg_inc -I$i_dir/TRILINOS/include" fi if [ -d "$i_dir/SUITESPARSE" ]; then lin_alg_dir="$lin_alg_dir -L$i_dir/SUITESPARSE/lib" + lin_alg_inc="$lin_alg_inc -I$i_dir/SUITESPARSE/include" lin_alg_lib="$lin_alg_lib -lumfpack -lamd -lbtf -lcamd -lccolamd -lcholmod -lcolamd -lcxsparse -lklu -ldl -lrbio -lspqr -lsuitesparseconfig" fi if [ -d "$i_dir/EIGEN" ]; then @@ -322,10 +331,10 @@ fi ### Create example.mk install_base=$(cat install_dir) -echo "INCLUDE_PATH=-I. -I$install_base/openfpm_numerics/include -I$install_base/openfpm_pdata/include/config -I$install_base/openfpm_pdata/include -I$install_base/openfpm_data/include -I$install_base/openfpm_vcluster/include -I$install_base/openfpm_io/include -I$install_base/openfpm_devices/include -I$i_dir/METIS/include -I$i_dir/PARMETIS/include -I$i_dir/BOOST/include -I$i_dir/HDF5/include" > example.mk +echo "INCLUDE_PATH=-I. -I$install_base/openfpm_numerics/include -I$install_base/openfpm_pdata/include/config -I$install_base/openfpm_pdata/include -I$install_base/openfpm_data/include -I$install_base/openfpm_vcluster/include -I$install_base/openfpm_io/include -I$install_base/openfpm_devices/include -I$i_dir/METIS/include -I$i_dir/PARMETIS/include -I$i_dir/BOOST/include -I$i_dir/HDF5/include $lin_alg_inc" > example.mk echo "LIBS_PATH= -L$install_base/openfpm_devices/lib -L$install_base/openfpm_pdata/lib -L$install_base/openfpm_vcluster/lib -L$i_dir/METIS/lib -L$i_dir/PARMETIS/lib -L$i_dir/BOOST/lib -L$i_dir/HDF5/lib $lin_alg_dir" >> example.mk -echo "LIBS=-lvcluster -lofpm_pdata -lofpmmemory -lparmetis -lmetis -lboost_iostreams -lhdf5 $lin_alg_libs" >> example.mk -echo "LIBS_SE2=-lvcluster -lofpmmemory_se2 -lparmetis -lmetis -lboost_iostreams -lhdf5 $lin_alg_libs" >> example.mk +echo "LIBS=-lvcluster -lofpm_pdata -lofpmmemory -lparmetis -lmetis -lboost_iostreams -lhdf5 $lin_alg_lib" >> example.mk +echo "LIBS_SE2=-lvcluster -lofpmmemory_se2 -lparmetis -lmetis -lboost_iostreams -lhdf5 $lin_alg_lib" >> example.mk cp example.mk src/example.mk cp example.mk example/example.mk