diff --git a/mpirunner.py b/mpirunner.py index 581ad57..cd27910 100755 --- a/mpirunner.py +++ b/mpirunner.py @@ -23,7 +23,7 @@ def main(): return - +@profile def sequential(): comm = MPI.COMM_WORLD conffile = CONFIG_FILE_PATH @@ -49,6 +49,7 @@ def manager(): return +@profile def worker(): comm = MPI.COMM_WORLD rank = comm.Get_rank() diff --git a/tests/performance/conf_gen_128.ini b/tests/performance/conf_gen_128.ini index 77c549f..baf0547 100644 --- a/tests/performance/conf_gen_128.ini +++ b/tests/performance/conf_gen_128.ini @@ -2,10 +2,10 @@ simDir=tests/performance/tmp_gen_output startJob=0 [Iterables] -p=[10,39,15] +p=[10,39,10] seeds=[5462,2] lc=[4] -connectivity=[1,2,3] +connectivity=[1] variances=[1] [Generation] diff --git a/tests/performance/conf_gen_256.ini b/tests/performance/conf_gen_256.ini index 77c549f..627fcd6 100644 --- a/tests/performance/conf_gen_256.ini +++ b/tests/performance/conf_gen_256.ini @@ -2,16 +2,16 @@ simDir=tests/performance/tmp_gen_output startJob=0 [Iterables] -p=[10,39,15] +p=[10,39,10] seeds=[5462,2] lc=[4] -connectivity=[1,2,3] +connectivity=[1] variances=[1] [Generation] -Nx = 128 -Ny = 128 -Nz = 128 +Nx = 256 +Ny = 256 +Nz = 256 variogram_type=1 binary = yes kh = 100 diff --git a/tests/performance/conf_gen_512.ini b/tests/performance/conf_gen_512.ini index f487be8..e4a0e89 100644 --- a/tests/performance/conf_gen_512.ini +++ b/tests/performance/conf_gen_512.ini @@ -2,10 +2,10 @@ simDir=tests/performance/tmp_gen_output startJob=0 [Iterables] -p=[10,39,15] +p=[10,39,10] seeds=[5462,2] lc=[4] -connectivity=[1,2,3] +connectivity=[1] variances=[1] [Generation] diff --git a/tests/performance/conf_gen_64.ini b/tests/performance/conf_gen_64.ini index 551f3c7..7143e33 100644 --- a/tests/performance/conf_gen_64.ini +++ b/tests/performance/conf_gen_64.ini @@ -2,10 +2,10 @@ simDir=tests/performance/tmp_gen_output startJob=0 [Iterables] -p=[10,39,15] +p=[10,39,10] seeds=[5462,2] lc=[4] -connectivity=[1,2,3] +connectivity=[1] variances=[1] [Generation] diff --git a/tests/performance/generation.py b/tests/performance/generation.py index 7d61dfe..76cfbab 100644 --- a/tests/performance/generation.py +++ b/tests/performance/generation.py @@ -9,9 +9,7 @@ config_file_128 = os.path.abspath("./tests/performance/conf_gen_128.ini") config_file_256 = os.path.abspath("./tests/performance/conf_gen_256.ini") -config_file_512 = os.path.abspath("./tests/performance/conf_gen_512.ini") - -CONFIG_FILES = [config_file_64, config_file_128, config_file_256, config_file_512] +CONFIG_FILES = [config_file_64, config_file_128, config_file_256] index_1 = 0 diff --git a/tools/generation/config.py b/tools/generation/config.py index 8f89238..cad562f 100755 --- a/tools/generation/config.py +++ b/tools/generation/config.py @@ -49,7 +49,6 @@ def DotheLoop(job,parser,iterables): njobs=len(variances)*len(cons)*len(seeds)*len(lcs) else: njobs=len(variances)*(len(cons)-1)*len(seeds)*len(lcs)+len(variances)*len(seeds) - return njobs i=0 diff --git a/tools/generation/fftma_gen.py b/tools/generation/fftma_gen.py index 2676a0c..483ebde 100755 --- a/tools/generation/fftma_gen.py +++ b/tools/generation/fftma_gen.py @@ -11,7 +11,6 @@ import time import os #from memory_profiler import profile -#@profile def fftmaGenerator(datadir,job,conffile): t0=time.time()