diff options
Diffstat (limited to 'Tools/performance_tests')
8 files changed, 11 insertions, 34 deletions
diff --git a/Tools/performance_tests/GNUmakefile_perftest b/Tools/performance_tests/GNUmakefile_perftest index 7740b0a64..38275332d 100644 --- a/Tools/performance_tests/GNUmakefile_perftest +++ b/Tools/performance_tests/GNUmakefile_perftest @@ -7,6 +7,9 @@ DIM = 3 COMP=intel TINY_PROFILE = TRUE USE_OMP = TRUE +USE_CUDA = FALSE +USE_ACC = FALSE +USE_SENSEI_INSITU = FALSE EBASE = perf_tests USE_PYTHON_MAIN = FALSE WarpxBinDir = Bin diff --git a/Tools/performance_tests/automated_test_1_uniform_rest_32ppc b/Tools/performance_tests/automated_test_1_uniform_rest_32ppc index cce91317c..55c1a6061 100644 --- a/Tools/performance_tests/automated_test_1_uniform_rest_32ppc +++ b/Tools/performance_tests/automated_test_1_uniform_rest_32ppc @@ -19,11 +19,6 @@ geometry.prob_hi = 20.e-6 20.e-6 20.e-6 # Verbosity warpx.verbose = 1 -# Algorithms -algo.current_deposition = 0 -algo.charge_deposition = 0 -algo.field_gathering = 0 -algo.particle_pusher = 0 interpolation.nox = 3 interpolation.noy = 3 interpolation.noz = 3 diff --git a/Tools/performance_tests/automated_test_2_uniform_rest_1ppc b/Tools/performance_tests/automated_test_2_uniform_rest_1ppc index 6dfdee422..8e17042c9 100644 --- a/Tools/performance_tests/automated_test_2_uniform_rest_1ppc +++ b/Tools/performance_tests/automated_test_2_uniform_rest_1ppc @@ -19,11 +19,6 @@ geometry.prob_hi = 20.e-6 20.e-6 20.e-6 # Verbosity warpx.verbose = 1 -# Algorithms -algo.current_deposition = 0 -algo.charge_deposition = 0 -algo.field_gathering = 0 -algo.particle_pusher = 0 interpolation.nox = 3 interpolation.noy = 3 interpolation.noz = 3 diff --git a/Tools/performance_tests/automated_test_3_uniform_drift_4ppc b/Tools/performance_tests/automated_test_3_uniform_drift_4ppc index 21ac8409f..13af8aaff 100644 --- a/Tools/performance_tests/automated_test_3_uniform_drift_4ppc +++ b/Tools/performance_tests/automated_test_3_uniform_drift_4ppc @@ -20,10 +20,6 @@ geometry.prob_hi = 20.e-6 20.e-6 20.e-6 warpx.verbose = 1 # Algorithms -algo.current_deposition = 0 -algo.charge_deposition = 0 -algo.field_gathering = 0 -algo.particle_pusher = 0 interpolation.nox = 3 interpolation.noy = 3 interpolation.noz = 3 diff --git a/Tools/performance_tests/automated_test_4_labdiags_2ppc b/Tools/performance_tests/automated_test_4_labdiags_2ppc index f762c9b8c..282c93331 100644 --- a/Tools/performance_tests/automated_test_4_labdiags_2ppc +++ b/Tools/performance_tests/automated_test_4_labdiags_2ppc @@ -17,12 +17,6 @@ geometry.prob_hi = 150.e-6 150.e-6 0. # Verbosity warpx.verbose = 1 -# Algorithms -algo.current_deposition = 0 -algo.charge_deposition = 0 -algo.field_gathering = 0 -algo.particle_pusher = 0 - # Numerics interpolation.nox = 3 interpolation.noy = 3 @@ -78,7 +72,8 @@ ions.momentum_distribution_type = "constant" ions.do_continuous_injection = 1 # Laser -warpx.use_laser = 1 +lasers.nlasers = 1 +lasers.names = laser laser.profile = Gaussian laser.position = 0. 0. -1.e-6 # This point is on the laser plane laser.direction = 0. 0. 1. # The plane normal direction diff --git a/Tools/performance_tests/automated_test_5_loadimbalance b/Tools/performance_tests/automated_test_5_loadimbalance index 32707bff2..22c9ec4b6 100644 --- a/Tools/performance_tests/automated_test_5_loadimbalance +++ b/Tools/performance_tests/automated_test_5_loadimbalance @@ -18,11 +18,6 @@ geometry.prob_hi = 20.e-6 20.e-6 20.e-6 warpx.verbose = 1 warpx.load_balance_int = 5 -# Algorithms -algo.current_deposition = 0 -algo.charge_deposition = 0 -algo.field_gathering = 0 -algo.particle_pusher = 0 interpolation.nox = 3 interpolation.noy = 3 interpolation.noz = 3 diff --git a/Tools/performance_tests/automated_test_6_output_2ppc b/Tools/performance_tests/automated_test_6_output_2ppc index 01de623ca..f4498c410 100644 --- a/Tools/performance_tests/automated_test_6_output_2ppc +++ b/Tools/performance_tests/automated_test_6_output_2ppc @@ -19,11 +19,6 @@ geometry.prob_hi = 20.e-6 20.e-6 20.e-6 # Verbosity warpx.verbose = 1 -# Algorithms -algo.current_deposition = 0 -algo.charge_deposition = 0 -algo.field_gathering = 0 -algo.particle_pusher = 0 interpolation.nox = 3 interpolation.noy = 3 interpolation.noz = 3 diff --git a/Tools/performance_tests/run_automated.py b/Tools/performance_tests/run_automated.py index f154c1308..dca038c6c 100644 --- a/Tools/performance_tests/run_automated.py +++ b/Tools/performance_tests/run_automated.py @@ -1,9 +1,10 @@ #!/usr/common/software/python/2.7-anaconda-4.4/bin/python -import os, sys, shutil, datetime +import os, sys, shutil, datetime, git import argparse, re, time, copy import pandas as pd -from functions_perftest import * +from functions_perftest import store_git_hash, get_file_content, \ + run_batch_nnode, extract_dataframe # typical use: python run_automated.py --n_node_list='1,8,16,32' --automated # Assume warpx, picsar, amrex and perf_logs repos ar in the same directory and @@ -225,6 +226,7 @@ def process_analysis(): batch_string += '#SBATCH -o read_output.txt\n' batch_string += '#SBATCH --mail-type=end\n' batch_string += '#SBATCH --account=m2852\n' + batch_string += 'module load h5py-parallel\n' batch_string += 'python ' + __file__ + ' --compiler=' + \ args.compiler + ' --architecture=' + args.architecture + \ ' --mode=read' + \ @@ -303,7 +305,8 @@ for n_node in n_node_list: # Load file perf_database_file if exists, and # append with results from this scan if os.path.exists(perf_database_file): - df_base = pd.read_hdf(perf_database_file, 'all_data') + df_base = pd.read_hdf(perf_database_file, 'all_data', format='table') + # df_base = pd.read_hdf(perf_database_file, 'all_data') updated_df = df_base.append(df_newline, ignore_index=True) else: updated_df = df_newline |