Skip to content
Snippets Groups Projects
Commit 4156d785 authored by Pietro Incardona's avatar Pietro Incardona
Browse files

Forcing dependencies MPI compiler

parent 75e2da3c
No related branches found
No related tags found
No related merge requests found
...@@ -117,6 +117,7 @@ with_lapack ...@@ -117,6 +117,7 @@ with_lapack
with_suitesparse with_suitesparse
with_petsc with_petsc
with_eigen with_eigen
with_mpi
enable_gpu enable_gpu
' '
...@@ -483,6 +484,9 @@ do ...@@ -483,6 +484,9 @@ do
mpivendor) mpivendor)
conf_options="$conf_options -DMPI_VENDOR=$ac_optarg" conf_options="$conf_options -DMPI_VENDOR=$ac_optarg"
;; ;;
mpi)
conf_options="$conf_options -DMPI_C_COMPILER=$ac_optarg/bin/mpicc -DMPI_CXX_COMPILER=$ac_optarg/bin/mpic++ -DMPI_Fortran_COMPILER=mpif90"
;;
*) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig" *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig"
ac_unrecognized_sep=', ';; ac_unrecognized_sep=', ';;
esac esac
......
...@@ -233,7 +233,7 @@ int main(int argc, char* argv[]) ...@@ -233,7 +233,7 @@ int main(int argc, char* argv[])
Box<3,double> domain({0.0,0.0},{2.5,2.5,2.5}); Box<3,double> domain({0.0,0.0},{2.5,2.5,2.5});
// grid size // grid size
size_t sz[3] = {256,256,256}; size_t sz[3] = {128,128,128};
// Define periodicity of the grid // Define periodicity of the grid
periodicity<3> bc = {PERIODIC,PERIODIC,PERIODIC}; periodicity<3> bc = {PERIODIC,PERIODIC,PERIODIC};
...@@ -242,7 +242,7 @@ int main(int argc, char* argv[]) ...@@ -242,7 +242,7 @@ int main(int argc, char* argv[])
Ghost<3,long int> g(1); Ghost<3,long int> g(1);
// deltaT // deltaT
double deltaT = 1; double deltaT = 1.0;
// Diffusion constant for specie U // Diffusion constant for specie U
double du = 2*1e-5; double du = 2*1e-5;
...@@ -310,7 +310,7 @@ int main(int argc, char* argv[]) ...@@ -310,7 +310,7 @@ int main(int argc, char* argv[])
for (size_t i = 0; i < timeSteps; ++i) for (size_t i = 0; i < timeSteps; ++i)
{ {
if (i % 300 == 0) if (i % 1 == 0)
std::cout << "STEP: " << i << std::endl; std::cout << "STEP: " << i << std::endl;
/*! /*!
...@@ -375,12 +375,12 @@ int main(int argc, char* argv[]) ...@@ -375,12 +375,12 @@ int main(int argc, char* argv[])
//! \cond [save hdf5] \endcond //! \cond [save hdf5] \endcond
// Every 2000 time step we output the configuration on hdf5 // Every 2000 time step we output the configuration on hdf5
if (i % 2000 == 0) /* if (i % 2000 == 0)
{ {
OldU.save("output_u_" + std::to_string(count)); OldU.save("output_u_" + std::to_string(count));
OldV.save("output_v_" + std::to_string(count)); OldV.save("output_v_" + std::to_string(count));
count++; count++;
} }*/
//! \cond [save hdf5] \endcond //! \cond [save hdf5] \endcond
} }
......
...@@ -112,7 +112,7 @@ ...@@ -112,7 +112,7 @@
#define OPENMPI #define OPENMPI
//! \cond [using_openmpi] \endcond //! \cond [using_openmpi] \endcond
//#define SCAN_WITH_CUB <------ MODERNGPU is broken on RTX use CUB library for scan #define SCAN_WITH_CUB <------ MODERNGPU is broken on RTX use CUB library for scan
//#define EXTERNAL_SET_GPU <----- In case you want to distribute the GPUs differently from the default //#define EXTERNAL_SET_GPU <----- In case you want to distribute the GPUs differently from the default
#include "Vector/vector_dist.hpp" #include "Vector/vector_dist.hpp"
......
...@@ -291,6 +291,10 @@ fi ...@@ -291,6 +291,10 @@ fi
call_test_working_mpi_options=0 call_test_working_mpi_options=0
set_mpi $i_dir $ncore $gpu_support $CC $CXX $F77 $FC set_mpi $i_dir $ncore $gpu_support $CC $CXX $F77 $FC
if [ -d "$i_dir/MPI" ]; then
configure_options=" $configure_options --with-mpi=$i_dir/MPI "
fi
### METIS and ParMETIS must be installed independently from sistem wide installation ### METIS and ParMETIS must be installed independently from sistem wide installation
./script/install_Parmetis.sh $i_dir $ncore ./script/install_Parmetis.sh $i_dir $ncore
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment