Skip to content

Some Macos build patches #2049

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

Open
rhoneyager-tomorrow wants to merge 2 commits into
base: release/2.1
Choose a base branch
from
Open

Some Macos build patches #2049

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ac6b2c2
Macos build patches
rhoneyager-tomorrow Jul 1, 2026
f169831
.
rhoneyager-tomorrow Jul 1, 2026
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
13 changes: 13 additions & 0 deletions repos/spack_stack/spack_repo/spack_stack/packages/ioda/ioda_yaml_root.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
diff --git a/cmake/ioda-import.cmake.in b/cmake/ioda-import.cmake.in
index 907fce15..0d7ae528 100644
--- a/cmake/ioda-import.cmake.in
+++ b/cmake/ioda-import.cmake.in
@@ -96,7 +96,7 @@ else()
# in the ioda-post-import.cmake file, even if it is never again used. Some
# tools (like Spack) will complain about this path and may indicate that ioda
# is a non-relocatable package, even though it is completely relocatable.
- set( IODA_YAML_ROOT "@IODA_YAML_ROOT@" )
+ set( IODA_YAML_ROOT "${CMAKE_CURRENT_LIST_DIR}/share/test/testinput/" )
endif()
endif()

17 changes: 9 additions & 8 deletions repos/spack_stack/spack_repo/spack_stack/packages/ioda/package.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ class Ioda(CMakePackage):
version("2.9.0.20250826", commit="6e76616001067384f7d0ca4341ad78e81527af8b")

patch("ioda_cmake_import.patch", when="@2.9.0.20250826")
patch("ioda_yaml_root.patch", when="@2.9.0.20250826")

variant("doc", default=False, description="Build IODA documentation")
# Let's always assume IODA_BUILD_LANGUAGE_FORTRAN=on.
Expand Down Expand Up @@ -101,11 +102,11 @@ def check(self):
else:
ctest("--timeout", "120")

@run_after("install")
def fix_ioda_yaml_root_path(self):
with when("@2.9.0.20250826"):
filter_file(
join_path(self.build_directory, "share/test/testinput/"),
join_path(self.prefix, "share/ioda/yaml"),
join_path(self.prefix, "lib64/cmake/ioda/ioda-import.cmake"),
)
#@run_after("install")
#def fix_ioda_yaml_root_path(self):
# with when("@2.9.0.20250826"):
# filter_file(
# join_path(self.build_directory, "share/test/testinput/"),
# join_path(self.prefix, "share/ioda/yaml"),
# join_path(self.prefix, "lib64/cmake/ioda/ioda-import.cmake"),
# )
1 change: 1 addition & 0 deletions repos/spack_stack/spack_repo/spack_stack/packages/oops/package.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ class Oops(CMakePackage):
version("1.10.0.20250827", commit="91889ad09d3789f14a1184701dd80a4913d3ce3e")

patch("include_algorithm.patch", when="@1.10.0.20250827")
patch("patch-1.10.0.atlas.mac.patch", when="@1.10.0.20250827")

variant("l95", default=True, description="Build LORENZ95 toy model")
variant("mkl", default=False, description="Use MKL for LAPACK implementation (if available)")
Expand Down
34 changes: 34 additions & 0 deletions repos/spack_stack/spack_repo/spack_stack/packages/oops/patch-1.10.0.atlas.mac.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
diff --git a/src/oops/util/ParallelFieldSetIO.cc b/src/oops/util/ParallelFieldSetIO.cc
index 04e4c55c..0a07a9ba 100644
--- a/src/oops/util/ParallelFieldSetIO.cc
+++ b/src/oops/util/ParallelFieldSetIO.cc
@@ -80,9 +80,6 @@ atlas::FieldSet ParallelFieldSetIO::ioFieldSet(const atlas::FieldSet& nativeFiel
case atlas::array::DataType::KIND_INT32:
ioFieldSet.add(functionSpace_.createField<int>(fieldSetConfig));
break;
- case atlas::array::DataType::KIND_INT64:
- ioFieldSet.add(functionSpace_.createField<int64_t>(fieldSetConfig));
- break;
case atlas::array::DataType::KIND_REAL32:
ioFieldSet.add(functionSpace_.createField<float>(fieldSetConfig));
break;
@@ -105,9 +102,6 @@ void ParallelFieldSetIO::writeFieldByTypeAndRank(const atlas::Field& field,
case atlas::array::DataType::KIND_INT32:
dispatchWriteField<int>(field, netcdfGeneralIDs, netcdfVarID);
break;
- case atlas::array::DataType::KIND_INT64:
- dispatchWriteField<int64_t>(field, netcdfGeneralIDs, netcdfVarID);
- break;
case atlas::array::DataType::KIND_REAL32:
dispatchWriteField<float>(field, netcdfGeneralIDs, netcdfVarID);
break;
@@ -129,9 +123,6 @@ void ParallelFieldSetIO::readFieldByTypeAndRank(atlas::Field& field,
case atlas::array::DataType::KIND_INT32:
dispatchReadField<int>(field, netcdfGeneralIDs, netcdfVarID);
break;
- case atlas::array::DataType::KIND_INT64:
- dispatchReadField<int64_t>(field, netcdfGeneralIDs, netcdfVarID);
- break;
case atlas::array::DataType::KIND_REAL32:
dispatchReadField<float>(field, netcdfGeneralIDs, netcdfVarID);
break;
Loading