diff --git a/fast/- b/fast/- new file mode 100755 index 00000000000..a34fa05f31c Binary files /dev/null and b/fast/- differ diff --git a/fast/async.so b/fast/async.so new file mode 100755 index 00000000000..1d8594a3c66 Binary files /dev/null and b/fast/async.so differ diff --git a/fast/logging.patch b/fast/logging.patch new file mode 100644 index 00000000000..72252a13d76 --- /dev/null +++ b/fast/logging.patch @@ -0,0 +1,55 @@ +diff --git a/devito/logger.py b/devito/logger.py +index 2a7eed95a..b104efd34 100644 +--- a/devito/logger.py ++++ b/devito/logger.py +@@ -16,12 +16,15 @@ logger.addHandler(stream_handler) + # Add extra logging levels (note: INFO has value=20, WARNING has value=30) + DEBUG = logging.DEBUG + PERF = 19 ++BENCH = logging.DEBUG + INFO = logging.INFO + WARNING = logging.WARNING + ERROR = logging.ERROR + CRITICAL = logging.CRITICAL + + logging.addLevelName(PERF, "PERF") ++logging.addLevelName(BENCH, "BENCH") ++ + + logger_registry = { + 'DEBUG': DEBUG, +@@ -29,7 +32,8 @@ logger_registry = { + 'INFO': INFO, + 'WARNING': WARNING, + 'ERROR': ERROR, +- 'CRITICAL': CRITICAL ++ 'CRITICAL': CRITICAL, ++ 'BENCH': BENCH + } + + NOCOLOR = '%s' +@@ -133,6 +137,8 @@ def warning(msg, *args, **kwargs): + def error(msg, *args, **kwargs): + log(msg, ERROR, *args, **kwargs) + ++def bench(msg, *args, **kwargs): ++ log(msg, BENCH, *args, **kwargs) + + def debug(msg, *args, **kwargs): + log(msg, DEBUG, *args, **kwargs) +diff --git a/devito/operator/profiling.py b/devito/operator/profiling.py +index f7633a740..2d576df5e 100644 +--- a/devito/operator/profiling.py ++++ b/devito/operator/profiling.py +@@ -460,7 +460,7 @@ class PerformanceSummary(OrderedDict): + + def create_profile(name): + """Create a new Profiler.""" +- if configuration['log-level'] in ['DEBUG', 'PERF'] and \ ++ if configuration['log-level'] in ['DEBUG', 'PERF', 'BENCH'] and \ + configuration['profiling'] == 'basic': + # Enforce performance profiling in DEBUG mode + level = 'advanced' +* Unmerged path fast/slurm/diffusion-16.slurm +* Unmerged path fast/slurm/diffusion-2.slurm +* Unmerged path fast/slurm/diffusion-32.slurm diff --git a/fast/slurm-jobs/diffusion-1.slurm b/fast/slurm-jobs/diffusion-1.slurm index 0d38fdbd150..ee5dc005bee 100644 --- a/fast/slurm-jobs/diffusion-1.slurm +++ b/fast/slurm-jobs/diffusion-1.slurm @@ -37,7 +37,7 @@ export OMP_PLACES=cores # Devito-specific env variables export DEVITO_ARCH=cray export DEVITO_LANGUAGE=openmp -export DEVITO_LOGGING=DEBUG +export DEVITO_LOGGING=BENCH export DEVITO_MPI=1 export DEVITO_AUTOTUNING=aggressive # export DEVITO_PROFILING=advanced2 diff --git a/fast/slurm-jobs/diffusion-128.slurm b/fast/slurm-jobs/diffusion-128.slurm index d78da834dd4..e6c1a8db90f 100644 --- a/fast/slurm-jobs/diffusion-128.slurm +++ b/fast/slurm-jobs/diffusion-128.slurm @@ -37,7 +37,7 @@ export OMP_PLACES=cores # Devito-specific env variables export DEVITO_ARCH=cray export DEVITO_LANGUAGE=openmp -export DEVITO_LOGGING=DEBUG +export DEVITO_LOGGING=BENCH export DEVITO_MPI=1 export DEVITO_AUTOTUNING=aggressive diff --git a/fast/slurm-jobs/diffusion-16.slurm b/fast/slurm-jobs/diffusion-16.slurm index 540e30aea28..e39179fa6c3 100644 --- a/fast/slurm-jobs/diffusion-16.slurm +++ b/fast/slurm-jobs/diffusion-16.slurm @@ -37,7 +37,7 @@ export OMP_PLACES=cores # Devito-specific env variables export DEVITO_ARCH=cray export DEVITO_LANGUAGE=openmp -export DEVITO_LOGGING=DEBUG +export DEVITO_LOGGING=BENCH export DEVITO_MPI=1 export DEVITO_AUTOTUNING=aggressive diff --git a/fast/slurm-jobs/diffusion-2.slurm b/fast/slurm-jobs/diffusion-2.slurm index 8d24017ff7b..cbcbe6517d3 100644 --- a/fast/slurm-jobs/diffusion-2.slurm +++ b/fast/slurm-jobs/diffusion-2.slurm @@ -37,7 +37,7 @@ export OMP_PLACES=cores # Devito-specific env variables export DEVITO_ARCH=cray export DEVITO_LANGUAGE=openmp -export DEVITO_LOGGING=DEBUG +export DEVITO_LOGGING=BENCH export DEVITO_MPI=1 export DEVITO_AUTOTUNING=aggressive diff --git a/fast/slurm-jobs/diffusion-32.slurm b/fast/slurm-jobs/diffusion-32.slurm index d24ec70256b..698248a4744 100644 --- a/fast/slurm-jobs/diffusion-32.slurm +++ b/fast/slurm-jobs/diffusion-32.slurm @@ -37,7 +37,7 @@ export OMP_PLACES=cores # Devito-specific env variables export DEVITO_ARCH=cray export DEVITO_LANGUAGE=openmp -export DEVITO_LOGGING=DEBUG +export DEVITO_LOGGING=BENCH export DEVITO_MPI=1 export DEVITO_AUTOTUNING=aggressive diff --git a/fast/slurm-jobs/diffusion-4.slurm b/fast/slurm-jobs/diffusion-4.slurm index 0aaa7184563..5f279c5dc21 100644 --- a/fast/slurm-jobs/diffusion-4.slurm +++ b/fast/slurm-jobs/diffusion-4.slurm @@ -37,7 +37,7 @@ export OMP_PLACES=cores # Devito-specific env variables export DEVITO_ARCH=cray export DEVITO_LANGUAGE=openmp -export DEVITO_LOGGING=DEBUG +export DEVITO_LOGGING=BENCH export DEVITO_MPI=1 export DEVITO_AUTOTUNING=aggressive # export DEVITO_PROFILING=advanced2 diff --git a/fast/slurm-jobs/diffusion-64.slurm b/fast/slurm-jobs/diffusion-64.slurm index 8ecea840b30..dfa9f259b9b 100644 --- a/fast/slurm-jobs/diffusion-64.slurm +++ b/fast/slurm-jobs/diffusion-64.slurm @@ -37,7 +37,7 @@ export OMP_PLACES=cores # Devito-specific env variables export DEVITO_ARCH=cray export DEVITO_LANGUAGE=openmp -export DEVITO_LOGGING=DEBUG +export DEVITO_LOGGING=BENCH export DEVITO_MPI=1 export DEVITO_AUTOTUNING=aggressive diff --git a/fast/slurm-jobs/diffusion-8.slurm b/fast/slurm-jobs/diffusion-8.slurm index 3369a0e7653..57a2385ca79 100644 --- a/fast/slurm-jobs/diffusion-8.slurm +++ b/fast/slurm-jobs/diffusion-8.slurm @@ -37,7 +37,7 @@ export OMP_PLACES=cores # Devito-specific env variables export DEVITO_ARCH=cray export DEVITO_LANGUAGE=openmp -export DEVITO_LOGGING=DEBUG +export DEVITO_LOGGING=BENCH export DEVITO_MPI=1 export DEVITO_AUTOTUNING=aggressive # export DEVITO_PROFILING=advanced2 diff --git a/fast/slurm-jobs/job-devito-xdsl-wave.slurm b/fast/slurm-jobs/job-devito-xdsl-wave.slurm index 98ac935e158..c622ecc6e29 100644 --- a/fast/slurm-jobs/job-devito-xdsl-wave.slurm +++ b/fast/slurm-jobs/job-devito-xdsl-wave.slurm @@ -37,7 +37,7 @@ export OMP_PLACES=cores # Devito-specific env variables export DEVITO_ARCH=cray export DEVITO_LANGUAGE=openmp -export DEVITO_LOGGING=DEBUG +export DEVITO_LOGGING=BENCH export DEVITO_MPI=1 # export DEVITO_PROFILING=advanced2 diff --git a/fast/slurm-jobs/job-devito-xdsl.slurm b/fast/slurm-jobs/job-devito-xdsl.slurm index fecbdc0f6a1..001bcff5805 100644 --- a/fast/slurm-jobs/job-devito-xdsl.slurm +++ b/fast/slurm-jobs/job-devito-xdsl.slurm @@ -37,7 +37,7 @@ export OMP_PLACES=cores # Devito-specific env variables export DEVITO_ARCH=cray export DEVITO_LANGUAGE=openmp -export DEVITO_LOGGING=DEBUG +export DEVITO_LOGGING=BENCH export DEVITO_MPI=1 # export DEVITO_PROFILING=advanced2 diff --git a/fast/slurm-jobs/wave-1.slurm b/fast/slurm-jobs/wave-1.slurm index f212a6f2e31..5e6d73da32d 100644 --- a/fast/slurm-jobs/wave-1.slurm +++ b/fast/slurm-jobs/wave-1.slurm @@ -39,7 +39,7 @@ export OMP_PLACES=cores # Devito-specific env variables export DEVITO_ARCH=cray export DEVITO_LANGUAGE=openmp -export DEVITO_LOGGING=DEBUG +export DEVITO_LOGGING=BENCH export DEVITO_MPI=1 export DEVITO_AUTOTUNING=aggressive # export DEVITO_PROFILING=advanced2 diff --git a/fast/slurm-jobs/wave-128.slurm b/fast/slurm-jobs/wave-128.slurm index d2abb6d1546..553756b7a9f 100644 --- a/fast/slurm-jobs/wave-128.slurm +++ b/fast/slurm-jobs/wave-128.slurm @@ -37,7 +37,7 @@ export OMP_PLACES=cores # Devito-specific env variables export DEVITO_ARCH=cray export DEVITO_LANGUAGE=openmp -export DEVITO_LOGGING=DEBUG +export DEVITO_LOGGING=BENCH export DEVITO_MPI=diag2 export DEVITO_AUTOTUNING=aggressive diff --git a/fast/slurm-jobs/wave-16.slurm b/fast/slurm-jobs/wave-16.slurm index c6c547a135e..2e6eb9997b0 100644 --- a/fast/slurm-jobs/wave-16.slurm +++ b/fast/slurm-jobs/wave-16.slurm @@ -37,7 +37,7 @@ export OMP_PLACES=cores # Devito-specific env variables export DEVITO_ARCH=cray export DEVITO_LANGUAGE=openmp -export DEVITO_LOGGING=DEBUG +export DEVITO_LOGGING=BENCH export DEVITO_MPI=1 export DEVITO_AUTOTUNING=aggressive diff --git a/fast/slurm-jobs/wave-2.slurm b/fast/slurm-jobs/wave-2.slurm index 70fec5de362..a6f270dcf9b 100644 --- a/fast/slurm-jobs/wave-2.slurm +++ b/fast/slurm-jobs/wave-2.slurm @@ -37,7 +37,7 @@ export OMP_PLACES=cores # Devito-specific env variables export DEVITO_ARCH=cray export DEVITO_LANGUAGE=openmp -export DEVITO_LOGGING=DEBUG +export DEVITO_LOGGING=BENCH export DEVITO_MPI=1 export DEVITO_AUTOTUNING=aggressive diff --git a/fast/slurm-jobs/wave-32.slurm b/fast/slurm-jobs/wave-32.slurm index f234fffc317..0d93f7ab2b0 100644 --- a/fast/slurm-jobs/wave-32.slurm +++ b/fast/slurm-jobs/wave-32.slurm @@ -37,7 +37,7 @@ export OMP_PLACES=cores # Devito-specific env variables export DEVITO_ARCH=cray export DEVITO_LANGUAGE=openmp -export DEVITO_LOGGING=DEBUG +export DEVITO_LOGGING=BENCH export DEVITO_MPI=1 export DEVITO_AUTOTUNING=aggressive diff --git a/fast/slurm-jobs/wave-4.slurm b/fast/slurm-jobs/wave-4.slurm index ef7d5f0d6be..1f1f529902a 100644 --- a/fast/slurm-jobs/wave-4.slurm +++ b/fast/slurm-jobs/wave-4.slurm @@ -37,7 +37,7 @@ export OMP_PLACES=cores # Devito-specific env variables export DEVITO_ARCH=cray export DEVITO_LANGUAGE=openmp -export DEVITO_LOGGING=DEBUG +export DEVITO_LOGGING=BENCH export DEVITO_MPI=1 export DEVITO_AUTOTUNING=aggressive # export DEVITO_PROFILING=advanced2 diff --git a/fast/slurm-jobs/wave-64.slurm b/fast/slurm-jobs/wave-64.slurm index de9cc146c6e..06cdb863db5 100644 --- a/fast/slurm-jobs/wave-64.slurm +++ b/fast/slurm-jobs/wave-64.slurm @@ -36,7 +36,7 @@ export OMP_PLACES=cores # Devito-specific env variables export DEVITO_ARCH=cray export DEVITO_LANGUAGE=openmp -export DEVITO_LOGGING=DEBUG +export DEVITO_LOGGING=BENCH export DEVITO_MPI=1 export DEVITO_AUTOTUNING=aggressive diff --git a/fast/slurm-jobs/wave-8.slurm b/fast/slurm-jobs/wave-8.slurm index 7b8e130d769..73454898d48 100644 --- a/fast/slurm-jobs/wave-8.slurm +++ b/fast/slurm-jobs/wave-8.slurm @@ -37,7 +37,7 @@ export OMP_PLACES=cores # Devito-specific env variables export DEVITO_ARCH=cray export DEVITO_LANGUAGE=openmp -export DEVITO_LOGGING=DEBUG +export DEVITO_LOGGING=BENCH export DEVITO_MPI=1 export DEVITO_AUTOTUNING=aggressive # export DEVITO_PROFILING=advanced2