Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion spack_repo/access/nri/__init__.py
Original file line number Diff line number Diff line change
@@ -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)!
2 changes: 1 addition & 1 deletion spack_repo/access/nri/build_systems/um_base.py
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion spack_repo/access/nri/packages/__init__.py
Original file line number Diff line number Diff line change
@@ -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)!
2 changes: 1 addition & 1 deletion spack_repo/access/nri/packages/access3/package.py
Original file line number Diff line number Diff line change
@@ -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 *
Expand Down
2 changes: 1 addition & 1 deletion spack_repo/access/nri/packages/access3_share/package.py
Original file line number Diff line number Diff line change
@@ -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 *
Expand Down
2 changes: 1 addition & 1 deletion spack_repo/access/nri/packages/access_am3/package.py
Original file line number Diff line number Diff line change
Expand Up @@ -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 *
Expand Down
6 changes: 3 additions & 3 deletions spack_repo/access/nri/packages/access_cice/package.py
Original file line number Diff line number Diff line change
@@ -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 *
Expand Down Expand Up @@ -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"
Expand All @@ -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")
Expand Down
2 changes: 1 addition & 1 deletion spack_repo/access/nri/packages/access_esm1p5/package.py
Original file line number Diff line number Diff line change
@@ -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 *
Expand Down
2 changes: 1 addition & 1 deletion spack_repo/access/nri/packages/access_esm1p6/package.py
Original file line number Diff line number Diff line change
@@ -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 *
Expand Down
2 changes: 1 addition & 1 deletion spack_repo/access/nri/packages/access_fms/package.py
Original file line number Diff line number Diff line change
Expand Up @@ -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 *
Expand Down
Original file line number Diff line number Diff line change
@@ -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 *
Expand Down
2 changes: 1 addition & 1 deletion spack_repo/access/nri/packages/access_issm/package.py
Original file line number Diff line number Diff line change
Expand Up @@ -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 *
Expand Down
3 changes: 1 addition & 2 deletions spack_repo/access/nri/packages/access_mocsy/package.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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)

2 changes: 1 addition & 1 deletion spack_repo/access/nri/packages/access_mom6/package.py
Original file line number Diff line number Diff line change
@@ -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 *
Expand Down
2 changes: 1 addition & 1 deletion spack_repo/access/nri/packages/access_om2/package.py
Original file line number Diff line number Diff line change
Expand Up @@ -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 *
Expand Down
2 changes: 1 addition & 1 deletion spack_repo/access/nri/packages/access_om2_bgc/package.py
Original file line number Diff line number Diff line change
Expand Up @@ -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 *
Expand Down
2 changes: 1 addition & 1 deletion spack_repo/access/nri/packages/access_om3/package.py
Original file line number Diff line number Diff line change
@@ -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 *
Expand Down
2 changes: 1 addition & 1 deletion spack_repo/access/nri/packages/access_ram3/package.py
Original file line number Diff line number Diff line change
Expand Up @@ -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 *
Expand Down
2 changes: 1 addition & 1 deletion spack_repo/access/nri/packages/access_test/package.py
Original file line number Diff line number Diff line change
Expand Up @@ -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 *
Expand Down
Original file line number Diff line number Diff line change
@@ -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

Expand Down
23 changes: 9 additions & 14 deletions spack_repo/access/nri/packages/access_triangle/package.py
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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).")
Expand All @@ -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)

Expand All @@ -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`.
Expand All @@ -57,7 +57,7 @@ def build(self, spec, prefix):
make("shared")
if "+showme" in spec:
make("showme")


def install(self, spec, prefix):
"""
Expand All @@ -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)





2 changes: 1 addition & 1 deletion spack_repo/access/nri/packages/access_ww3/package.py
Original file line number Diff line number Diff line change
@@ -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 *
Expand Down
8 changes: 4 additions & 4 deletions spack_repo/access/nri/packages/adjoint_petsc/package.py
Original file line number Diff line number Diff line change
@@ -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 *
Expand All @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion spack_repo/access/nri/packages/ancoms_roms/package.py
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions spack_repo/access/nri/packages/cable/package.py
Original file line number Diff line number Diff line change
@@ -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 *
Expand All @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion spack_repo/access/nri/packages/cice4/package.py
Original file line number Diff line number Diff line change
@@ -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.

Expand Down
16 changes: 8 additions & 8 deletions spack_repo/access/nri/packages/cice5/package.py
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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 = (
Expand All @@ -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":
Expand Down Expand Up @@ -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")

Expand Down
2 changes: 1 addition & 1 deletion spack_repo/access/nri/packages/coastri_roms/package.py
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Loading
Loading