Update nekRS flags

repos/spack_repo/hygon/tsoc/packages/nekrs/package.py

@@ -8,11 +8,11 @@ from spack.package import *
 from spack_repo.builtin.build_systems import cmake, generic
 from spack_repo.builtin.build_systems.cmake import CMakePackage
 from spack_repo.builtin.build_systems.cuda import CudaPackage
-from spack_repo.builtin.build_systems.generic import Package
+
 from spack_repo.builtin.build_systems.rocm import ROCmPackage
 
 
-class Nekrs(Package, CMakePackage, CudaPackage, ROCmPackage):
+class Nekrs(CMakePackage, CudaPackage, ROCmPackage):
     """nekRS is an open-source Navier Stokes solver based on the spectral
     element method targeting classical processors and hardware accelerators
     like GPUs"""
@@ -208,6 +208,9 @@ class CMakeBuilder(cmake.CMakeBuilder):
 
     def cmake_args(self):
         cxxflags = self.spec.compiler_flags.get("cxxflags", [])
+        cflags = self.spec.compiler_flags.get("cflags", [])
+        fflags = self.spec.compiler_flags.get("fflags", [])
+
         args = [
             # Match upstream recommended usage: MPI wrappers for all languages.
             self.define("CMAKE_C_COMPILER", self.spec["mpi"].mpicc),
@@ -215,7 +218,6 @@ class CMakeBuilder(cmake.CMakeBuilder):
             self.define("CMAKE_Fortran_COMPILER", self.spec["mpi"].mpifc),
             self.define("OCCA_CXX", self.spec["mpi"].mpicxx),
             self.define_from_variant("NEKRS_GPU_MPI", "gpu_aware_mpi"),
-            self.define_from_variant("ENABLE_AMGX", "amgx"),
             self.define_from_variant("ENABLE_CVODE", "cvode"),
             self.define_from_variant("ENABLE_HYPRE_GPU", "hypre"),
         ]
@@ -241,14 +243,25 @@ class CMakeBuilder(cmake.CMakeBuilder):
                     self.define_from_variant("ENABLE_OPENCL", "opencl"),
                     self.define_from_variant("ENABLE_HIP", "rocm"),
                     self.define_from_variant("ENABLE_DPCPP", "dpcpp"),
+                    self.define_from_variant("ENABLE_AMGX", "amgx"),
                 ]
             )
+
+        # OCCA is C++ only
         if cxxflags:
-            cxxflags_str = " ".join(cxxflags)
-            args.extend(
-                [
-                    self.define("NEKRS_COMPILER_FLAGS", cxxflags_str),
-                    self.define("OCCA_CXXFLAGS", cxxflags_str),
-                ]
-            )
+            args.append(self.define("OCCA_CXXFLAGS", " ".join(cxxflags)))
+
+        if self.spec.satisfies("@26.0:"):
+            # v26.0 split NEKRS_COMPILER_FLAGS into per-language variables.
+            if cxxflags:
+                args.append(self.define("NEKRS_CXX_FLAGS", " ".join(cxxflags)))
+            if cflags:
+                args.append(self.define("NEKRS_C_FLAGS", " ".join(cflags)))
+            if fflags:
+                args.append(self.define("NEKRS_Fortran_FLAGS", " ".join(fflags)))
+        else:
+            # v23.0 uses unified NEKRS_COMPILER_FLAGS for all languages.
+            if cxxflags:
+                args.append(self.define("NEKRS_COMPILER_FLAGS", " ".join(cxxflags)))
+
         return args