Skip to content

Commit

Permalink
Make threading command line parameter
Browse files Browse the repository at this point in the history
  • Loading branch information
@gassmoeller
gassmoeller committed Mar 19, 2018
1 parent 8975423 commit 791fc24
Showing 1 changed file with 103 additions and 135 deletions.
238 changes: 103 additions & 135 deletions source/main.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -368,9 +368,11 @@ void print_help()
<< std::endl;
std::cout << " optional arguments [args]:"
<< std::endl
<< " --version (for information about library versions)"
<< " -v, --version (for information about library versions)"
<< std::endl
<< " --help (for this usage help)"
<< " -h, --help (for this usage help)"
<< std::endl
<< " -j, --threads (to use multi-threading)"
<< std::endl
<< " --output-xml (print parameters in xml format to standard output and exit)"
<< std::endl
Expand All @@ -380,35 +382,6 @@ void print_help()
}


/**
* Print information about the versions of underlying libraries.
*/
template <class Stream>
void print_version_information(Stream &stream)
{
stream << "Version information of underlying libraries:\n"
<< " . deal.II: "
<< DEAL_II_PACKAGE_VERSION << '\t'
<< " (git revision "
<< DEAL_II_GIT_SHORTREV << ")\n"
#ifndef ASPECT_USE_PETSC
<< " . Trilinos: "
<< DEAL_II_TRILINOS_VERSION_MAJOR << '.'
<< DEAL_II_TRILINOS_VERSION_MINOR << '.'
<< DEAL_II_TRILINOS_VERSION_SUBMINOR << '\n'
#else
<< " . PETSc: "
<< PETSC_VERSION_MAJOR << '.'
<< PETSC_VERSION_MINOR << '.'
<< PETSC_VERSION_SUBMINOR << '\n'
#endif
<< " . p4est: "
<< DEAL_II_P4EST_VERSION_MAJOR << '.'
<< DEAL_II_P4EST_VERSION_MINOR << '.'
<< DEAL_II_P4EST_VERSION_SUBMINOR << '\n'
<< std::endl;
}


// hook into SIGABRT/SIGFPE and kill off the program
void signal_handler(int signal)
Expand Down Expand Up @@ -437,6 +410,41 @@ void signal_handler(int signal)
#endif
}



template<int dim>
void
run_simulator(const std::string &input_as_string,
const bool output_xml,
const bool output_plugin_graph)
{
using namespace dealii;

ParameterHandler prm;
const bool i_am_proc_0 = (Utilities::MPI::this_mpi_process(MPI_COMM_WORLD) == 0);
aspect::Simulator<dim>::declare_parameters(prm);
parse_parameters (input_as_string, prm);

if (output_xml)
{
if (i_am_proc_0)
prm.print_parameters(std::cout, ParameterHandler::XML);
}
else if (output_plugin_graph)
{
aspect::Simulator<2> flow_problem(MPI_COMM_WORLD, prm);
if (i_am_proc_0)
flow_problem.write_plugin_graph (std::cout);
}
else
{
aspect::Simulator<2> flow_problem(MPI_COMM_WORLD, prm);
flow_problem.run();
}
}



int main (int argc, char *argv[])
{
using namespace dealii;
Expand All @@ -452,29 +460,77 @@ int main (int argc, char *argv[])
#endif
#endif

std::string prm_name = "";
bool output_xml = false;
bool output_plugin_graph = false;
bool output_version = false;
bool output_help = false;
bool use_threads = false;
int current_argument = 1;

// Loop over all command line arguments. Handle a number of special ones
// starting with a dash, and then take the first non-special one as the
// name of the input file. We will later check that there are no further
// arguments left after that (though there may be with PETSc, see
// below).
while (current_argument<argc)
{
const std::string arg = argv[current_argument];
++current_argument;
if (arg == "--output-xml")
{
output_xml = true;
}
else if (arg == "--output-plugin-graph")
{
output_plugin_graph = true;
}
else if (arg=="-h" || arg =="--help")
{
output_help = true;
}
else if (arg=="-v" || arg =="--version")
{
output_version = true;
}
else if (arg=="-j" || arg =="--threads")
{
use_threads = true;
}
else
{
// Not a special argument, so we assume that this is the .prm
// filename (or "--"). We can now break out of this loop because
// we are not going to pass arguments passed after the filename
prm_name = arg;
break;
}
}

try
{
// Disable the use of threads. If that is not what you want,
// use numbers::invalid_unsigned_int instead of 1 to use as many threads
// as deemed useful by TBB.
//
// Note: we initialize this class inside the try/catch block and not
// before, so that the destructor of this instance can react if we are
// currently unwinding the stack if an unhandled exception is being
// thrown to avoid MPI deadlocks.
const char *penv = getenv ("DEAL_II_NUM_THREADS");
const unsigned int max_threads = (penv==NULL) ? 1 : numbers::invalid_unsigned_int;

Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, max_threads);
Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, use_threads ? numbers::invalid_unsigned_int : 1);

deallog.depth_console(0);

int current_idx = 1;
const bool i_am_proc_0 = (Utilities::MPI::this_mpi_process(MPI_COMM_WORLD) == 0);

std::string prm_name = "";
bool output_xml = false;
bool output_plugin_graph = false;
if (output_help && i_am_proc_0)
{
print_aspect_header(std::cout);
print_help();
return 0;
}

if (output_version && i_am_proc_0)
{
print_aspect_header(std::cout);
return 0;
}

// We hook into the abort handler on ranks != 0 to avoid an MPI
// deadlock. The deal.II library will call std::abort() when an
Expand All @@ -494,52 +550,6 @@ int main (int argc, char *argv[])
std::signal(SIGFPE, signal_handler);
}

// Loop over all command line arguments. Handle a number of special ones
// starting with a dash, and then take the first non-special one as the
// name of the input file. We will later check that there are no further
// arguments left after that (though there may be with PETSc, see
// below).
while (current_idx<argc)
{
const std::string arg = argv[current_idx];
++current_idx;
if (arg == "--output-xml")
{
output_xml = true;
}
else if (arg == "--output-plugin-graph")
{
output_plugin_graph = true;
}
else if (arg=="-h" || arg =="--help")
{
if (i_am_proc_0)
{
print_aspect_header(std::cout);
print_help();
}
return 0;
}
else if (arg=="-v" || arg =="--version")
{
if (i_am_proc_0)
{
print_aspect_header(std::cout);
print_version_information(std::cout);
}
return 0;
}
else
{
// Not a special argument, so we assume that this is the .prm
// filename (or "--"). We can now break out of this loop because
// we are not going to pass arguments passed after the filename
prm_name = arg;
break;
}
}


// if no parameter given or somebody gave additional parameters,
// show help and exit.
// However, this does not work with PETSc because for PETSc, one
Expand All @@ -548,7 +558,7 @@ int main (int argc, char *argv[])
// MPI_InitFinalize above) does not filter these out.
if ((prm_name == "")
#ifndef ASPECT_USE_PETSC
|| (current_idx < argc)
|| (current_argument < argc)
#endif
)
{
Expand All @@ -566,7 +576,6 @@ int main (int argc, char *argv[])
print_aspect_header(std::cout);
}


// See where to read input from, then do the reading and
// put the contents of the input into a string.
//
Expand Down Expand Up @@ -630,7 +639,6 @@ int main (int argc, char *argv[])
// like "include $ASPECT_SOURCE_DIR/tests/bla.prm" work.
input_as_string = aspect::Utilities::expand_ASPECT_SOURCE_DIR(input_as_string);


// try to determine the dimension we want to work in. the default
// is 2, but if we find a line of the kind "set Dimension = ..."
// then the last such line wins
Expand All @@ -648,61 +656,21 @@ int main (int argc, char *argv[])
// would be nicer if we didn't have to duplicate code, but the
// following needs to be known at compile time whereas the dimensionality
// is only read at run-time
ParameterHandler prm;

switch (dim)
{
case 2:
{
aspect::Simulator<2>::declare_parameters(prm);
parse_parameters (input_as_string, prm);

if (output_xml)
{
if (i_am_proc_0)
prm.print_parameters(std::cout, ParameterHandler::XML);
}
else if (output_plugin_graph)
{
aspect::Simulator<2> flow_problem(MPI_COMM_WORLD, prm);
if (i_am_proc_0)
flow_problem.write_plugin_graph (std::cout);
}
else
{
aspect::Simulator<2> flow_problem(MPI_COMM_WORLD, prm);
flow_problem.run();
}
run_simulator<2>(input_as_string,output_xml,output_plugin_graph);
break;
}

case 3:
{
aspect::Simulator<3>::declare_parameters(prm);
parse_parameters (input_as_string, prm);

if (output_xml)
{
if (i_am_proc_0)
prm.print_parameters(std::cout, ParameterHandler::XML);
}
else if (output_plugin_graph)
{
aspect::Simulator<3> flow_problem(MPI_COMM_WORLD, prm);
if (i_am_proc_0)
flow_problem.write_plugin_graph (std::cout);
}
else
{
aspect::Simulator<3> flow_problem(MPI_COMM_WORLD, prm);
flow_problem.run();
}

run_simulator<3>(input_as_string,output_xml,output_plugin_graph);
break;
}

default:
AssertThrow((dim >= 2) && (dim <= 3),
AssertThrow(false,
ExcMessage ("ASPECT can only be run in 2d and 3d but a "
"different space dimension is given in the parameter file."));
}
Expand Down

0 comments on commit 791fc24

Please sign in to comment.