From e2347cd24536af5f417fc8c9c5db20fd6210c4b8 Mon Sep 17 00:00:00 2001 From: Harmen Stoppels Date: Tue, 21 May 2024 16:41:14 +0200 Subject: [PATCH 1/6] bison: add missing diffutils build dep --- var/spack/repos/builtin/packages/bison/package.py | 1 + 1 file changed, 1 insertion(+) diff --git a/var/spack/repos/builtin/packages/bison/package.py b/var/spack/repos/builtin/packages/bison/package.py index 709e8905678511..e3305d7a8f1653 100644 --- a/var/spack/repos/builtin/packages/bison/package.py +++ b/var/spack/repos/builtin/packages/bison/package.py @@ -59,6 +59,7 @@ class Bison(AutotoolsPackage, GNUMirrorPackage): depends_on("gettext", when="+color") depends_on("m4@1.4.6:", type=("build", "run")) + depends_on("diffutils", type="build") patch("pgi.patch", when="@3.0.4") # The NVIDIA compilers do not currently support some GNU builtins. From 6fea6dab343d2fe682c24d7b595bae69d18ff431 Mon Sep 17 00:00:00 2001 From: Harshula Jayasuriya Date: Fri, 14 Jun 2024 10:58:50 +1000 Subject: [PATCH 2/6] openmpi: disable remark 10441 for intel classic 2021.7.0 or newer (#44614) * Compilation of openmpi fails when intel classic compiler 2021.7.0 or newer is used. --- .../repos/builtin/packages/openmpi/package.py | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/var/spack/repos/builtin/packages/openmpi/package.py b/var/spack/repos/builtin/packages/openmpi/package.py index c3d07aa8ce768f..39265d859685fa 100644 --- a/var/spack/repos/builtin/packages/openmpi/package.py +++ b/var/spack/repos/builtin/packages/openmpi/package.py @@ -1174,6 +1174,23 @@ def configure_args(self): # if spec.satisfies("@5.0.0:") and spec.satisfies("%oneapi"): # config_args.append("--disable-io-romio") + # https://www.intel.com/content/www/us/en/developer/articles/release-notes/oneapi-c-compiler-release-notes.html : + # Key Features in Intel C++ Compiler Classic 2021.7 + # + # The Intel C++ Classic Compiler is deprecated and an additional + # diagnostic message will be output with each invocation. This + # diagnostic may impact expected output during compilation. For + # example, using the compiler to produce preprocessed information + # (icpc -E) will produce the additional deprecation diagnostic, + # interfering with the expected preprocessed output. + # + # This output can be disabled by using -diag-disable=10441 on + # Linux/macOS or /Qdiag-disable:10441 on Windows. You can add this + # option on the command line, configuration file or option setting + # environment variables. + if spec.satisfies("%intel@2021.7.0:"): + config_args.append("CPPFLAGS=-diag-disable=10441") + return config_args @run_after("install", when="+wrapper-rpath") From d7cf46c839d49af84dac543cf7bd315e6df3ae9b Mon Sep 17 00:00:00 2001 From: Harshula Jayasuriya Date: Thu, 18 Jul 2024 17:50:35 +1000 Subject: [PATCH 3/6] fms: revert changes from d21aa1cc124a8f005c8d400637dc180e6ab85529 --- var/spack/repos/builtin/packages/fms/package.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/var/spack/repos/builtin/packages/fms/package.py b/var/spack/repos/builtin/packages/fms/package.py index 95465966a5683e..4bfbe8426fd96b 100644 --- a/var/spack/repos/builtin/packages/fms/package.py +++ b/var/spack/repos/builtin/packages/fms/package.py @@ -112,4 +112,8 @@ def cmake_args(self): self.define_from_variant("USE_DEPRECATED_IO", "deprecated_io"), ] + args.append(self.define("CMAKE_C_COMPILER", self.spec["mpi"].mpicc)) + args.append(self.define("CMAKE_CXX_COMPILER", self.spec["mpi"].mpicxx)) + args.append(self.define("CMAKE_Fortran_COMPILER", self.spec["mpi"].mpifc)) + return args From 4d22b40cb9e97e9b1ad71641ca772386cba45e7c Mon Sep 17 00:00:00 2001 From: Paul Leopardi Date: Wed, 25 Sep 2024 00:01:32 +1000 Subject: [PATCH 4/6] Add um version to fiat, using ACCESS-NRI repo and CMake env variables --- var/spack/repos/builtin/packages/fiat/package.py | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/var/spack/repos/builtin/packages/fiat/package.py b/var/spack/repos/builtin/packages/fiat/package.py index 488ecf450d85a4..ed1c7155095c15 100644 --- a/var/spack/repos/builtin/packages/fiat/package.py +++ b/var/spack/repos/builtin/packages/fiat/package.py @@ -11,14 +11,15 @@ class Fiat(CMakePackage): Fortran utility libraries, extracted from the IFS/Arpege model.""" homepage = "https://github.com/ecmwf-ifs/fiat" - git = "https://github.com/ecmwf-ifs/fiat.git" + git = "https://github.com/ACCESS-NRI/fiat.git" url = "https://github.com/ecmwf-ifs/fiat/archive/1.0.0.tar.gz" - maintainers("climbfuji") + maintainers("climbfuji", "penguian") license("Apache-2.0") version("main", branch="main", no_cache=True) + version("um", branch="um", no_cache=True) version("1.2.0", sha256="758147410a4a3c493290b87443b4091660b915fcf29f7c4d565c5168ac67745f") version("1.1.0", sha256="58354e60d29a1b710bfcea9b87a72c0d89c39182cb2c9523ead76a142c695f82") version("1.0.0", sha256="45afe86117142831fdd61771cf59f31131f2b97f52a2bd04ac5eae9b2ab746b8") @@ -39,7 +40,7 @@ class Fiat(CMakePackage): depends_on("eckit", when="+fckit") depends_on("fckit", when="+fckit") - patch("intel_warnings_v110.patch", when="@:1.1.0") + patch("intel_warnings_v110.patch", when="@0:1.1.0") patch("intel_warnings_v120.patch", when="@1.2.0:") def cmake_args(self): @@ -48,5 +49,9 @@ def cmake_args(self): self.define_from_variant("ENABLE_MPI", "mpi"), self.define_from_variant("ENABLE_FCKIT", "fckit"), ] - + if "+mpi" in self.spec: + args.extend([ + self.define("CMAKE_C_COMPILER", self.spec["mpi"].mpicc), + self.define("CMAKE_CXX_COMPILER", self.spec["mpi"].mpicxx), + self.define("CMAKE_Fortran_COMPILER", self.spec["mpi"].mpifc)]) return args From 793203d8534564423afd2c7a4c1b4b48f4679e43 Mon Sep 17 00:00:00 2001 From: Paul Leopardi Date: Wed, 25 Sep 2024 00:17:56 +1000 Subject: [PATCH 5/6] Fix style --- var/spack/repos/builtin/packages/fiat/package.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/var/spack/repos/builtin/packages/fiat/package.py b/var/spack/repos/builtin/packages/fiat/package.py index ed1c7155095c15..2e8c69f2b3e48e 100644 --- a/var/spack/repos/builtin/packages/fiat/package.py +++ b/var/spack/repos/builtin/packages/fiat/package.py @@ -50,8 +50,11 @@ def cmake_args(self): self.define_from_variant("ENABLE_FCKIT", "fckit"), ] if "+mpi" in self.spec: - args.extend([ - self.define("CMAKE_C_COMPILER", self.spec["mpi"].mpicc), - self.define("CMAKE_CXX_COMPILER", self.spec["mpi"].mpicxx), - self.define("CMAKE_Fortran_COMPILER", self.spec["mpi"].mpifc)]) + args.extend( + [ + self.define("CMAKE_C_COMPILER", self.spec["mpi"].mpicc), + self.define("CMAKE_CXX_COMPILER", self.spec["mpi"].mpicxx), + self.define("CMAKE_Fortran_COMPILER", self.spec["mpi"].mpifc) + ] + ) return args From 56ff42e50b7f86fe1291c0552f1de9d9db5a9d8d Mon Sep 17 00:00:00 2001 From: Paul Leopardi Date: Wed, 25 Sep 2024 00:52:24 +1000 Subject: [PATCH 6/6] Fix style --- var/spack/repos/builtin/packages/fiat/package.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/var/spack/repos/builtin/packages/fiat/package.py b/var/spack/repos/builtin/packages/fiat/package.py index 2e8c69f2b3e48e..c1c6f4f232de63 100644 --- a/var/spack/repos/builtin/packages/fiat/package.py +++ b/var/spack/repos/builtin/packages/fiat/package.py @@ -54,7 +54,7 @@ def cmake_args(self): [ self.define("CMAKE_C_COMPILER", self.spec["mpi"].mpicc), self.define("CMAKE_CXX_COMPILER", self.spec["mpi"].mpicxx), - self.define("CMAKE_Fortran_COMPILER", self.spec["mpi"].mpifc) + self.define("CMAKE_Fortran_COMPILER", self.spec["mpi"].mpifc), ] ) return args