Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove CNL specific CMake macros #5745

Merged
merged 11 commits into from
Jul 17, 2023
Merged

Remove CNL specific CMake macros #5745

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
e24aa8f
Change CNL to Linux OS for OLCF machines
sarats Jun 5, 2023
7c6049a
Remove CNL specific OS cmake macro file.
sarats Jun 5, 2023
addc830
Remove Darwin (OS) specific cmake macro file.
sarats Jun 5, 2023
01c0e55
Update GPTL options and compilers for Crusher/GNU
sarats Jul 12, 2023
8f022ee
Updated GPTL options and compilers for Frontier/GNU
sarats Jul 12, 2023
2f199d4
Update GPTL options after removing CNL.cmake for Crayclang
sarats Jul 12, 2023
c10c8af
Update after removing CNL.cmake for Cray GPU compilers
sarats Jul 12, 2023
ffc6e9f
Update AMD compiler options (cnl.cmake removed) on Frontier
sarats Jul 12, 2023
49f8185
Update AMD GPU compiler options and add ADIOS2 for Frontier.
sarats Jul 12, 2023
1767c2e
Change default compiler to Cray on Frontier/Crusher
sarats Jul 12, 2023
64bd85c
Frontier/Crusher: AMD compiler add NETCDF paths
sarats Jul 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 0 additions & 18 deletions cime_config/machines/cmake_macros/CNL.cmake
View file
Open in desktop

This file was deleted.

10 changes: 5 additions & 5 deletions cime_config/machines/config_machines.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -518,7 +518,7 @@
<machine MACH="spock">
<DESC>Spock. NCCS moderate-security system that contains similar hardware and software as the upcoming Frontier system at ORNL.</DESC>
<NODENAME_REGEX>.*spock.*</NODENAME_REGEX>
<OS>CNL</OS>
<OS>Linux</OS>
<COMPILERS>gnu,cray</COMPILERS>
<MPILIBS>mpich</MPILIBS>
<PROJECT>cli133</PROJECT>
Expand Down Expand Up @@ -599,7 +599,7 @@
<machine MACH="frontier">
<DESC>Frontier exascale supercomputer at ORNL. 9408 nodes, Node: 4 AMD MI250X GPUs (2 GCDs) ~ 8 GPUs, 512 GB HDB2E, AMD EPYC 64 cores, 512GB DDR4 </DESC>
<NODENAME_REGEX>.*frontier.*</NODENAME_REGEX>
<OS>CNL</OS>
<OS>Linux</OS>
<COMPILERS>gnu,crayclang,amdclang,gnugpu,crayclanggpu,amdclanggpu</COMPILERS>
<MPILIBS>mpich</MPILIBS>
<PROJECT>cli115</PROJECT>
Expand Down Expand Up @@ -723,7 +723,7 @@
<machine MACH="crusher">
<DESC>Crusher. NCCS moderate-security system that contains similar hardware and software as the upcoming Frontier system at ORNL. 192 AMD EPYC 7A53 64C nodes, 128 hwthreads, 512GB DDR4, 4 MI250X GPUs</DESC>
<NODENAME_REGEX>.*crusher.*</NODENAME_REGEX>
<OS>CNL</OS>
<OS>Linux</OS>
<COMPILERS>gnu,crayclang,amdclang,gnugpu,crayclanggpu,amdclanggpu</COMPILERS>
<MPILIBS>mpich</MPILIBS>
<PROJECT>cli115</PROJECT>
Expand Down Expand Up @@ -846,7 +846,7 @@
<machine MACH="crusher-scream-cpu">
<DESC>Crusher. NCCS moderate-security system that contains similar hardware and software as the upcoming Frontier system at ORNL. 192 AMD EPYC 7A53 64C nodes, 128 hwthreads, 512GB DDR4, 4 MI250X GPUs</DESC>
<NODENAME_REGEX>.*crusher.*</NODENAME_REGEX>
<OS>CNL</OS>
<OS>Linux</OS>
<COMPILERS>crayclang-scream</COMPILERS>
<MPILIBS>mpich</MPILIBS>
<PROJECT>CLI133_crusher</PROJECT>
Expand Down Expand Up @@ -945,7 +945,7 @@
<machine MACH="crusher-scream-gpu">
<DESC>Crusher. NCCS moderate-security system that contains similar hardware and software as the upcoming Frontier system at ORNL. 192 AMD EPYC 7A53 64C nodes, 128 hwthreads, 512GB DDR4, 4 MI250X GPUs</DESC>
<NODENAME_REGEX>.*crusher.*</NODENAME_REGEX>
<OS>CNL</OS>
<OS>Linux</OS>
<COMPILERS>crayclang-scream</COMPILERS>
<MPILIBS>mpich</MPILIBS>
<PROJECT>CLI133_crusher</PROJECT>
Expand Down