Commit 9ea4e8de authored by Thomas Witkowski's avatar Thomas Witkowski
Browse files

Add some more timing information and very small bugfix for sequential compiling.

parent 5133dfb3
...@@ -44,7 +44,7 @@ available_tags=" CXX F77" ...@@ -44,7 +44,7 @@ available_tags=" CXX F77"
# ### BEGIN LIBTOOL CONFIG # ### BEGIN LIBTOOL CONFIG
# Libtool was configured on host deimos102: # Libtool was configured on host p1q024:
# Shell to use when invoking shell scripts. # Shell to use when invoking shell scripts.
SHELL="/bin/sh" SHELL="/bin/sh"
...@@ -6760,7 +6760,7 @@ build_old_libs=`case $build_libtool_libs in yes) $echo no;; *) $echo yes;; esac` ...@@ -6760,7 +6760,7 @@ build_old_libs=`case $build_libtool_libs in yes) $echo no;; *) $echo yes;; esac`
# End: # End:
# ### BEGIN LIBTOOL TAG CONFIG: CXX # ### BEGIN LIBTOOL TAG CONFIG: CXX
# Libtool was configured on host deimos102: # Libtool was configured on host p1q024:
# Shell to use when invoking shell scripts. # Shell to use when invoking shell scripts.
SHELL="/bin/sh" SHELL="/bin/sh"
...@@ -7065,7 +7065,7 @@ include_expsyms="" ...@@ -7065,7 +7065,7 @@ include_expsyms=""
# ### BEGIN LIBTOOL TAG CONFIG: F77 # ### BEGIN LIBTOOL TAG CONFIG: F77
# Libtool was configured on host deimos102: # Libtool was configured on host p1q024:
# Shell to use when invoking shell scripts. # Shell to use when invoking shell scripts.
SHELL="/bin/sh" SHELL="/bin/sh"
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
// //
// See also license.opensource.txt in the distribution. // See also license.opensource.txt in the distribution.
#ifndef HAVE_PARALLEL_DOMAIN_AMDIS #ifdef HAVE_PARALLEL_DOMAIN_AMDIS
#include <mpi.h> #include <mpi.h>
#endif #endif
......
...@@ -570,6 +570,7 @@ namespace AMDiS { ...@@ -570,6 +570,7 @@ namespace AMDiS {
} }
#ifdef HAVE_PARALLEL_DOMAIN_AMDIS #ifdef HAVE_PARALLEL_DOMAIN_AMDIS
MPI::COMM_WORLD.Barrier();
INFO(info, 8)("estimation of the error needed %.5f seconds\n", INFO(info, 8)("estimation of the error needed %.5f seconds\n",
MPI::Wtime() - first); MPI::Wtime() - first);
#else #else
...@@ -651,20 +652,35 @@ namespace AMDiS { ...@@ -651,20 +652,35 @@ namespace AMDiS {
FUNCNAME("ProblemVec::buildAfterCoarsen()"); FUNCNAME("ProblemVec::buildAfterCoarsen()");
if (dualMeshTraverseRequired()) { if (dualMeshTraverseRequired()) {
#ifdef HAVE_PARALLEL_DOMAIN_AMDIS
ERROR_EXIT("Dual mesh assemble does not work in parallel code!\n");
#endif
dualAssemble(adaptInfo, flag, asmMatrix, asmVector); dualAssemble(adaptInfo, flag, asmMatrix, asmVector);
return; return;
} }
// printOpenmpTraverseInfo(this, true); #ifdef HAVE_PARALLEL_DOMAIN_AMDIS
// std::cout << "ElInfo = " << ElInfo::subElemMatrices.size() << std::endl; double first = MPI::Wtime();
#endif
for (unsigned int i = 0; i < meshes.size(); i++) for (unsigned int i = 0; i < meshes.size(); i++)
meshes[i]->dofCompress(); meshes[i]->dofCompress();
clock_t first = clock(); #ifdef HAVE_PARALLEL_DOMAIN_AMDIS
MPI::COMM_WORLD.Barrier();
INFO(info, 8)("dof compression needed %.5f seconds\n",
MPI::Wtime() - first);
first = MPI::Wtime();
#else
#ifdef _OPENMP #ifdef _OPENMP
double wtime = omp_get_wtime(); double first = omp_get_wtime();
#else
clock_t first = clock();
#endif
#endif #endif
...@@ -786,13 +802,19 @@ namespace AMDiS { ...@@ -786,13 +802,19 @@ namespace AMDiS {
INFO(info, 8)("fillin of assembled matrix: %d\n", nnz); INFO(info, 8)("fillin of assembled matrix: %d\n", nnz);
} }
#ifdef HAVE_PARALLEL_DOMAIN_AMDIS
MPI::COMM_WORLD.Barrier();
INFO(info, 8)("buildAfterCoarsen needed %.5f seconds\n",
MPI::Wtime() - first);
#else
#ifdef _OPENMP #ifdef _OPENMP
INFO(info, 8)("buildAfterCoarsen needed %.5f seconds system time / %.5f seconds wallclock time\n", INFO(info, 8)("buildAfterCoarsen needed %.5f seconds\n",
TIME_USED(first, clock()), omp_get_wtime() - wtime); omp_get_wtime() - wtime);
#else #else
INFO(info, 8)("buildAfterCoarsen needed %.5f seconds\n", INFO(info, 8)("buildAfterCoarsen needed %.5f seconds\n",
TIME_USED(first, clock())); TIME_USED(first, clock()));
#endif #endif
#endif
} }
...@@ -1109,6 +1131,7 @@ namespace AMDiS { ...@@ -1109,6 +1131,7 @@ namespace AMDiS {
} }
#ifdef HAVE_PARALLEL_DOMAIN_AMDIS #ifdef HAVE_PARALLEL_DOMAIN_AMDIS
MPI::COMM_WORLD.Barrier();
INFO(info, 8)("writeFiles needed %.5f seconds\n", INFO(info, 8)("writeFiles needed %.5f seconds\n",
MPI::Wtime() - first); MPI::Wtime() - first);
#else #else
......
...@@ -66,6 +66,10 @@ namespace AMDiS { ...@@ -66,6 +66,10 @@ namespace AMDiS {
Flag flag = 0, markFlag = 0; Flag flag = 0, markFlag = 0;
#ifdef HAVE_PARALLEL_DOMAIN_AMDIS
double first = MPI::Wtime();
#endif
if (toDo.isSet(MARK)) if (toDo.isSet(MARK))
markFlag = problem->markElements(adaptInfo); markFlag = problem->markElements(adaptInfo);
else else
...@@ -85,6 +89,12 @@ namespace AMDiS { ...@@ -85,6 +89,12 @@ namespace AMDiS {
if (toDo.isSet(ADAPT) && markFlag.isSet(MESH_COARSENED)) if (toDo.isSet(ADAPT) && markFlag.isSet(MESH_COARSENED))
flag |= problem->coarsenMesh(adaptInfo); flag |= problem->coarsenMesh(adaptInfo);
#ifdef HAVE_PARALLEL_DOMAIN_AMDIS
MPI::COMM_WORLD.Barrier();
INFO(info, 8)("Local mesh adaption needed %.5f seconds\n",
MPI::Wtime() - first);
#endif
if (toDo.isSet(BUILD)) if (toDo.isSet(BUILD))
problem->buildAfterCoarsen(adaptInfo, markFlag, true, true); problem->buildAfterCoarsen(adaptInfo, markFlag, true, true);
......
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