diff --git a/applications/poisson_dg/donkey.sbatch b/applications/poisson_dg/donkey.sbatch index 8af412a53dae59bc0b24d2e2563fba7149b90593..bfb847bfdee7548bc88b418062be4180e9379972 100755 --- a/applications/poisson_dg/donkey.sbatch +++ b/applications/poisson_dg/donkey.sbatch @@ -24,16 +24,16 @@ ml suitesparse SRUNOPT="--cpu_bind=verbose,core" # Run the opcount executables -srun $SRUNOPT ./app_poisson_dg_deg2_opcount app_poisson_dg_deg2_opcount.ini -srun $SRUNOPT ./app_poisson_dg_deg3_opcount app_poisson_dg_deg3_opcount.ini -srun $SRUNOPT ./app_poisson_dg_deg4_opcount app_poisson_dg_deg4_opcount.ini -srun $SRUNOPT ./app_poisson_dg_deg5_opcount app_poisson_dg_deg5_opcount.ini +srun $SRUNOPT ./app_poisson_dg_deg2_opcount app_poisson_dg_3d_deg2_opcount.ini +srun $SRUNOPT ./app_poisson_dg_deg3_opcount app_poisson_dg_3d_deg3_opcount.ini +srun $SRUNOPT ./app_poisson_dg_deg4_opcount app_poisson_dg_3d_deg4_opcount.ini +srun $SRUNOPT ./app_poisson_dg_deg5_opcount app_poisson_dg_3d_deg5_opcount.ini # Run the timing executables COUNT=0 while [ $COUNT -lt 5 ]; do - srun $SRUNOPT ./app_poisson_dg_deg2_nonopcount app_poisson_dg_deg2_nonopcount.ini - srun $SRUNOPT ./app_poisson_dg_deg3_nonopcount app_poisson_dg_deg3_nonopcount.ini - srun $SRUNOPT ./app_poisson_dg_deg4_nonopcount app_poisson_dg_deg4_nonopcount.ini - srun $SRUNOPT ./app_poisson_dg_deg5_nonopcount app_poisson_dg_deg5_nonopcount.ini + srun $SRUNOPT ./app_poisson_dg_deg2_nonopcount app_poisson_dg_3d_deg2_nonopcount.ini + srun $SRUNOPT ./app_poisson_dg_deg3_nonopcount app_poisson_dg_3d_deg3_nonopcount.ini + srun $SRUNOPT ./app_poisson_dg_deg4_nonopcount app_poisson_dg_3d_deg4_nonopcount.ini + srun $SRUNOPT ./app_poisson_dg_deg5_nonopcount app_poisson_dg_3d_deg5_nonopcount.ini done diff --git a/applications/poisson_dg/poisson_dg.mini b/applications/poisson_dg/poisson_dg.mini index bc2eb0a980d0975f14f22544943c287cadbcc19c..6ed74e8658d52d7b71e0360bc019d1ee7de2fcd0 100644 --- a/applications/poisson_dg/poisson_dg.mini +++ b/applications/poisson_dg/poisson_dg.mini @@ -6,7 +6,7 @@ opcount_suffix = opcount, nonopcount | expand opcount # Calculate the size of the grid to equlibritate it to 100 MB/rank # Input parameters dim = 3 -mbperrank = 1 +mbperrank = 10 ranks = 16 floatingbytes = 8 @@ -30,8 +30,9 @@ fastdg = 1 sumfact = 1 vectorize_quad = 1 vectorize_grads = 1 +instrumentation_level = 4 opcounter = 1, 0 | expand opcount -timing = 0, 1 | expand opcount +time_opcounter = 0, 1 | expand opcount [formcompiler.ufl_variants] cell = hexahedron diff --git a/python/dune/perftool/pdelab/driver.py b/python/dune/perftool/pdelab/driver.py index f6a2052de91935f8f26635c13d115a9438d2b5e2..bbba22c0bbcbffbe2da5474cc241a0869056ae9e 100644 --- a/python/dune/perftool/pdelab/driver.py +++ b/python/dune/perftool/pdelab/driver.py @@ -1714,7 +1714,7 @@ def generate_driver(formdatas, data): assert(any(_driver_data['form'].ufl_cell().cellname() in x for x in ["vertex", "interval", "quadrilateral", "hexahedron"])) # In case of operator conunting we only assemble the matrix and evaluate the residual - assemble_matrix_timer() + #assemble_matrix_timer() evaluate_residual_timer() elif is_stationary(): # We could also use solve if we are not interested in visualization