From 752f79ecef4c2120043b73376746f136e75764fe Mon Sep 17 00:00:00 2001
From: "Galen M. Shipman" <gshipman@lanl.gov>
Date: Wed, 7 Feb 2024 11:30:13 -0800
Subject: [PATCH] add Crossroads data for UMT

---
 .../06_umt/spp1_strong_scaling_roci.csv       |  7 +++++
 doc/sphinx/06_umt/spp1_strong_scaling_roci.gp | 26 ++++++++++++++++++
 .../06_umt/spp2_strong_scaling_roci.csv       |  7 +++++
 doc/sphinx/06_umt/spp2_strong_scaling_roci.gp | 26 ++++++++++++++++++
 doc/sphinx/06_umt/spp2_throughput_V100.csv    | 18 ++++++-------
 doc/sphinx/06_umt/umt.rst                     | 27 +++++++++++++------
 6 files changed, 94 insertions(+), 17 deletions(-)
 create mode 100644 doc/sphinx/06_umt/spp1_strong_scaling_roci.csv
 create mode 100755 doc/sphinx/06_umt/spp1_strong_scaling_roci.gp
 create mode 100644 doc/sphinx/06_umt/spp2_strong_scaling_roci.csv
 create mode 100755 doc/sphinx/06_umt/spp2_strong_scaling_roci.gp

diff --git a/doc/sphinx/06_umt/spp1_strong_scaling_roci.csv b/doc/sphinx/06_umt/spp1_strong_scaling_roci.csv
new file mode 100644
index 00000000..af6c4e1a
--- /dev/null
+++ b/doc/sphinx/06_umt/spp1_strong_scaling_roci.csv
@@ -0,0 +1,7 @@
+Cores,Actual,Ideal
+1,3.3341e+07,3.33E+07
+8,1.73263e+08,2.67E+08
+32,3.68068e+08,1.07E+09
+56,5.05724e+08,1.87E+09
+88,4.0239e+08,2.93E+09
+112,6.2133e+08,3.73E+09
\ No newline at end of file
diff --git a/doc/sphinx/06_umt/spp1_strong_scaling_roci.gp b/doc/sphinx/06_umt/spp1_strong_scaling_roci.gp
new file mode 100755
index 00000000..637dac45
--- /dev/null
+++ b/doc/sphinx/06_umt/spp1_strong_scaling_roci.gp
@@ -0,0 +1,26 @@
+#!/usr/bin/gnuplot
+set terminal pngcairo enhanced size 1024, 768 dashed font 'Helvetica,18'
+set output "spp1_strong_scaling_roci.png"
+
+# no title needed since we will caption the figure
+#set title "Strong scaling of SPP 1 on Crossroads" font "serif,22"
+set xlabel "Num Cores"
+set ylabel "Figure of Merit (unknowns/sec)"
+
+set xrange [1:112]
+set key left top
+
+set logscale x 2
+set logscale y 2
+
+set grid
+show grid
+
+set datafile separator comma
+set key autotitle columnheader
+
+set style line 1 linetype 6 dashtype 1 linecolor rgb "#FF0000" linewidth 2 pointtype 6 pointsize 3
+set style line 2 linetype 1 dashtype 2 linecolor rgb "#FF0000" linewidth 2
+
+plot "spp1_strong_scaling_roci.csv" using 1:2 with linespoints linestyle 1, "" using 1:3 with line linestyle 2
+
diff --git a/doc/sphinx/06_umt/spp2_strong_scaling_roci.csv b/doc/sphinx/06_umt/spp2_strong_scaling_roci.csv
new file mode 100644
index 00000000..cbe58bbb
--- /dev/null
+++ b/doc/sphinx/06_umt/spp2_strong_scaling_roci.csv
@@ -0,0 +1,7 @@
+Cores,Actual,Ideal
+1,1.58871e+07,1.59E+07
+8,7.69292e+07,1.27E+08
+32,1.80348e+08,5.08E+08
+56,2.38803e+08,8.90E+08
+88,3.27651e+08,1.40E+09
+112,3.91002e+08,1.78E+09
\ No newline at end of file
diff --git a/doc/sphinx/06_umt/spp2_strong_scaling_roci.gp b/doc/sphinx/06_umt/spp2_strong_scaling_roci.gp
new file mode 100755
index 00000000..0c49c098
--- /dev/null
+++ b/doc/sphinx/06_umt/spp2_strong_scaling_roci.gp
@@ -0,0 +1,26 @@
+#!/usr/bin/gnuplot
+set terminal pngcairo enhanced size 1024, 768 dashed font 'Helvetica,18'
+set output "spp2_strong_scaling_roci.png"
+
+# no title needed since we will caption the figure
+#set title "Strong scaling of SPP 2 on Crossroads" font "serif,22"
+set xlabel "Num Cores"
+set ylabel "Figure of Merit (unknowns/sec)"
+
+set xrange [1:112]
+set key left top
+
+set logscale x 2
+set logscale y 2
+
+set grid
+show grid
+
+set datafile separator comma
+set key autotitle columnheader
+
+set style line 1 linetype 6 dashtype 1 linecolor rgb "#FF0000" linewidth 2 pointtype 6 pointsize 3
+set style line 2 linetype 1 dashtype 2 linecolor rgb "#FF0000" linewidth 2
+
+plot "spp2_strong_scaling_roci.csv" using 1:2 with linespoints linestyle 1, "" using 1:3 with line linestyle 2
+
diff --git a/doc/sphinx/06_umt/spp2_throughput_V100.csv b/doc/sphinx/06_umt/spp2_throughput_V100.csv
index f28ca083..40149f5a 100644
--- a/doc/sphinx/06_umt/spp2_throughput_V100.csv
+++ b/doc/sphinx/06_umt/spp2_throughput_V100.csv
@@ -1,9 +1,9 @@
-unknowns,throughput,,,,,,,,,
-2654208,21676983.21,,,,,,,,,
-6291456,45701699.5,,,,,,,,,
-12288000,79225954.28,,,,,,,,,
-21233664,114537827.7,,,,,,,,,
-50331648,160341978,,,,,,,,,
-130842624,200104616.1,,,,,,,,,
-215973888,214659364.2,,,,,,,,,
-331776000,219351111.1,,,,,,,,,
+Unknowns,Throughput
+2654208,21676983.21
+6291456,45701699.5
+12288000,79225954.28
+21233664,114537827.7
+50331648,160341978
+130842624,200104616.1
+215973888,214659364.2
+331776000,219351111.1
diff --git a/doc/sphinx/06_umt/umt.rst b/doc/sphinx/06_umt/umt.rst
index ae48b82d..8dfe6499 100644
--- a/doc/sphinx/06_umt/umt.rst
+++ b/doc/sphinx/06_umt/umt.rst
@@ -138,31 +138,39 @@ Results from UMT are provided on the following systems:
 * Crossroads (see :ref:`GlobalSystemATS3`)
 * Sierra (see :ref:`GlobalSystemATS2`)
 
-Strong scaling data for SPP 1 and 2 on Crossroads is shown in the tables and figures below
+Strong scaling data for SPP 1 and 2 on Crossroads is shown in the tables and figures below. 
+
+For SPP1 the mesh size was 14\ :sup:`3` resulting in approximately 50% usage of the available 128 GBytes
+
+For SPP2 the mesh size was 33\ :sup:`3` resulting in approximately 50% usage of the available 128 GBytes
+
 
 .. csv-table:: Strong scaling of SPP 1 on Crossroads
-   :file: spp1_strong_scaling_cts2_abridged.csv
+   :file: spp1_strong_scaling_roci.csv
    :align: center
    :widths: auto
    :header-rows: 1
 		 
-.. figure:: spp1_strong_scaling_cts2.png
+.. figure:: spp1_strong_scaling_roci.png
    :alt: Strong scaling of SPP 1 on Crossroads
    :align: center
    :scale: 50%
 
-.. csv-table:: SPP #2 on CTS-2
-   :file: spp2_strong_scaling_cts2_abridged.csv
+   Strong scaling of SPP 1 on Crossroads
+
+
+.. csv-table:: SPP #2 on Crossroads
+   :file: spp2_strong_scaling_roci.csv
    :align: center
    :widths: auto
    :header-rows: 1
 		 
-.. figure:: spp2_strong_scaling_cts2.png
+.. figure:: spp2_strong_scaling_roci.png
    :alt: Strong scaling of SPP 2 on Crossroads
    :align: center
    :scale: 50%
 	   
-   Strong scaling of SPP 2 on CTS-2
+   Strong scaling of SPP 2 on Crossroads
 
 Throughput study of SPP 1 and 2 performance on Sierra, single GPU, as a function of problem size:
 
@@ -177,6 +185,8 @@ Throughput study of SPP 1 and 2 performance on Sierra, single GPU, as a function
    :align: center
    :scale: 50%
 
+   Throughput for SPP 1 on Sierra
+
 .. csv-table:: Throughput for SPP 2 on Sierra
    :file: spp2_throughput_V100.csv
    :align: center
@@ -188,7 +198,8 @@ Throughput study of SPP 1 and 2 performance on Sierra, single GPU, as a function
    :align: center
    :scale: 50%
 
-
+   Throughput for SPP 2 on Sierra
+   
 Verification of Results
 =======================