Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ACCESS-ESM1.5 & ACCESS-ESM1.6: remove versions from dependencies #210

Merged
merged 1 commit into from
Mar 11, 2025
Merged

ACCESS-ESM1.5 & ACCESS-ESM1.6: remove versions from dependencies #210

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 3 additions & 4 deletions packages/cice4/package.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,9 @@ class Cice4(MakefilePackage):

version("access-esm1.5", branch="access-esm1.5")

depends_on("[email protected]:4.5.2")
# Depend on "openmpi".
depends_on("[email protected]:4.1.0")
depends_on("[email protected]")
depends_on("[email protected]:")
depends_on("openmpi")
depends_on("oasis3-mct")

phases = ["edit", "build", "install"]

Expand Down
8 changes: 4 additions & 4 deletions packages/mom5/package.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,11 +45,11 @@ class Mom5(MakefilePackage):
depends_on("libaccessom2+deterministic", when="+deterministic")
depends_on("libaccessom2~deterministic", when="~deterministic")
with when("@access-esm1.5:access-esm1.6"):
depends_on("[email protected]:4.7.4")
depends_on("[email protected]:4.5.2")
depends_on("[email protected]:")
depends_on("[email protected]:")
# Depend on "openmpi".
depends_on("openmpi@4.0.2:4.1.0")
depends_on("oasis3-mct@access-esm1.5")
depends_on("openmpi")
depends_on("oasis3-mct")

phases = ["edit", "build", "install"]

Expand Down
5 changes: 2 additions & 3 deletions packages/oasis3-mct/package.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,9 @@
# Depend on virtual package "mpi".
depends_on("mpi")
with when("@access-esm1.5"):
depends_on("[email protected]:1.10.11")
depends_on("[email protected]:4.5.2")
depends_on("[email protected]:")
# Depend on "openmpi".
depends_on("openmpi@4.0.2:4.1.0")
depends_on("openmpi")

phases = ["edit", "build", "install"]

Expand Down Expand Up @@ -251,19 +250,19 @@
f = $(F90)
"""

config["gcc"] = f"""
# Compiling and other commands
MAKE = make
F90 = mpif90 -Wall -fallow-argument-mismatch
CC = gcc
LD = mpif90
MCT_FCFLAGS =
#
# CPP keys and compiler options
#
CPPDEF = -Duse_netCDF -Duse_comm_$(CHAN) -D__VERBOSE -DTREAT_OVERLAY
F90FLAGS_1 =
"""

Check failure on line 265 in packages/oasis3-mct/package.py

View workflow job for this annotation

GitHub Actions / Check syntax

Ruff (F541) 

packages/oasis3-mct/package.py:253:25: F541 f-string without any placeholders

# module load intel-compiler/2019.5.281
config["intel"] = f"""
Expand Down Expand Up @@ -295,33 +294,33 @@
# Add support for the ifx compiler
config["oneapi"] = config["intel"]

config["post"] = f"""
f90FLAGS_1 = $(F90FLAGS_1)
FFLAGS_1 = $(F90FLAGS_1)
fFLAGS_1 = $(F90FLAGS_1)
CCFLAGS_1 =
LDFLAGS =
#
###################
#
# Additional definitions that should not be changed
#
FLIBS = ""
# BINDIR : directory for executables
BINDIR = $(ARCHDIR)/bin
# 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

F90FLAGS = $(F90FLAGS_1) $(INCPSMILE) $(CPPDEF)
f90FLAGS = $(f90FLAGS_1) $(INCPSMILE) $(CPPDEF)
FFLAGS = $(FFLAGS_1) $(INCPSMILE) $(CPPDEF)
fFLAGS = $(fFLAGS_1) $(INCPSMILE) $(CPPDEF)
CCFLAGS = $(CCFLAGS_1) $(INCPSMILE) $(CPPDEF)
#
#############################################################################
"""

Check failure on line 323 in packages/oasis3-mct/package.py

View workflow job for this annotation

GitHub Actions / Check syntax

Ruff (F541) 

packages/oasis3-mct/package.py:297:26: F541 f-string without any placeholders

with open(makeinc_path, "w") as makeinc:
makeinc.write(
Expand Down
8 changes: 4 additions & 4 deletions packages/um7/package.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,10 @@ class Um7(Package):

depends_on("fcm", type="build")
depends_on("dummygrib", type=("build", "link"))
depends_on("gcom4@access-esm1.5+mpi", type=("build", "link"))
depends_on("openmpi@4.0.2:4.1.0", type=("build", "run"))
depends_on("[email protected]", type=("build", "link"))
depends_on("oasis3-mct@access-esm1.5", type=("build", "link"))
depends_on("gcom4+mpi", type=("build", "link"))
depends_on("openmpi", type=("build", "run"))
depends_on("[email protected]:", type=("build", "link"))
depends_on("oasis3-mct", type=("build", "link"))

variant("optim", default="high", description="Optimization level",
values=("high", "debug"), multi=False)
Expand Down
Loading