diff --git a/docs/source/benchmarking.rst b/docs/source/benchmarking.rst index af8d50c2..7970431c 100644 --- a/docs/source/benchmarking.rst +++ b/docs/source/benchmarking.rst @@ -11,23 +11,26 @@ How to benchmark? The following simple models (found in the ``tests/benchmarking`` sub-package) can be used to benchmark gprMax on your own system. The models feature different domain sizes and contain a simple source in free space. -:download:`bench_100x100x100.in <../../tests/benchmarking/bench_100x100x100.in>` .. literalinclude:: ../../tests/benchmarking/bench_100x100x100.in :language: none :linenos: -:download:`bench_150x150x150.in <../../tests/benchmarking/bench_150x150x150.in>` .. literalinclude:: ../../tests/benchmarking/bench_150x150x150.in :language: none :linenos: +.. literalinclude:: ../../tests/benchmarking/bench_200x200x200.in + :language: none + :linenos: + + Using the following steps to collect and report benchmarking results for each of the models: 1. Run gprMax in benchmarking mode, e.g. ``python -m gprMax tests/benchmarking/bench_100x100x100.in -benchmark`` -2. Use the ``plot_benchmark`` module to create plots of the execution time and speed-up, e.g. ``python -m tests.benchmarking.plot_benchmark tests/benchmarking/bench_100x100x100.npz``. +2. Use the ``plot_benchmark`` module to create plots of the execution time and speed-up, e.g. ``python -m tests.benchmarking.plot_benchmark tests/benchmarking/bench_100x100x100.npz``. You can combine results into a single plot, e.g. e.g. ``python -m tests.benchmarking.plot_benchmark tests/benchmarking/bench_100x100x100.npz --otherresults tests/benchmarking/bench_150x150x150.npz``. 3. Share your data by emailing us your Numpy archives and plot files to info@gprmax.com Results @@ -67,6 +70,16 @@ MacPro3,1 :width: 600px +Linux +----- + +Dell PowerEdge R630 +^^^^^^^^^^^^^^^^^^^ + +.. figure:: ../../tests/benchmarking/results/Linux/Dell_PowerEdge_R630/Dell_PowerEdge_R630.png + :width: 600px + + Windows ------- diff --git a/tests/benchmarking/results/Linux/Dell_PowerEdge_R630/Dell_PowerEdge_R630.png b/tests/benchmarking/results/Linux/Dell_PowerEdge_R630/Dell_PowerEdge_R630.png new file mode 100644 index 00000000..33512d58 Binary files /dev/null and b/tests/benchmarking/results/Linux/Dell_PowerEdge_R630/Dell_PowerEdge_R630.png differ diff --git a/tests/benchmarking/results/Linux/Dell_PowerEdge_R630/bench_100x100x100.npz b/tests/benchmarking/results/Linux/Dell_PowerEdge_R630/bench_100x100x100.npz new file mode 100755 index 00000000..c5535486 Binary files /dev/null and b/tests/benchmarking/results/Linux/Dell_PowerEdge_R630/bench_100x100x100.npz differ diff --git a/tests/benchmarking/results/Linux/Dell_PowerEdge_R630/bench_150x150x150.npz b/tests/benchmarking/results/Linux/Dell_PowerEdge_R630/bench_150x150x150.npz new file mode 100755 index 00000000..29b411d1 Binary files /dev/null and b/tests/benchmarking/results/Linux/Dell_PowerEdge_R630/bench_150x150x150.npz differ diff --git a/tests/benchmarking/results/Linux/Dell_PowerEdge_R630/bench_200x200x200.npz b/tests/benchmarking/results/Linux/Dell_PowerEdge_R630/bench_200x200x200.npz new file mode 100755 index 00000000..e556f78e Binary files /dev/null and b/tests/benchmarking/results/Linux/Dell_PowerEdge_R630/bench_200x200x200.npz differ diff --git a/tools/HPC scripts/gprmax_omp.sh b/tools/HPC scripts/gprmax_omp.sh index 5e005205..734bd6b7 100644 --- a/tools/HPC scripts/gprmax_omp.sh +++ b/tools/HPC scripts/gprmax_omp.sh @@ -23,9 +23,6 @@ module load anaconda source activate gprMax -### Set number of OpenMP threads -export OMP_NUM_THREADS=$NSLOTS - ### Run gprMax with input file cd $HOME/gprMax python -m gprMax mymodel.in -n 100 \ No newline at end of file