From f2c65a2d28a8e651ea8f8de5767ed8303d04269b Mon Sep 17 00:00:00 2001
From: Youngsung Kim <youngsung.kim.act2@gmail.com>
Date: Thu, 18 Sep 2025 11:16:45 -0400
Subject: [PATCH] Removed craygnu-hipcc compiler on Frontier

---
 .../machines/cmake_macros/craygnu-hipcc.cmake | 42 -------------------
 cime_config/machines/config_machines.xml      |  6 +--
 2 files changed, 1 insertion(+), 47 deletions(-)
 delete mode 100644 cime_config/machines/cmake_macros/craygnu-hipcc.cmake

diff --git a/cime_config/machines/cmake_macros/craygnu-hipcc.cmake b/cime_config/machines/cmake_macros/craygnu-hipcc.cmake
deleted file mode 100644
index 358a14ba2d85..000000000000
--- a/cime_config/machines/cmake_macros/craygnu-hipcc.cmake
+++ /dev/null
@@ -1,42 +0,0 @@
-set(MPICC "cc")
-set(MPICXX "hipcc") # Needs MPICH_CXX to use hipcc
-set(MPIFC "ftn") # Linker needs to be the Cray wrapper ftn, not mpif90
-set(SCC "cc")
-set(SCXX "hipcc")
-set(SFC "ftn")
-
-string(APPEND CPPDEFS " -DLINUX -DFORTRANUNDERSCORE -DNO_R16 -DCPRGNU -DCLANGOPT_WORKAROUND -DMPINIT_WORKAROUND=1")
-if (COMP_NAME STREQUAL gptl)
-    string(APPEND CPPDEFS " -DHAVE_NANOTIME -DBIT64 -DHAVE_SLASHPROC -DHAVE_COMM_F2C -DHAVE_TIMES -DHAVE_GETTIMEOFDAY")
-endif()
-string(APPEND CMAKE_Fortran_FLAGS " -fconvert=big-endian -ffree-line-length-none -ffixed-line-length-none -fallow-argument-mismatch")
-
-string(APPEND CMAKE_C_FLAGS_DEBUG " -O0 -g -Wall -fbacktrace -fcheck=bounds -ffpe-trap=invalid,zero,overflow")
-string(APPEND CMAKE_Fortran_FLAGS_DEBUG " -O0 -g -Wall -fbacktrace -fcheck=bounds -ffpe-trap=zero,overflow")
-string(APPEND CMAKE_CXX_FLAGS_DEBUG " -O0 -g -Wall -fbacktrace")
-
-string(APPEND CMAKE_C_FLAGS_RELEASE " -g -O2")
-string(APPEND CMAKE_CXX_FLAGS_RELEASE " -g -O2")
-string(APPEND CMAKE_Fortran_FLAGS_RELEASE " -g -O2")
-
-if (COMP_NAME STREQUAL csm_share)
-  string(APPEND CMAKE_C_FLAGS " -std=c99")
-endif()
-string(APPEND CMAKE_Fortran_FORMAT_FIXED_FLAG " -ffixed-form")
-string(APPEND CMAKE_Fortran_FORMAT_FREE_FLAG " -ffree-form")
-
-set(E3SM_LINK_WITH_FORTRAN "TRUE")
-string(APPEND CMAKE_CXX_FLAGS " -I$ENV{MPICH_DIR}/include")
-string(APPEND CMAKE_EXE_LINKER_FLAGS " -L$ENV{ROCM_PATH}/lib -lamdhip64")
-
-if (compile_threaded)
-  string(APPEND CMAKE_C_FLAGS " -fopenmp")
-  string(APPEND CMAKE_Fortran_FLAGS " -fopenmp")
-  string(APPEND CMAKE_CXX_FLAGS " -fopenmp=libgomp")
-  string(APPEND CMAKE_EXE_LINKER_FLAGS " -fopenmp")
-endif()
-
-string(APPEND KOKKOS_OPTIONS " -DKokkos_ENABLE_HIP=On -DKokkos_ARCH_ZEN3=On -DKokkos_ARCH_VEGA90A=On -DKokkos_ENABLE_OPENMP=Off")
-
-set(USE_HIP "TRUE")
-string(APPEND CMAKE_HIP_FLAGS "$ENV{CXXFLAGS} --offload-arch=gfx90a -munsafe-fp-atomics")
diff --git a/cime_config/machines/config_machines.xml b/cime_config/machines/config_machines.xml
index febb09103bf3..85cf8e5a600e 100644
--- a/cime_config/machines/config_machines.xml
+++ b/cime_config/machines/config_machines.xml
@@ -1273,7 +1273,7 @@
     <DESC>Frontier. AMD EPYC 7A53 64C nodes, 128 hwthreads, 512GB DDR4, 4 MI250X GPUs.</DESC>
     <NODENAME_REGEX>.*frontier.*</NODENAME_REGEX>
     <OS>Linux</OS>
-    <COMPILERS>craygnu-hipcc,craygnu-mphipcc,craycray-mphipcc,crayamd-mphipcc,craygnu,craycray,crayamd</COMPILERS>
+    <COMPILERS>craygnu-mphipcc,craycray-mphipcc,crayamd-mphipcc,craygnu,craycray,crayamd</COMPILERS>
     <MPILIBS>mpich</MPILIBS>
     <PROJECT>cli115</PROJECT>
     <SAVE_TIMING_DIR>/lustre/orion/proj-shared/cli115</SAVE_TIMING_DIR>
@@ -1327,10 +1327,6 @@
         <command name="load">cray-parallel-netcdf/1.12.3.15</command>
         <command name="unload">darshan-runtime</command>
       </modules>
-      <modules compiler="craygnu-hipcc">
-        <command name="load">craype-accel-amd-gfx90a</command>
-        <command name="load">rocm/6.2.4</command>
-      </modules>
       <modules compiler="craygnu-mphipcc">
         <command name="load">craype-accel-amd-gfx90a</command>
         <command name="load">rocm/6.2.4</command>