From e806dc2d3cadf4f20312e9dac94fb34ddc32951c Mon Sep 17 00:00:00 2001
From: bliven_s <spencer.bliven@psi.ch>
Date: Thu, 3 Aug 2023 13:49:55 +0200
Subject: [PATCH] Add merlin-g-015

---
 .../hardware-and-software-description.md      | 22 +++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/pages/gmerlin6/hardware-and-software-description.md b/pages/gmerlin6/hardware-and-software-description.md
index c5a0b39..4b122d2 100644
--- a/pages/gmerlin6/hardware-and-software-description.md
+++ b/pages/gmerlin6/hardware-and-software-description.md
@@ -23,7 +23,7 @@ The below table summarizes the hardware setup for the Merlin6 GPU computing node
 <table>
   <thead>
    <tr>
-   <th scope='colgroup' style="vertical-align:middle;text-align:center;" colspan="8">Merlin5 CPU Computing Nodes</th>
+   <th scope='colgroup' style="vertical-align:middle;text-align:center;" colspan="9">Merlin6 GPU Computing Nodes</th>
    </tr>
    <tr>
    <th scope='col' style="vertical-align:middle;text-align:center;" colspan="1">Node</th>
@@ -33,7 +33,8 @@ The below table summarizes the hardware setup for the Merlin6 GPU computing node
    <th scope='col' style="vertical-align:middle;text-align:center;" colspan="1">Threads</th>
    <th scope='col' style="vertical-align:middle;text-align:center;" colspan="1">Scratch</th>
    <th scope='col' style="vertical-align:middle;text-align:center;" colspan="1">Memory</th>
-   <th scope='col' style="vertical-align:middle;text-align:center;" colspan="1">GPU</th>
+   <th scope='col' style="vertical-align:middle;text-align:center;" colspan="1">GPUs</th>
+   <th scope='col' style="vertical-align:middle;text-align:center;" colspan="1">GPU Model</th>
    </tr>
   </thead>
   <tbody>
@@ -45,6 +46,7 @@ The below table summarizes the hardware setup for the Merlin6 GPU computing node
      <td style="vertical-align:middle;text-align:center;" rowspan="1">2</td>
      <td style="vertical-align:middle;text-align:center;" rowspan="1">1.8TB</td>
      <td style="vertical-align:middle;text-align:center;" rowspan="1">128GB</td>
+     <td style="vertical-align:middle;text-align:center;" rowspan="1">2</td>
      <td style="vertical-align:middle;text-align:center;" rowspan="1">GTX1080</td>
    </tr>
    <tr style="vertical-align:middle;text-align:center;" ralign="center">
@@ -55,6 +57,7 @@ The below table summarizes the hardware setup for the Merlin6 GPU computing node
      <td style="vertical-align:middle;text-align:center;" rowspan="1">1</td>
      <td style="vertical-align:middle;text-align:center;" rowspan="1">1.8TB</td>
      <td style="vertical-align:middle;text-align:center;" rowspan="1">128GB</td>
+     <td style="vertical-align:middle;text-align:center;" rowspan="1">4</td>
      <td style="vertical-align:middle;text-align:center;" rowspan="1">GTX1080</td>
    </tr>
    <tr style="vertical-align:middle;text-align:center;" ralign="center">
@@ -65,6 +68,7 @@ The below table summarizes the hardware setup for the Merlin6 GPU computing node
      <td style="vertical-align:middle;text-align:center;" rowspan="1">1</td>
      <td style="vertical-align:middle;text-align:center;" rowspan="1">800GB</td>
      <td style="vertical-align:middle;text-align:center;" rowspan="1">128GB</td>
+     <td style="vertical-align:middle;text-align:center;" rowspan="1">4</td>
      <td style="vertical-align:middle;text-align:center;" rowspan="1">GTX1080Ti</td>
    </tr>
    <tr style="vertical-align:middle;text-align:center;" ralign="center">
@@ -75,6 +79,7 @@ The below table summarizes the hardware setup for the Merlin6 GPU computing node
      <td style="vertical-align:middle;text-align:center;" rowspan="1">1</td>
      <td style="vertical-align:middle;text-align:center;" rowspan="1">3.5TB</td>
      <td style="vertical-align:middle;text-align:center;" rowspan="1">128GB</td>
+     <td style="vertical-align:middle;text-align:center;" rowspan="1">4</td>
      <td style="vertical-align:middle;text-align:center;" rowspan="1">GTX1080Ti</td>
    </tr>
    <tr style="vertical-align:middle;text-align:center;" ralign="center">
@@ -85,6 +90,7 @@ The below table summarizes the hardware setup for the Merlin6 GPU computing node
      <td style="vertical-align:middle;text-align:center;" rowspan="1">1</td>
      <td style="vertical-align:middle;text-align:center;" rowspan="1">1.7TB</td>
      <td style="vertical-align:middle;text-align:center;" rowspan="1">128GB</td>
+     <td style="vertical-align:middle;text-align:center;" rowspan="1">4</td>
      <td style="vertical-align:middle;text-align:center;" rowspan="1">RTX2080Ti</td>
    </tr>
    <tr style="vertical-align:middle;text-align:center;" ralign="center">
@@ -95,8 +101,20 @@ The below table summarizes the hardware setup for the Merlin6 GPU computing node
      <td style="vertical-align:middle;text-align:center;" rowspan="1">1</td>
      <td style="vertical-align:middle;text-align:center;" rowspan="1">2.9TB</td>
      <td style="vertical-align:middle;text-align:center;" rowspan="1">384GB</td>
+     <td style="vertical-align:middle;text-align:center;" rowspan="1">8</td>
      <td style="vertical-align:middle;text-align:center;" rowspan="1">RTX2080Ti</td>
    </tr>
+   <tr style="vertical-align:middle;text-align:center;" ralign="center">
+     <td style="vertical-align:middle;text-align:center;" rowspan="1"><b>merlin-g-015</b></td>
+     <td style="vertical-align:middle;text-align:center;" rowspan="1"><a href="https://www.intel.com/content/www/us/en/products/sku/215279/intel-xeon-gold-5318s-processor-36m-cache-2-10-ghz/specifications.html">Intel(R) Xeon Gold 5318S</a></td>
+     <td style="vertical-align:middle;text-align:center;" rowspan="1">2</td>
+     <td style="vertical-align:middle;text-align:center;" rowspan="1">48</td>
+     <td style="vertical-align:middle;text-align:center;" rowspan="1">1</td>
+     <td style="vertical-align:middle;text-align:center;" rowspan="1">2.9TB</td>
+     <td style="vertical-align:middle;text-align:center;" rowspan="1">384GB</td>
+     <td style="vertical-align:middle;text-align:center;" rowspan="1">8</td>
+     <td style="vertical-align:middle;text-align:center;" rowspan="1">RTX A5000</td>
+   </tr>
   </tbody>
 </table>