From 058395aff8265acfa6b8a4b5dfda58e88b8cd100 Mon Sep 17 00:00:00 2001 From: Galen Shipman Date: Thu, 21 Sep 2023 11:29:04 -0700 Subject: [PATCH] add platform descriptions to Introduction, reference these properly in branson, miniem, and sparta. Start to get consistent naming accross results, we should all use Crossroads and Sierra as names, we caveat in the intro that testbeds are often used that have same architecture --- branson | 2 +- doc/sphinx/00_intro/introduction.rst | 31 +++++++++++++++++ doc/sphinx/01_branson/branson.rst | 6 ++-- doc/sphinx/07_miniem/miniem.rst | 27 ++------------- doc/sphinx/08_sparta/ats2.gp | 2 +- doc/sphinx/08_sparta/sparta.rst | 51 +++++++--------------------- parthenon | 2 +- sparta | 2 +- spatter | 2 +- trilinos | 2 +- umt | 2 +- utils/pavilion | 2 +- 12 files changed, 58 insertions(+), 73 deletions(-) diff --git a/branson b/branson index 8b8fb295..4cdb5a7b 160000 --- a/branson +++ b/branson @@ -1 +1 @@ -Subproject commit 8b8fb295908b4b449f006454021d3c9c812f2c84 +Subproject commit 4cdb5a7bdcc2d6d2b1d44838c149f28b33ce390b diff --git a/doc/sphinx/00_intro/introduction.rst b/doc/sphinx/00_intro/introduction.rst index f878ee65..cb43547f 100644 --- a/doc/sphinx/00_intro/introduction.rst +++ b/doc/sphinx/00_intro/introduction.rst @@ -239,6 +239,37 @@ Where: * w = weighting factor. +System Information +================== + +The baseline platform for the ATS-5 procurement is the ATS-3 system (described below). +GPU performance is provided on the ATS-2 system and in some cases other GPU based systems +and is for information only, these are not to be used as baselines. +In most cases the performance numbers provided herein were collected on smaller scale +testbed systems that are the same architecture as that of ATS-3 and ATS-2 systems. + +* Advanced Technology System 3 (ATS-3), also known as Crossroads (see :ref:`GlobalSystemATS3`) +* Advanced Technology System 2 (ATS-2), also known as Sierra (see :ref:`GlobalSystemATS2`) + + +.. _GlobalSystemATS3: + +ATS-3/Crossroads +---------------- + +This system has over 6,000 compute nodes that are made up of two Intel(R) Xeon(R) Max 9480 CPUs +interconnected with HPE Slingshot 11 interconnect. + +.. _GlobalSystemATS2: + +ATS-2/Sierra +------------ + +This system has 4,284 compute nodes that are made up of two Power9 +CPUs with four NVIDIA V100 GPUs. Please refer to [Sierra-LLNL]_ for more +detailed information. + + Approvals ========= diff --git a/doc/sphinx/01_branson/branson.rst b/doc/sphinx/01_branson/branson.rst index 70b68943..bb2f627d 100644 --- a/doc/sphinx/01_branson/branson.rst +++ b/doc/sphinx/01_branson/branson.rst @@ -124,8 +124,10 @@ The memory footprint can be controlled by editing "photons" in the input file. Results from Branson are provided on the following systems: -* Crossroads, -* IBM Power9 with Nvidia V100 GPU, +* Crossroads (see + :ref:`GlobalSystemATS3`) +* Sierra (see + :ref:`GlobalSystemATS2`) Crossroads ------------ diff --git a/doc/sphinx/07_miniem/miniem.rst b/doc/sphinx/07_miniem/miniem.rst index b8f8b1ee..f0c5c181 100644 --- a/doc/sphinx/07_miniem/miniem.rst +++ b/doc/sphinx/07_miniem/miniem.rst @@ -110,10 +110,8 @@ The platforms utilized for benchmarking activities are listed and described belo * Commodity Technology System 1 (CTS-1) with Intel Cascade Lake processors, known as Manzano at SNL (see :ref:`MiniEMSystemCTS1`) -* Advanced Technology System 3 (ATS-3), also known as Crossroads (see - :ref:`MiniEMSystemATS3`) -* Advanced Technology System 2 (ATS-2), also known as Sierra (see - :ref:`MiniEMSystemATS2`) +* Crossroads (see :ref:`GlobalSystemATS3`) +* Sierra (see :ref:`GlobalSystemATS2`) .. _MiniEMSystemCTS3: @@ -145,27 +143,6 @@ instruction and data, and L3 being shared across all cores in the processor. The cache size is 1.5 MB/core, 35.75 MB/processor, or 71.5 MB/node. -.. _MiniEMSystemATS3: - -ATS-3/Crossroads ----------------- - -This system is not available yet but is slated to be the reference platform. - - -.. _MiniEMSystemATS2: - -ATS-2/Sierra ------------- - -This system has a plethora of compute nodes that are made up of Power9 -processors with four NVIDIA V100 GPUs. Please refer to [Sierra-LLNL]_ for more -detailed information. - -A Sierra application and regression testbed system named Vortex, housed at SNL, -was used for benchmarking for convenience. Vortex has the same compute node -hardware as Sierra. - Building ======== diff --git a/doc/sphinx/08_sparta/ats2.gp b/doc/sphinx/08_sparta/ats2.gp index c537de6a..8222989b 100644 --- a/doc/sphinx/08_sparta/ats2.gp +++ b/doc/sphinx/08_sparta/ats2.gp @@ -2,7 +2,7 @@ set terminal pngcairo enhanced size 1024, 768 dashed font 'Helvetica,18' set output "ats2.png" -set title "SPARTA Throughput Performance on ATS-2/Vortex" font "serif,22" +set title "SPARTA Throughput Performance on Sierra/Vortex" font "serif,22" set xlabel "No. Particles" set ylabel "Figure of Merit (M-particle-steps/sec)" diff --git a/doc/sphinx/08_sparta/sparta.rst b/doc/sphinx/08_sparta/sparta.rst index 3639ec4a..e00ac892 100644 --- a/doc/sphinx/08_sparta/sparta.rst +++ b/doc/sphinx/08_sparta/sparta.rst @@ -114,7 +114,7 @@ Figure of Merit Each SPARTA simulation writes out a file named "log.sparta". At the end of this simulation is a block that resembles the following example (this is from the -ATS-2/Sierra case discussed below with 57,143,091 particles whose full output is +Sierra case discussed below with 57,143,091 particles whose full output is within :download:`log.sparta `). .. code-block:: @@ -168,10 +168,8 @@ The platforms utilized for benchmarking activities are listed and described belo * Commodity Technology System 1 (CTS-1) with Intel Cascade Lake processors, known as Manzano at SNL (see :ref:`SystemCTS1`) -* Advanced Technology System 3 (ATS-3), also known as Crossroads (see - :ref:`SystemATS3`) -* Advanced Technology System 2 (ATS-2), also known as Sierra (see - :ref:`SystemATS2`) +* Crossroads (see :ref:`GlobalSystemATS3`) +* Sierra (see :ref:`GlobalSystemATS2`) .. _SystemCTS3: @@ -202,29 +200,6 @@ levels of cache, with L1 using separate instruction and data caches, L2 unifying instruction and data, and L3 being shared across all cores in the processor. The cache size is 1.5 MB/core, 35.75 MB/processor, or 71.5 MB/node. - -.. _SystemATS3: - -ATS-3/Crossroads ----------------- - -This system is not available yet but is slated to be the reference platform. - - -.. _SystemATS2: - -ATS-2/Sierra ------------- - -This system has a plethora of compute nodes that are made up of Power9 -processors with four NVIDIA V100 GPUs. Please refer to [Sierra-LLNL]_ for more -detailed information. - -A Sierra application and regression testbed system named Vortex, housed at SNL, -was used for benchmarking for convenience. Vortex has the same compute node -hardware as Sierra. - - Building ======== @@ -233,7 +208,7 @@ Instructions are provided on how to build SPARTA for the following systems: * Generic (see :ref:`BuildGeneric`) * Commodity Technology System 1 (CTS-1) with Intel Cascade Lake processors, known as Manzano at SNL (see :ref:`BuildCTS1`) -* Advanced Technology System 2 (ATS-2), also known as Sierra (see +* Sierra (see :ref:`BuildATS2`) If submodules were cloned within this repository, then the source code to build @@ -269,7 +244,7 @@ at the top level of this repository. .. _BuildATS2: -ATS-2/Vortex +Sierra (Vortex testbed) ------------ Instructions for building on Sierra are provided below. @@ -293,7 +268,7 @@ Instructions are provided on how to run SPARTA for the following systems: * Commodity Technology System 1 (CTS-1) with Intel Cascade Lake processors, known as Manzano at SNL (see :ref:`RunCTS1`) -* Advanced Technology System 2 (ATS-2), also known as Sierra (see +* Sierra (see :ref:`RunATS2`) @@ -324,7 +299,7 @@ An example of how to run the test case on Manzano is provided below. .. _RunATS2: -ATS-2/Vortex +Sierra (Vortex testbed) ------------ An example of how to run the test case with a single GPU on Sierra is provided @@ -350,7 +325,7 @@ Results from SPARTA are provided on the following systems: * Commodity Technology System 1 (CTS-1) with Intel Cascade Lake processors, known as Manzano at SNL (see :ref:`ResultsCTS1`) -* Advanced Technology System 2 (ATS-2), also known as Sierra (see +* Sierra (see :ref:`ResultsATS2`) @@ -462,13 +437,13 @@ subsections. .. _ResultsATS2: -ATS-2/Vortex +Sierra (Vortex testbed) ------------ -Throughput performance of SPARTA on ATS-2/Vortex is provided within the +Throughput performance of SPARTA on Sierra/Vortex is provided within the following table and figure. -.. csv-table:: SPARTA Throughput Performance on ATS-2/Vortex +.. csv-table:: SPARTA Throughput Performance on Sierra/Vortex :file: ats2.csv :align: center :widths: 10, 10 @@ -477,9 +452,9 @@ following table and figure. .. figure:: ats2.png :align: center :scale: 50% - :alt: SPARTA Throughput Performance on ATS-2/Vortex + :alt: SPARTA Throughput Performance on Sierra/Vortex - SPARTA Throughput Performance on ATS-2/Vortex + SPARTA Throughput Performance on Sierra/Vortex Output from the largest case is within :download:`log.sparta `. diff --git a/parthenon b/parthenon index 11c53d1c..94caccd6 160000 --- a/parthenon +++ b/parthenon @@ -1 +1 @@ -Subproject commit 11c53d1cd4ada0629e06d069b70b410234ed0bde +Subproject commit 94caccd69bce1ea4698351b2bf886f2103e16308 diff --git a/sparta b/sparta index 83d5f3a9..5ac403a7 160000 --- a/sparta +++ b/sparta @@ -1 +1 @@ -Subproject commit 83d5f3a92c5fc0b59d4d973c6b1dddc4d77a7147 +Subproject commit 5ac403a7814838d2d62547d8dd86ae25a9c19d8e diff --git a/spatter b/spatter index 8398bc6c..7f3ec8c4 160000 --- a/spatter +++ b/spatter @@ -1 +1 @@ -Subproject commit 8398bc6c8038e5c2d7d188e58cb842f05dc2185a +Subproject commit 7f3ec8c4a9ab830e55ed683432778eed02a8c9f0 diff --git a/trilinos b/trilinos index f3ff0b54..d6e1f247 160000 --- a/trilinos +++ b/trilinos @@ -1 +1 @@ -Subproject commit f3ff0b54c5158790295daff089ff0d286bda3c2c +Subproject commit d6e1f2475b0ead4b327e39c56cb2eb5464708bd8 diff --git a/umt b/umt index a6e8898d..a110b15f 160000 --- a/umt +++ b/umt @@ -1 +1 @@ -Subproject commit a6e8898d34b9ea3ad6cd5603ddfd44e05c53b7ec +Subproject commit a110b15f7bb77237b31d2edb76f1192c235a1069 diff --git a/utils/pavilion b/utils/pavilion index 69b2d45d..1574aa69 160000 --- a/utils/pavilion +++ b/utils/pavilion @@ -1 +1 @@ -Subproject commit 69b2d45d696e623127c106b50525ba65daa23d76 +Subproject commit 1574aa697941fa06f827ecf86b72e4fc640dabec