diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9eb74858..f08821e7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -150,7 +150,7 @@ jobs: - setup-ci strategy: fail-fast: false - max-parallel: 5 + max-parallel: 20 matrix: package: ${{ fromJson(needs.setup-ci.outputs.matrix) }} exclude: diff --git a/spack_repo/access/nri/__init__.py b/spack_repo/access/nri/__init__.py index c4ecc87f..76062e9f 100644 --- a/spack_repo/access/nri/__init__.py +++ b/spack_repo/access/nri/__init__.py @@ -1,3 +1,3 @@ # Copyright Spack Project Developers. See COPYRIGHT file for details. # -# SPDX-License-Identifier: (Apache-2.0 OR MIT) +# SPDX-License-Identifier: (Apache-2.0 OR MIT)! diff --git a/spack_repo/access/nri/build_systems/um_base.py b/spack_repo/access/nri/build_systems/um_base.py index df0edd66..9c996d44 100644 --- a/spack_repo/access/nri/build_systems/um_base.py +++ b/spack_repo/access/nri/build_systems/um_base.py @@ -1,6 +1,6 @@ # Copyright Spack Project Developers. See COPYRIGHT file for details. # -# SPDX-License-Identifier: (Apache-2.0 OR MIT) +# SPDX-License-Identifier: (Apache-2.0 OR MIT)! # Copyright 2024-2026 ACCESS-NRI # Based on https://github.com/nci/spack-repo/blob/main/packages/um/package.py diff --git a/spack_repo/access/nri/packages/__init__.py b/spack_repo/access/nri/packages/__init__.py index c4ecc87f..76062e9f 100644 --- a/spack_repo/access/nri/packages/__init__.py +++ b/spack_repo/access/nri/packages/__init__.py @@ -1,3 +1,3 @@ # Copyright Spack Project Developers. See COPYRIGHT file for details. # -# SPDX-License-Identifier: (Apache-2.0 OR MIT) +# SPDX-License-Identifier: (Apache-2.0 OR MIT)! diff --git a/spack_repo/access/nri/packages/access3/package.py b/spack_repo/access/nri/packages/access3/package.py index d5b3f8d8..ea66d1f4 100644 --- a/spack_repo/access/nri/packages/access3/package.py +++ b/spack_repo/access/nri/packages/access3/package.py @@ -1,6 +1,6 @@ # Copyright Spack Project Developers. See COPYRIGHT file for details. # -# SPDX-License-Identifier: (Apache-2.0 OR MIT) +# SPDX-License-Identifier: (Apache-2.0 OR MIT)! from spack_repo.builtin.build_systems.cmake import CMakePackage from spack.package import * diff --git a/spack_repo/access/nri/packages/access3_share/package.py b/spack_repo/access/nri/packages/access3_share/package.py index d403bdf0..421278d3 100644 --- a/spack_repo/access/nri/packages/access3_share/package.py +++ b/spack_repo/access/nri/packages/access3_share/package.py @@ -1,6 +1,6 @@ # Copyright Spack Project Developers. See COPYRIGHT file for details. # -# SPDX-License-Identifier: (Apache-2.0 OR MIT) +# SPDX-License-Identifier: (Apache-2.0 OR MIT)! from spack_repo.builtin.build_systems.cmake import CMakePackage from spack.package import * diff --git a/spack_repo/access/nri/packages/access_am3/package.py b/spack_repo/access/nri/packages/access_am3/package.py index 72b255a3..8b4a9e95 100644 --- a/spack_repo/access/nri/packages/access_am3/package.py +++ b/spack_repo/access/nri/packages/access_am3/package.py @@ -2,7 +2,7 @@ # # Copyright 2025 ACCESS-NRI # -# SPDX-License-Identifier: (Apache-2.0 OR MIT) +# SPDX-License-Identifier: (Apache-2.0 OR MIT)! from spack_repo.builtin.build_systems.bundle import BundlePackage from spack.package import * diff --git a/spack_repo/access/nri/packages/access_cice/package.py b/spack_repo/access/nri/packages/access_cice/package.py index ca3ef6eb..52856c86 100644 --- a/spack_repo/access/nri/packages/access_cice/package.py +++ b/spack_repo/access/nri/packages/access_cice/package.py @@ -1,6 +1,6 @@ # Copyright Spack Project Developers. See COPYRIGHT file for details. # -# SPDX-License-Identifier: (Apache-2.0 OR MIT) +# SPDX-License-Identifier: (Apache-2.0 OR MIT)! from spack_repo.builtin.build_systems.cmake import CMakePackage from spack.package import * @@ -33,7 +33,7 @@ class AccessCice(CMakePackage): description="Install CICE as library for Access3 models" ) - variant("io_type", + variant("io_type", default="NetCDF", values=("NetCDF", "PIO", "Binary"), description="CICE IO Method" @@ -48,7 +48,7 @@ class AccessCice(CMakePackage): depends_on("c", type="build") depends_on("fortran", type="build") - depends_on("access3-share", when="+access3") + depends_on("access3-share", when="+access3") depends_on("cmake@3.18:", type="build") depends_on("mpi") depends_on("netcdf-fortran@4.6.0:", when="io_type=NetCDF") diff --git a/spack_repo/access/nri/packages/access_esm1p5/package.py b/spack_repo/access/nri/packages/access_esm1p5/package.py index 5cef716e..e48e1b80 100644 --- a/spack_repo/access/nri/packages/access_esm1p5/package.py +++ b/spack_repo/access/nri/packages/access_esm1p5/package.py @@ -1,6 +1,6 @@ # Copyright Spack Project Developers. See COPYRIGHT file for details. # -# SPDX-License-Identifier: (Apache-2.0 OR MIT) +# SPDX-License-Identifier: (Apache-2.0 OR MIT)! from spack_repo.builtin.build_systems.bundle import BundlePackage from spack.package import * diff --git a/spack_repo/access/nri/packages/access_esm1p6/package.py b/spack_repo/access/nri/packages/access_esm1p6/package.py index aa5fdeac..77ddcb6d 100644 --- a/spack_repo/access/nri/packages/access_esm1p6/package.py +++ b/spack_repo/access/nri/packages/access_esm1p6/package.py @@ -1,6 +1,6 @@ # Copyright Spack Project Developers. See COPYRIGHT file for details. # -# SPDX-License-Identifier: (Apache-2.0 OR MIT) +# SPDX-License-Identifier: (Apache-2.0 OR MIT)! from spack_repo.builtin.build_systems.bundle import BundlePackage from spack.package import * diff --git a/spack_repo/access/nri/packages/access_fms/package.py b/spack_repo/access/nri/packages/access_fms/package.py index 8967b294..51eee58a 100644 --- a/spack_repo/access/nri/packages/access_fms/package.py +++ b/spack_repo/access/nri/packages/access_fms/package.py @@ -3,7 +3,7 @@ # # Copyright 2024 ACCESS-NRI # -# SPDX-License-Identifier: (Apache-2.0 OR MIT) +# SPDX-License-Identifier: (Apache-2.0 OR MIT)! from spack_repo.builtin.build_systems.cmake import CMakePackage from spack.package import * diff --git a/spack_repo/access/nri/packages/access_generic_tracers/package.py b/spack_repo/access/nri/packages/access_generic_tracers/package.py index 9af3f74e..7cfcb11c 100644 --- a/spack_repo/access/nri/packages/access_generic_tracers/package.py +++ b/spack_repo/access/nri/packages/access_generic_tracers/package.py @@ -1,7 +1,7 @@ # Copyright 2013-2024 Lawrence Livermore National Security, LLC and other # Spack Project Developers. See the top-level COPYRIGHT file for details. # -# SPDX-License-Identifier: (Apache-2.0 OR MIT) +# SPDX-License-Identifier: (Apache-2.0 OR MIT)! from spack_repo.builtin.build_systems.cmake import CMakePackage from spack.package import * diff --git a/spack_repo/access/nri/packages/access_issm/package.py b/spack_repo/access/nri/packages/access_issm/package.py index 543863d1..833a6957 100644 --- a/spack_repo/access/nri/packages/access_issm/package.py +++ b/spack_repo/access/nri/packages/access_issm/package.py @@ -2,7 +2,7 @@ # # Copyright 2025 ACCESS-NRI # -# SPDX-License-Identifier: (Apache-2.0 OR MIT) +# SPDX-License-Identifier: (Apache-2.0 OR MIT)! from spack_repo.builtin.build_systems.bundle import BundlePackage from spack.package import * diff --git a/spack_repo/access/nri/packages/access_mocsy/package.py b/spack_repo/access/nri/packages/access_mocsy/package.py index 5e3e7cd6..097ae6f8 100644 --- a/spack_repo/access/nri/packages/access_mocsy/package.py +++ b/spack_repo/access/nri/packages/access_mocsy/package.py @@ -3,7 +3,7 @@ # # Copyright 2024 ACCESS-NRI # -# SPDX-License-Identifier: (Apache-2.0 OR MIT) +# SPDX-License-Identifier: (Apache-2.0 OR MIT)! from spack_repo.builtin.build_systems import cmake, makefile from spack_repo.builtin.build_systems.cmake import CMakePackage @@ -148,4 +148,3 @@ def install(self, pkg, spec, prefix): for f in self._modfiles: install(join_path(pkg.stage.source_path, f), prefix.include) install(join_path(pkg.stage.source_path, self._pcfile), pkgconfdir) - diff --git a/spack_repo/access/nri/packages/access_mom6/package.py b/spack_repo/access/nri/packages/access_mom6/package.py index dc75ca1a..0231ca1e 100644 --- a/spack_repo/access/nri/packages/access_mom6/package.py +++ b/spack_repo/access/nri/packages/access_mom6/package.py @@ -1,6 +1,6 @@ # Copyright Spack Project Developers. See COPYRIGHT file for details. # -# SPDX-License-Identifier: (Apache-2.0 OR MIT) +# SPDX-License-Identifier: (Apache-2.0 OR MIT)! from spack_repo.builtin.build_systems.cmake import CMakePackage from spack.package import * diff --git a/spack_repo/access/nri/packages/access_om2/package.py b/spack_repo/access/nri/packages/access_om2/package.py index 0948b120..0ba621d1 100644 --- a/spack_repo/access/nri/packages/access_om2/package.py +++ b/spack_repo/access/nri/packages/access_om2/package.py @@ -3,7 +3,7 @@ # # Copyright 2023 ACCESS-NRI # -# SPDX-License-Identifier: (Apache-2.0 OR MIT) +# SPDX-License-Identifier: (Apache-2.0 OR MIT)! from spack_repo.builtin.build_systems.bundle import BundlePackage from spack.package import * diff --git a/spack_repo/access/nri/packages/access_om2_bgc/package.py b/spack_repo/access/nri/packages/access_om2_bgc/package.py index 71e25f69..ad2083e7 100644 --- a/spack_repo/access/nri/packages/access_om2_bgc/package.py +++ b/spack_repo/access/nri/packages/access_om2_bgc/package.py @@ -3,7 +3,7 @@ # # Copyright 2023 ACCESS-NRI # -# SPDX-License-Identifier: (Apache-2.0 OR MIT) +# SPDX-License-Identifier: (Apache-2.0 OR MIT)! from spack_repo.builtin.build_systems.bundle import BundlePackage from spack.package import * diff --git a/spack_repo/access/nri/packages/access_om3/package.py b/spack_repo/access/nri/packages/access_om3/package.py index 998b87d1..a47e3da7 100644 --- a/spack_repo/access/nri/packages/access_om3/package.py +++ b/spack_repo/access/nri/packages/access_om3/package.py @@ -1,6 +1,6 @@ # Copyright Spack Project Developers. See COPYRIGHT file for details. # -# SPDX-License-Identifier: (Apache-2.0 OR MIT) +# SPDX-License-Identifier: (Apache-2.0 OR MIT)! from spack_repo.builtin.build_systems.bundle import BundlePackage from spack.package import * diff --git a/spack_repo/access/nri/packages/access_ram3/package.py b/spack_repo/access/nri/packages/access_ram3/package.py index 077b50f9..a3beb395 100644 --- a/spack_repo/access/nri/packages/access_ram3/package.py +++ b/spack_repo/access/nri/packages/access_ram3/package.py @@ -3,7 +3,7 @@ # # Copyright 2024 ACCESS-NRI # -# SPDX-License-Identifier: (Apache-2.0 OR MIT) +# SPDX-License-Identifier: (Apache-2.0 OR MIT)! from spack_repo.builtin.build_systems.bundle import BundlePackage from spack.package import * diff --git a/spack_repo/access/nri/packages/access_test/package.py b/spack_repo/access/nri/packages/access_test/package.py index 542d2cc8..8cb9877e 100644 --- a/spack_repo/access/nri/packages/access_test/package.py +++ b/spack_repo/access/nri/packages/access_test/package.py @@ -3,7 +3,7 @@ # # Copyright 2024 ACCESS-NRI # -# SPDX-License-Identifier: (Apache-2.0 OR MIT) +# SPDX-License-Identifier: (Apache-2.0 OR MIT)! from spack_repo.builtin.build_systems.bundle import BundlePackage from spack.package import * diff --git a/spack_repo/access/nri/packages/access_test_component/package.py b/spack_repo/access/nri/packages/access_test_component/package.py index 0b9b462d..35212e21 100644 --- a/spack_repo/access/nri/packages/access_test_component/package.py +++ b/spack_repo/access/nri/packages/access_test_component/package.py @@ -1,6 +1,6 @@ # Copyright Spack Project Developers. See COPYRIGHT file for details. # -# SPDX-License-Identifier: (Apache-2.0 OR MIT) +# SPDX-License-Identifier: (Apache-2.0 OR MIT)! # Based on spack/var/spack/repos/builtin/packages/fiat/package.py diff --git a/spack_repo/access/nri/packages/access_triangle/package.py b/spack_repo/access/nri/packages/access_triangle/package.py index 0748d12e..eb36e58f 100644 --- a/spack_repo/access/nri/packages/access_triangle/package.py +++ b/spack_repo/access/nri/packages/access_triangle/package.py @@ -1,6 +1,6 @@ # Copyright Spack Project Developers. See COPYRIGHT file for details. # -# SPDX-License-Identifier: (Apache-2.0 OR MIT) +# SPDX-License-Identifier: (Apache-2.0 OR MIT)! from spack_repo.builtin.build_systems.makefile import MakefilePackage @@ -17,11 +17,11 @@ class AccessTriangle(MakefilePackage): homepage = "https://github.com/ACCESS-NRI/issm-triangle" git = 'https://github.com/ACCESS-NRI/issm-triangle.git' - + maintainers("justinh2002") version("1.6.1", branch="main") - + # variant for building the showme utility (requires X11). variant("showme", default=False, description="Build the showme utility (requires libX11).") @@ -30,7 +30,7 @@ class AccessTriangle(MakefilePackage): # Make libX11 conditional on +showme depends_on("libx11", when="+showme", type="link") - + def url_for_version(self, version): return "https://github.com/ACCESS-NRI/issm-triangle/archive/refs/heads/{0}.tar.gz".format(version) @@ -41,13 +41,13 @@ def edit(self, spec, prefix): """ src_dir = join_path(self.stage.source_path, "src") mkdirp(src_dir) - + # Copy necessary files to src directory install("configs/makefile", src_dir) install("configs/linux/configure.make", src_dir) install("triangle.c", src_dir) install("triangle.h", src_dir) - + def build(self, spec, prefix): """ This is where we actually call `make shared`. @@ -57,7 +57,7 @@ def build(self, spec, prefix): make("shared") if "+showme" in spec: make("showme") - + def install(self, spec, prefix): """ @@ -73,15 +73,10 @@ def install(self, spec, prefix): # Make sure we see what's actually there, for debugging: # ls_output = os.listdir('.') # print("Files in build directory:\n", ls_output) - + install("triangle.h", prefix.include) install("libtriangle.so", prefix.lib) - + # Install showme only if +showme is chosen if "+showme" in spec: install("showme", prefix.bin) - - - - - diff --git a/spack_repo/access/nri/packages/access_ww3/package.py b/spack_repo/access/nri/packages/access_ww3/package.py index fa23015a..9ae8cdd9 100644 --- a/spack_repo/access/nri/packages/access_ww3/package.py +++ b/spack_repo/access/nri/packages/access_ww3/package.py @@ -1,6 +1,6 @@ # Copyright Spack Project Developers. See COPYRIGHT file for details. # -# SPDX-License-Identifier: (Apache-2.0 OR MIT) +# SPDX-License-Identifier: (Apache-2.0 OR MIT)! from spack_repo.builtin.build_systems.cmake import CMakePackage from spack.package import * diff --git a/spack_repo/access/nri/packages/adjoint_petsc/package.py b/spack_repo/access/nri/packages/adjoint_petsc/package.py index 5e51901d..a12efc83 100644 --- a/spack_repo/access/nri/packages/adjoint_petsc/package.py +++ b/spack_repo/access/nri/packages/adjoint_petsc/package.py @@ -1,6 +1,6 @@ # Copyright Spack Project Developers. See COPYRIGHT file for details. # -# SPDX-License-Identifier: (Apache-2.0 OR MIT) +# SPDX-License-Identifier: (Apache-2.0 OR MIT)! from spack_repo.builtin.build_systems.cmake import CMakePackage from spack.package import * @@ -9,9 +9,9 @@ class AdjointPetsc(CMakePackage): """adjoint-PETSc is a beta library that provides algorithmic differentiation support for PETSc, currently targeting the subset - of functionality required by ISSM. - - Warning: This library is no longer under active development, + of functionality required by ISSM. + + Warning: This library is no longer under active development, but is available for use in ISSM for users who need it. Features: diff --git a/spack_repo/access/nri/packages/ancoms_roms/package.py b/spack_repo/access/nri/packages/ancoms_roms/package.py index e5456e85..57f71d25 100644 --- a/spack_repo/access/nri/packages/ancoms_roms/package.py +++ b/spack_repo/access/nri/packages/ancoms_roms/package.py @@ -1,6 +1,6 @@ # Copyright Spack Project Developers. See COPYRIGHT file for details. # -# SPDX-License-Identifier: (Apache-2.0 OR MIT) +# SPDX-License-Identifier: (Apache-2.0 OR MIT)! import os import sys diff --git a/spack_repo/access/nri/packages/cable/package.py b/spack_repo/access/nri/packages/cable/package.py index ce0acfac..7d806a6a 100644 --- a/spack_repo/access/nri/packages/cable/package.py +++ b/spack_repo/access/nri/packages/cable/package.py @@ -1,6 +1,6 @@ # Copyright Spack Project Developers. See COPYRIGHT file for details. # -# SPDX-License-Identifier: (Apache-2.0 OR MIT) +# SPDX-License-Identifier: (Apache-2.0 OR MIT)! from spack_repo.builtin.build_systems.cmake import CMakePackage from spack.package import * @@ -16,7 +16,7 @@ class Cable(CMakePackage): git = "https://github.com/CABLE-LSM/CABLE.git" maintainers("SeanBryan51", "Whyborn") - + license("LicenseRef-CSIRO-Open-Source-Software-License-v1.0", checked_by="anton-seaice") version("stable", branch="main", preferred=True) diff --git a/spack_repo/access/nri/packages/cice4/package.py b/spack_repo/access/nri/packages/cice4/package.py index 6cc70c4d..2f3baa72 100644 --- a/spack_repo/access/nri/packages/cice4/package.py +++ b/spack_repo/access/nri/packages/cice4/package.py @@ -1,6 +1,6 @@ # Copyright Spack Project Developers. See COPYRIGHT file for details. # -# SPDX-License-Identifier: (Apache-2.0 OR MIT) +# SPDX-License-Identifier: (Apache-2.0 OR MIT)! # Based on packages/cice5/package.py and other sources noted below. diff --git a/spack_repo/access/nri/packages/cice5/package.py b/spack_repo/access/nri/packages/cice5/package.py index 1ef0c6d6..e78d298e 100644 --- a/spack_repo/access/nri/packages/cice5/package.py +++ b/spack_repo/access/nri/packages/cice5/package.py @@ -1,6 +1,6 @@ # Copyright Spack Project Developers. See COPYRIGHT file for details. # -# SPDX-License-Identifier: (Apache-2.0 OR MIT) +# SPDX-License-Identifier: (Apache-2.0 OR MIT)! from spack_repo.builtin.build_systems import cmake, makefile from spack_repo.builtin.build_systems.cmake import CMakePackage @@ -30,8 +30,8 @@ def _int_validator(s): class Cice5(CMakePackage, MakefilePackage): - """The Los Alamos sea ice model (CICE) is the result of an effort to develop - a computationally efficient sea ice component for a fully coupled + """The Los Alamos sea ice model (CICE) is the result of an effort to develop + a computationally efficient sea ice component for a fully coupled atmosphere-land global climate model.""" homepage = "https://www.access-nri.org.au" @@ -160,7 +160,7 @@ def cmake_args(self): @property def build_dirname(self) -> str: - """Directory name to use when building the package. + """Directory name to use when building the package. We modify this using _layout to ensure uniqueness with multiple builds """ build = ( @@ -171,20 +171,20 @@ def build_dirname(self) -> str: return f"{super().build_dirname}/{build}" def set_layouts(self, pkg, spec, prefix): - """Layout of cice processors to use. If variants are set, use those. + """Layout of cice processors to use. If variants are set, use those. Otherwise, use defaults.""" layout_variants = OM2_LAYOUTS[0].keys() # if all 5 layouts variants are available, set the layouts dict if all([ - self.spec.variants[variant].value != 'none' + self.spec.variants[variant].value != 'none' for variant in layout_variants ]): layouts = [{variant: self.spec.variants[variant].value for variant in layout_variants}] # else if no layout variants are available, use the defaults elif all([ - self.spec.variants[variant].value == 'none' + self.spec.variants[variant].value == 'none' for variant in layout_variants ]): if self.spec.variants["model"].value == "access-esm1.6": @@ -256,7 +256,7 @@ def set_deps_targets(self, pkg, spec, prefix): if self.spec.variants["model"].value == "access-esm1.6": # The integer represents environment variable NTASK # esm1.5 used 12 (cice4), cm2 used 16 (cice5), build both for testing - self.__targets = {12: {}, 16: {}} + self.__targets = {12: {}, 16: {}} self.add_target(12, "access-esm1.6", "360x300", "12x1") self.add_target(16, "access-esm1.6", "360x300", "8x2") diff --git a/spack_repo/access/nri/packages/coastri_roms/package.py b/spack_repo/access/nri/packages/coastri_roms/package.py index e3a4df08..3d287f1c 100644 --- a/spack_repo/access/nri/packages/coastri_roms/package.py +++ b/spack_repo/access/nri/packages/coastri_roms/package.py @@ -1,6 +1,6 @@ # Copyright Spack Project Developers. See COPYRIGHT file for details. # -# SPDX-License-Identifier: (Apache-2.0 OR MIT) +# SPDX-License-Identifier: (Apache-2.0 OR MIT)! from spack_repo.builtin.build_systems.bundle import BundlePackage diff --git a/spack_repo/access/nri/packages/datetime_fortran/package.py b/spack_repo/access/nri/packages/datetime_fortran/package.py index 1175c903..7c19e98c 100644 --- a/spack_repo/access/nri/packages/datetime_fortran/package.py +++ b/spack_repo/access/nri/packages/datetime_fortran/package.py @@ -1,7 +1,7 @@ # Copyright 2013-2022 Lawrence Livermore National Security, LLC and other # Spack Project Developers. See the top-level COPYRIGHT file for details. # -# SPDX-License-Identifier: (Apache-2.0 OR MIT) +# SPDX-License-Identifier: (Apache-2.0 OR MIT)! # ---------------------------------------------------------------------------- # If you submit this package back to Spack as a pull request, diff --git a/spack_repo/access/nri/packages/dummygrib/package.py b/spack_repo/access/nri/packages/dummygrib/package.py index 103a5c73..6bafda28 100644 --- a/spack_repo/access/nri/packages/dummygrib/package.py +++ b/spack_repo/access/nri/packages/dummygrib/package.py @@ -4,7 +4,7 @@ # Copyright 2024 ACCESS-NRI # Based on https://github.com/coecms/access-esm-build-gadi/blob/master/Makefile # -# SPDX-License-Identifier: (Apache-2.0 OR MIT) +# SPDX-License-Identifier: (Apache-2.0 OR MIT)! from spack_repo.builtin.build_systems.makefile import MakefilePackage from spack.package import * @@ -31,4 +31,3 @@ def install(self, spec, prefix): install( "libdummygrib.a", join_path(prefix.lib, "libdummygrib.a")) - diff --git a/spack_repo/access/nri/packages/fiat/package.py b/spack_repo/access/nri/packages/fiat/package.py index aab16cb2..eb44ec55 100644 --- a/spack_repo/access/nri/packages/fiat/package.py +++ b/spack_repo/access/nri/packages/fiat/package.py @@ -1,7 +1,7 @@ # Copyright 2013-2024 Lawrence Livermore National Security, LLC and other # Spack Project Developers. See the top-level COPYRIGHT file for details. # -# SPDX-License-Identifier: (Apache-2.0 OR MIT) +# SPDX-License-Identifier: (Apache-2.0 OR MIT)! # Based on spack/var/spack/repos/builtin/packages/fiat/package.py diff --git a/spack_repo/access/nri/packages/fortranxml/package.py b/spack_repo/access/nri/packages/fortranxml/package.py index abbff132..4780f425 100644 --- a/spack_repo/access/nri/packages/fortranxml/package.py +++ b/spack_repo/access/nri/packages/fortranxml/package.py @@ -1,7 +1,7 @@ # Copyright 2013-2022 Lawrence Livermore National Security, LLC and other # Spack Project Developers. See the top-level COPYRIGHT file for details. # -# SPDX-License-Identifier: (Apache-2.0 OR MIT) +# SPDX-License-Identifier: (Apache-2.0 OR MIT)! from spack_repo.builtin.build_systems.autotools import AutotoolsPackage from spack.package import * diff --git a/spack_repo/access/nri/packages/fre_nctools/package.py b/spack_repo/access/nri/packages/fre_nctools/package.py index 689c438b..f6ed298a 100644 --- a/spack_repo/access/nri/packages/fre_nctools/package.py +++ b/spack_repo/access/nri/packages/fre_nctools/package.py @@ -2,7 +2,7 @@ # # Copyright 2025 ACCESS-NRI # -# SPDX-License-Identifier: (Apache-2.0 OR MIT) +# SPDX-License-Identifier: (Apache-2.0 OR MIT)! from spack_repo.builtin.build_systems.autotools import AutotoolsPackage from spack.package import * diff --git a/spack_repo/access/nri/packages/gcom/package.py b/spack_repo/access/nri/packages/gcom/package.py index 12834c14..a97707c7 100644 --- a/spack_repo/access/nri/packages/gcom/package.py +++ b/spack_repo/access/nri/packages/gcom/package.py @@ -1,6 +1,6 @@ # Copyright Spack Project Developers. See COPYRIGHT file for details. # -# SPDX-License-Identifier: (Apache-2.0 OR MIT) +# SPDX-License-Identifier: (Apache-2.0 OR MIT)! # Copyright 2024-2026 ACCESS-NRI diff --git a/spack_repo/access/nri/packages/gcom4/package.py b/spack_repo/access/nri/packages/gcom4/package.py index d34e3693..fc6b2a90 100644 --- a/spack_repo/access/nri/packages/gcom4/package.py +++ b/spack_repo/access/nri/packages/gcom4/package.py @@ -5,7 +5,7 @@ # Based on gcom/package.py by scottwales 2023 # and https://github.com/coecms/access-esm-build-gadi/blob/master/Makefile # -# SPDX-License-Identifier: (Apache-2.0 OR MIT) +# SPDX-License-Identifier: (Apache-2.0 OR MIT)! from spack_repo.builtin.build_systems.generic import Package from spack.package import * diff --git a/spack_repo/access/nri/packages/issm/package.py b/spack_repo/access/nri/packages/issm/package.py index 543db8e5..4923cccd 100644 --- a/spack_repo/access/nri/packages/issm/package.py +++ b/spack_repo/access/nri/packages/issm/package.py @@ -3,7 +3,7 @@ # Copyright 2023 Angus Gibson # Copyright 2025 Justin Kin Jun Hew - Wrappers, Examples, Versioning, AD-enabled flavour # -# SPDX-License-Identifier: (Apache-2.0 OR MIT) +# SPDX-License-Identifier: (Apache-2.0 OR MIT)! from spack_repo.builtin.build_systems.autotools import AutotoolsPackage from spack.package import * @@ -35,7 +35,7 @@ class Issm(AutotoolsPackage): version("main", branch="main") version("access-release", branch="access-release") version("access-development", branch="access-development") - + # same version string as the tag, so users can easily specify a specific tagged version if desired. # This is the recommended way to specify versions for reproducibility. version("2026.05.18", tag="2026.05.18", preferred=True) @@ -101,7 +101,7 @@ class Issm(AutotoolsPackage): with when("~production"): depends_on("petsc~examples+metis+mumps+scalapack") - # When building "production" ISSM, use a PETSc variant with optimizations and no debug symbols. + # When building "production" ISSM, use a PETSc variant with optimizations and no debug symbols. # This is the recommended configuration for production use, and ensures that users get the best performance out of the box. with when("+production"): depends_on("petsc~debug~examples+metis+mumps+scalapack") @@ -196,7 +196,7 @@ def configure_args(self): args += [ f"--with-petsc-dir={self.spec['petsc'].prefix}", ] - + # Always use --enable-development: ISSM's script-install machinery # (the if !DEVELOPMENT block in src/m/Makefile.am) requires $ISSM_DIR # to be set to the source tree at make time, which Spack does not do. diff --git a/spack_repo/access/nri/packages/libaccessom2/package.py b/spack_repo/access/nri/packages/libaccessom2/package.py index 33e40d74..02b5298d 100644 --- a/spack_repo/access/nri/packages/libaccessom2/package.py +++ b/spack_repo/access/nri/packages/libaccessom2/package.py @@ -3,7 +3,7 @@ # # Copyright 2022 ACCESS-NRI # -# SPDX-License-Identifier: (Apache-2.0 OR MIT) +# SPDX-License-Identifier: (Apache-2.0 OR MIT)! from spack_repo.builtin.build_systems.cmake import CMakePackage from spack.package import * diff --git a/spack_repo/access/nri/packages/mom5/package.py b/spack_repo/access/nri/packages/mom5/package.py index cf3d4905..1d2351dc 100644 --- a/spack_repo/access/nri/packages/mom5/package.py +++ b/spack_repo/access/nri/packages/mom5/package.py @@ -2,7 +2,7 @@ # # Copyright ACCESS-NRI # -# SPDX-License-Identifier: (Apache-2.0 OR MIT) +# SPDX-License-Identifier: (Apache-2.0 OR MIT)! from spack_repo.builtin.build_systems import cmake, makefile from spack.version.version_types import GitVersion, StandardVersion @@ -224,7 +224,7 @@ def edit(self, pkg, spec, prefix): MAKEFLAGS += --jobs=$(shell grep '^processor' /proc/cpuinfo | wc -l) -FPPFLAGS := +FPPFLAGS := FFLAGS := -fcray-pointer -fdefault-real-8 -ffree-line-length-none -fno-range-check -Waliasing -Wampersand -Warray-bounds -Wcharacter-truncation -Wconversion -Wline-truncation -Wintrinsics-std -Wsurprising -Wno-tabs -Wunderflow -Wunused-parameter -Wintrinsic-shadow -Wno-align-commons -fallow-argument-mismatch -fallow-invalid-boz FFLAGS += {incs} @@ -232,16 +232,16 @@ def edit(self, pkg, spec, prefix): # FFLAGS_OPT = -O2 -FFLAGS_REPRO = -FFLAGS_DEBUG = -O0 -g -W -fbounds-check +FFLAGS_REPRO = +FFLAGS_DEBUG = -O0 -g -W -fbounds-check FFLAGS_OPENMP = -fopenmp -FFLAGS_VERBOSE = +FFLAGS_VERBOSE = CFLAGS := -D__IFC {incs} CFLAGS += $(shell nc-config --cflags) CFLAGS_OPT = -O2 CFLAGS_OPENMP = -fopenmp -CFLAGS_DEBUG = -O0 -g +CFLAGS_DEBUG = -O0 -g # Optional Testing compile flags. Mutually exclusive from DEBUG, REPRO, and OPT # *_TEST will match the production if no new option(s) is(are) to be tested. @@ -250,7 +250,7 @@ def edit(self, pkg, spec, prefix): LDFLAGS := LDFLAGS_OPENMP := -fopenmp -LDFLAGS_VERBOSE := +LDFLAGS_VERBOSE := ifneq ($(REPRO),) CFLAGS += $(CFLAGS_REPRO) @@ -651,4 +651,3 @@ def install(self, pkg, spec, prefix): prefix.bin ) install(join_path("bin", "mppnccombine." + self.__platform), prefix.bin) - diff --git a/spack_repo/access/nri/packages/mppnccombine_fast/package.py b/spack_repo/access/nri/packages/mppnccombine_fast/package.py index dc6b3a78..2aefdbf5 100644 --- a/spack_repo/access/nri/packages/mppnccombine_fast/package.py +++ b/spack_repo/access/nri/packages/mppnccombine_fast/package.py @@ -2,7 +2,7 @@ # # Copyright 2025 ACCESS-NRI # -# SPDX-License-Identifier: (Apache-2.0 OR MIT) +# SPDX-License-Identifier: (Apache-2.0 OR MIT)! from spack_repo.builtin.build_systems.cmake import CMakePackage from spack.package import * diff --git a/spack_repo/access/nri/packages/nci_intel_oneapi_mkl/package.py b/spack_repo/access/nri/packages/nci_intel_oneapi_mkl/package.py index ef42d015..dd4fde0a 100644 --- a/spack_repo/access/nri/packages/nci_intel_oneapi_mkl/package.py +++ b/spack_repo/access/nri/packages/nci_intel_oneapi_mkl/package.py @@ -3,7 +3,7 @@ # # Copyright 2023 Angus Gibson # -# SPDX-License-Identifier: (Apache-2.0 OR MIT) +# SPDX-License-Identifier: (Apache-2.0 OR MIT)! from spack_repo.builtin.packages.intel_oneapi_mkl.package import IntelOneapiMkl diff --git a/spack_repo/access/nri/packages/oasis3_mct/package.py b/spack_repo/access/nri/packages/oasis3_mct/package.py index 97cf3b57..40fa155e 100644 --- a/spack_repo/access/nri/packages/oasis3_mct/package.py +++ b/spack_repo/access/nri/packages/oasis3_mct/package.py @@ -3,7 +3,7 @@ # # Copyright 2022 ACCESS-NRI # -# SPDX-License-Identifier: (Apache-2.0 OR MIT) +# SPDX-License-Identifier: (Apache-2.0 OR MIT)! from spack_repo.builtin.build_systems.makefile import MakefilePackage from spack.package import * @@ -155,9 +155,9 @@ def edit(self, spec, prefix): MCT_FCFLAGS = # # CPP keys and compiler options -# +# CPPDEF = -Duse_netCDF -Duse_comm_$(CHAN) -D__VERBOSE -DTREAT_OVERLAY -F90FLAGS_1 = +F90FLAGS_1 = """ # module load intel-compiler/2019.5.281 @@ -197,8 +197,8 @@ def edit(self, spec, prefix): f90FLAGS_1 = $(F90FLAGS_1) FFLAGS_1 = $(F90FLAGS_1) fFLAGS_1 = $(F90FLAGS_1) -CCFLAGS_1 = -LDFLAGS = +CCFLAGS_1 = +LDFLAGS = # ################### # @@ -210,7 +210,7 @@ def edit(self, spec, prefix): # LIBBUILD : contains a directory for each library LIBBUILD = $(ARCHDIR)/build/lib # INCPSMILE : includes all *o and *mod for each library -INCPSMILE = -I$(LIBBUILD)/psmile.$(CHAN) -I$(LIBBUILD)/mct +INCPSMILE = -I$(LIBBUILD)/psmile.$(CHAN) -I$(LIBBUILD)/mct F90FLAGS = $(F90FLAGS_1) $(INCPSMILE) $(CPPDEF) f90FLAGS = $(f90FLAGS_1) $(INCPSMILE) $(CPPDEF) @@ -251,4 +251,3 @@ def install(self, spec, prefix): h = find_all_headers(srcdir) for headerfile in h.headers: install(headerfile, dstdir) - diff --git a/spack_repo/access/nri/packages/um/package.py b/spack_repo/access/nri/packages/um/package.py index ab907e05..c1cfbcfc 100644 --- a/spack_repo/access/nri/packages/um/package.py +++ b/spack_repo/access/nri/packages/um/package.py @@ -1,6 +1,6 @@ # Copyright Spack Project Developers. See COPYRIGHT file for details. # -# SPDX-License-Identifier: (Apache-2.0 OR MIT) +# SPDX-License-Identifier: (Apache-2.0 OR MIT)! # Copyright 2024-2026 ACCESS-NRI # Based on https://github.com/nci/spack-repo/blob/main/packages/um/package.py diff --git a/spack_repo/access/nri/packages/um7/package.py b/spack_repo/access/nri/packages/um7/package.py index bcccdc7c..b7d1c9ae 100644 --- a/spack_repo/access/nri/packages/um7/package.py +++ b/spack_repo/access/nri/packages/um7/package.py @@ -5,7 +5,7 @@ # Based on https://github.com/nci/spack-repo/blob/main/packages/um/package.py # and https://github.com/coecms/access-esm-build-gadi # -# SPDX-License-Identifier: (Apache-2.0 OR MIT) +# SPDX-License-Identifier: (Apache-2.0 OR MIT)! from spack_repo.builtin.build_systems.generic import Package diff --git a/spack_repo/access/nri/packages/um_createbc/package.py b/spack_repo/access/nri/packages/um_createbc/package.py index ac7817c8..4b0ba35c 100644 --- a/spack_repo/access/nri/packages/um_createbc/package.py +++ b/spack_repo/access/nri/packages/um_createbc/package.py @@ -1,6 +1,6 @@ # Copyright Spack Project Developers. See COPYRIGHT file for details. # -# SPDX-License-Identifier: (Apache-2.0 OR MIT) +# SPDX-License-Identifier: (Apache-2.0 OR MIT)! # Copyright 2024-2026 ACCESS-NRI