Skip to content

Commit a228bb5

Browse files
max-Hawkinsmax-Hawkins
authored
Merge branch 'MFlowCode:master' into mpi_time
2 parents c6a484d + ecdf5b1 commit a228bb5

File tree

4 files changed

+11
-11
lines changed

4 files changed

+11
-11
lines changed

‎docs/documentation/expectedPerformance.md‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,22 +24,27 @@ These are reported as (X/Y cores), where X is the used cores, and Y is the total
2424
| Hardware | Details | Type | Usage | Grind Time [ns] | Compiler | Computer |
2525
| ---: | ----: | ----: | ----: | ----: | :--- | :--- |
2626
| NVIDIA GH200 | GPU only | APU | 1 GPU | 0.32 | NVHPC 24.1 | GT Rogues Gallery |
27-
| NVIDIA H100 | | GPU | 1 GPU | 0.45 | NVHPC 24.5 | GT Rogues Gallery |
28-
| AMD MI300A | | APU | 1 APU | 0.60 | CCE 18.0.0 | LLNL Tioga |
27+
| NVIDIA H100 SXM5 | | GPU | 1 GPU | 0.38 | NVHPC 24.5 | GT ICE |
28+
| NVIDIA H100 PCIe | | GPU | 1 GPU | 0.45 | NVHPC 24.5 | GT Rogues Gallery |
29+
| AMD MI300A | | APU | 1 APU | 0.60 | CCE 18.0.0 | LLNL Tioga |
2930
| NVIDIA A100 | | GPU | 1 GPU | 0.62 | NVHPC 22.11 | GT Phoenix |
3031
| NVIDIA V100 | | GPU | 1 GPU | 0.99 | NVHPC 22.11 | GT Phoenix |
3132
| NVIDIA A30 | | GPU | 1 GPU | 1.1 | NVHPC 24.1 | GT Rogues Gallery |
3233
| AMD MI250X | | GPU | 1 _GCD_* | 1.1 | CCE 16.0.1 | OLCF Frontier |
3334
| AMD MI100 | | GPU | 1 GPU | 1.4 | CCE 16.0.1 | Cray internal system |
3435
| NVIDIA L40S | FP32-only GPU | GPU | 1 GPU | 1.7 | NVHPC 24.5 | GT ICE |
35-
| AMD EPYC 9654 | Genoa | CPU | 96 cores | 1.7 | Intel 2021.9 | DOD Carpenter |
36+
| AMD EPYC 9654 | Genoa | CPU | 96 cores | 1.7 | Intel 2021.9 | DOD Carpenter |
37+
| Intel Xeon 6960P | Granite Rapids | CPU | 72 cores | 1.7 | Intel 2024.2 | Intel AI Cloud |
3638
| NVIDIA P100 | | GPU | 1 GPU | 2.4 | NVHPC 23.5 | GT CSE Internal |
39+
| Intel Xeon 8592+ | Emerald Rapids | CPU | 64 cores | 2.6 | Intel 2024.2 | Intel AI Cloud |
40+
| Intel Xeon SF-AP | Sierra Forest Advanced, 2.8GHz Boost, 384 MiB L3 | CPU | 192 cores | 2.6 | Intel 2024.2 | Intel AI Cloud |
3741
| AMD EPYC 9534 | Genoa | CPU | 64 cores | 2.7 | GNU 12.3.0 | GT Phoenix |
3842
| NVIDIA A40 | FP32-only GPU | GPU | 1 GPU | 3.3 | NVHPC 22.11 | NCSA Delta |
3943
| Intel Xeon Max 9468 | Sapphire Rapids HBM | CPU | 48 cores | 3.5 | NVHPC 24.5 | GT Rogues Gallery |
4044
| NVIDIA Grace CPU | Arm, Neoverse V2 | CPU | 72 cores | 3.7 | NVHPC 24.1 | GT Rogues Gallery |
4145
| NVIDIA RTX6000 | FP32-only GPU | GPU | 1 GPU | 3.9 | NVHPC 22.11 | GT Phoenix |
4246
| AMD EPYC 7763 | Milan | CPU | 64 cores | 4.1 | GNU 11.4.0 | NCSA Delta |
47+
| Intel Xeon 6740E | Sierra Forest | CPU | 92 cores | 4.2 | Intel 2024.2 | Intel AI Cloud |
4348
| NVIDIA A10 | FP32-only GPU | GPU | 1 GPU | 4.3 | NVHPC 24.1 | TAMU Faster |
4449
| AMD EPYC 7713 | Milan | CPU | 64 cores | 5.0 | GNU 12.3.0 | GT Phoenix |
4550
| Intel Xeon 8480CL | Sapphire Rapids | CPU | 56 cores | 5.0 | NVHPC 24.5 | GT Phoenix |

‎toolchain/mfc/build.py‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,6 @@ def configure(self, case: input.MFCInputFile):
102102
install_prefixes = ';'.join([
103103
t.get_install_dirpath(case) for t in self.requires.compute()
104104
])
105-
mod_dirs = f"{HIPFORT.get_install_dirpath(case)}/include/hipfort/amdgcn"
106105

107106
flags: list = self.flags.copy() + [
108107
# Disable CMake warnings intended for developers (us).
@@ -133,9 +132,6 @@ def configure(self, case: input.MFCInputFile):
133132
# Location prefix to install bin/, lib/, include/, etc.
134133
# See: https://cmake.org/cmake/help/latest/command/install.html.
135134
f"-DCMAKE_INSTALL_PREFIX={install_dirpath}",
136-
# Fortran .mod include directories. Currently used for the HIPFORT
137-
# dependency that has this missing from its config files.
138-
f"-DCMAKE_Fortran_MODULE_DIRECTORY={mod_dirs}",
139135
]
140136

141137
if ARG("verbose"):

‎toolchain/modules‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ f-gpu craype-accel-amd-gfx90a
5454
d NCSA Delta
5555
d-all python/3.11.6
5656
d-cpu gcc/11.4.0 openmpi
57-
d-gpu nvhpc/22.11 openmpi+cuda/4.1.5+cuda cmake
57+
d-gpu nvhpc/24.1 cuda/12.3.0 openmpi/4.1.5+cuda cmake
5858
d-gpu CC=nvc CXX=nvc++ FC=nvfortran
5959

6060
c DoD Carpenter

‎toolchain/templates/delta.mako‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ cd - > /dev/null
3737
echo
3838

3939
# Fixes Delta not being able to find core library file
40-
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/sw/spack/deltas11-2023-03/apps/linux-rhel8-zen3/nvhpc-22.11/openmpi-4.1.5-nzb4n4r/lib/
40+
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/sw/spack/deltas11-2023-03/apps/linux-rhel8-zen3/nvhpc-24.1/openmpi-4.1.5-zkiklxi/lib/
4141

4242
% for target in targets:
4343
${helpers.run_prologue(target)}
@@ -46,8 +46,7 @@ export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/sw/spack/deltas11-2023-03/apps/linux-rh
4646
(set -x; ${profiler} "${target.get_install_binpath(case)}")
4747
% else:
4848
(set -x; ${profiler} \
49-
mpirun -np ${nodes*tasks_per_node} \
50-
${' '.join([f"'{x}'" for x in ARG('--') ])} \
49+
srun --ntasks ${nodes*tasks_per_node} \
5150
"${target.get_install_binpath(case)}")
5251
% endif
5352

0 commit comments

Comments
 (0)