Skip to content

Commit ea29f11

Browse files
climbfujiclimbfuji
authored
Merge pull request #23 from fmahebert/feature/spack-stack-dev-with-new-atlas-and-deps
Cherry-pick spack-packages 2366: "ecmwf_atlas: add new versions, and new dependency versions"
2 parents 8d72a47 + 9556e19 commit ea29f11

File tree

7 files changed

+65
-1
lines changed

7 files changed

+65
-1
lines changed

‎repos/spack_repo/builtin/packages/ecbuild/package.py‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,11 @@ class Ecbuild(CMakePackage):
1818

1919
license("Apache-2.0")
2020

21+
version("3.12.0", sha256="70c7fc9b17f736a3312167c2c36d13b3b5833a255fe2b168b2886ad7c743ffdf")
22+
version("3.11.0", sha256="38a96bdeb38feb65446b6f95b35492232abd188c41b8a28fd128f9f88e00b05d")
23+
version("3.10.0", sha256="7065e1725584b507517cbfc456299ff588e20adf37bc6210ce89fb65a1ad08d0")
24+
version("3.9.1", sha256="48c2dbd342865049cc39afd7fe886fce9ce162105ca72b8aef9a09c21d9655ba")
25+
version("3.8.5", sha256="aa0c44cab0fffec4c0b3542e91ebcc736b3d41b68a068d30c023ec0df5f93425")
2126
version("3.7.2", sha256="7a2d192cef1e53dc5431a688b2e316251b017d25808190faed485903594a3fb9")
2227
version("3.6.5", sha256="98bff3d3c269f973f4bfbe29b4de834cd1d43f15b1c8d1941ee2bfe15e3d4f7f")
2328
version("3.6.1", sha256="796ccceeb7af01938c2f74eab0724b228e9bf1978e32484aa3e227510f69ac59")
@@ -27,6 +32,7 @@ class Ecbuild(CMakePackage):
2732
depends_on("fortran", type="build") # generated
2833

2934
depends_on("[email protected]:", type=("build", "run"))
35+
depends_on("[email protected]:", type=("build", "run"), when="@3.11:")
3036

3137
# See https://github.com/ecmwf/ecbuild/issues/35
3238
depends_on("cmake@:3.19", type=("build", "run"), when="@:3.6.1")

‎repos/spack_repo/builtin/packages/eckit/package.py‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,10 @@ class Eckit(CMakePackage):
2121

2222
license("Apache-2.0")
2323

24+
version("1.32.3", sha256="33e0fac2656cdd2f2d877dbfe7a4751ee657ab732c00dd90bd48a406298a100f")
25+
version("1.31.4", sha256="045ebd9aaecf2773dc8c82f4226022776576cb0d911a76f8d1d069c97e9530c8")
26+
version("1.30.0", sha256="1f58360dedfaa285a6b8087916768e6d12406e9fda2b6ba0a5c875f7a3db5398")
27+
version("1.29.3", sha256="5afb6ac5bd95d68b7b0fdf42bdfe21370515b8e9ef7b3db91a89e021aa9133f2")
2428
version("1.28.3", sha256="24b2b8d9869849a646aa3fd9d95e4181a92358cd837d95b22e25d718a6ad7738")
2529
version("1.28.2", sha256="d122db8bb5bcaadf3256a24f0f90d9bcedad35ef8f25e7eccd8c93c506dbdd24")
2630
version("1.27.0", sha256="499f3f8c9aec8d3f42369e3ceedc98b2b09ac04993cfd38dfdf7d38931703fe7")
@@ -76,6 +80,7 @@ class Eckit(CMakePackage):
7680
depends_on("[email protected]:3.19,3.22:", type="build")
7781
depends_on("[email protected]:", when="@:1.20.99", type="build")
7882
depends_on("[email protected]:", when="@1.21:", type="build")
83+
depends_on("[email protected]:", when="@1.31:", type="build")
7984

8085
depends_on("mpi", when="+mpi")
8186
depends_on("llvm-openmp", when="+openmp %apple-clang", type=("build", "run"))

‎repos/spack_repo/builtin/packages/ecmwf_atlas/package.py‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,10 @@ class EcmwfAtlas(CMakePackage):
2323

2424
version("master", branch="master")
2525
version("develop", branch="develop")
26+
version("0.44.1", sha256="d7235ddb0ff827a9942a0c1051e35516778f343a52f70f3efb079d2f087b1c9d")
27+
version("0.43.1", sha256="f7dadb40c6f4a6408a0d7932967610f0c6d3d26d3de15b619f6d5b0598ad7e90")
28+
version("0.42.0", sha256="66b10e7d20869ea609cd8b6058bdc833771572f04737a8260e9899d1c36fc820")
29+
version("0.41.1", sha256="36c7b793e61957aa149279d2449269915e668d878c4e15caf2c14b7a9e46ef0f")
2630
version("0.40.0", sha256="9aa2c8945a04aff3d50f752147e2b7cf0992c33e7e5a0e7bcd6fe575b0f853b0")
2731
version("0.39.0", sha256="bdfc37b5f3f871651b1bb47ae4742988b03858037e36fdca775e220e3abe3bd6")
2832
version("0.38.1", sha256="c6868deb483c1d6c241aae92f8af63f3351062c2611c9163e8a9bbf6c97a9798")
@@ -42,6 +46,7 @@ class EcmwfAtlas(CMakePackage):
4246

4347
depends_on("ecbuild", type=("build"))
4448
depends_on("[email protected]:", type=("build"), when="@0.36.0:")
49+
depends_on("[email protected]:", type=("build"), when="@0.41.0:")
4550
depends_on("eckit@:1.23", when="@:0.33")
4651
depends_on("[email protected]:", when="@0.34:")
4752
depends_on("boost cxxstd=14 visibility=hidden", when="@0.26.0:0.33.99", type=("build", "run"))

‎repos/spack_repo/builtin/packages/ectrans/package.py‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@ class Ectrans(CMakePackage):
2424

2525
version("develop", branch="develop", no_cache=True)
2626
version("main", branch="main", no_cache=True)
27+
version("1.7.0", sha256="224893a8edeaaf76140842340eb30ad4f9ab772591a55aab4e4493a978e086c7")
28+
version("1.6.2", sha256="63e01a5106fb4eee70a4e544b84300b104507a3fbeb9b7374964c8c48e06acda")
2729
version("1.5.0", sha256="8b2b24d1988b92dc3793b29142946614fca9e9c70163ee207d2a123494430fde")
2830
version("1.4.0", sha256="1364827511a2eb11716aaee85062c3ab0e6b5d5dca7a7b9c364e1c43482b8691")
2931
version("1.2.0", sha256="2ee6dccc8bbfcc23faada1d957d141f24e41bb077c1821a7bc2b812148dd336c")

‎repos/spack_repo/builtin/packages/fckit/package.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ class Fckit(CMakePackage):
2323

2424
version("master", branch="master")
2525
version("develop", branch="develop")
26+
version("0.14.1", sha256="b15c3a30d4c6aaf9b97d8930bf1b7fd94b015746c421daeb3e648170b30bcbcb")
2627
version("0.13.2", sha256="990623eb4eb999145f2d852da9fbd71a69e2e0be601c655c274e8382750dfda2")
2728
version("0.13.1", sha256="89a067a7b5b1f2c7909739b567bd43b69f8a2d91e8cbcbac58655fb2d861db51")
2829
version("0.11.0", sha256="846f5c369940c0a3d42cd12932f7d6155339e79218d149ebbfdd02e759dc86c5")

‎repos/spack_repo/builtin/packages/fiat/intel_warnings_v151.patch‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
--- a/cmake/fiat_compiler_warnings.cmake
2+
+++ b/cmake/fiat_compiler_warnings.cmake
3+
@@ -5,15 +5,17 @@
4+
ecbuild_add_c_flags("-Wextra" NO_FAIL)
5+
ecbuild_add_c_flags("-Wno-unused-parameter" NO_FAIL)
6+
ecbuild_add_c_flags("-Wno-unused-variable" NO_FAIL)
7+
- ecbuild_add_c_flags("-Wno-gnu-zero-variadic-macro-arguments" NO_FAIL)
8+
+ if (CMAKE_C_COMPILER_ID MATCHES "Clang|GNU")
9+
+ ecbuild_add_c_flags("-Wno-gnu-zero-variadic-macro-arguments" NO_FAIL)
10+
+ endif()
11+
endif()
12+
13+
# Always disable some warnings
14+
ecbuild_add_c_flags("-Wno-deprecated-declarations" NO_FAIL)
15+
-if( CMAKE_C_COMPILER_ID MATCHES Intel )
16+
- ecbuild_add_c_flags("-diag-disable=279") # controlling expression is constant
17+
- ecbuild_add_c_flags("-diag-disable=11076") # inline limits
18+
-endif()
19+
+#if( CMAKE_C_COMPILER_ID MATCHES Intel )
20+
+# ecbuild_add_c_flags("-diag-disable=279") # controlling expression is constant
21+
+# ecbuild_add_c_flags("-diag-disable=11076") # inline limits
22+
+#endif()
23+
if( CMAKE_Fortran_COMPILER_ID MATCHES Cray )
24+
ecbuild_add_fortran_flags("-hnomessage=878") # A module named ... has already been directly or indirectly use associated into this scope
25+
ecbuild_add_fortran_flags("-hnomessage=867") # Module ... has no public objects declared in the module, therefore nothing can be use associated from the module.
26+
--- a/src/fiat/CMakeLists.txt
27+
+++ b/src/fiat/CMakeLists.txt
28+
@@ -26,10 +26,10 @@ endif()
29+
30+
### Compilation flags
31+
32+
-if( CMAKE_Fortran_COMPILER_ID MATCHES "Intel" )
33+
- ## To disable checking of argument correctness of dummy mpi symbols
34+
- ecbuild_add_fortran_flags( -nowarn nointerfaces NO_FAIL )
35+
-endif()
36+
+#if( CMAKE_Fortran_COMPILER_ID MATCHES "Intel" )
37+
+# ## To disable checking of argument correctness of dummy mpi symbols
38+
+# ecbuild_add_fortran_flags( -nowarn nointerfaces NO_FAIL )
39+
+#endif()
40+
41+
if( CMAKE_Fortran_COMPILER_ID MATCHES "GNU" )
42+
ecbuild_add_fortran_flags( -ffree-line-length-none NO_FAIL )

‎repos/spack_repo/builtin/packages/fiat/package.py‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@ class Fiat(CMakePackage):
2020
license("Apache-2.0")
2121

2222
version("main", branch="main", no_cache=True)
23+
version("1.6.1", sha256="fec30ac572d626d8f1a8bd0d03c41aac156e6911f9f822e5f7e5991aff91ba37")
24+
version("1.5.1", sha256="50834bf5d8cb4bde92df9028f799aeba411a0a16e55ca33da10a329b5d7f55ea")
2325
version("1.4.1", sha256="7d49316150e59afabd853df0066b457a268731633898ab51f6f244569679c84a")
2426
version("1.4.0", sha256="5dc5a8bcac5463690529d0d96d2c805cf9c0214d125cd483ee69d36995ff15d3")
2527
version("1.2.0", sha256="758147410a4a3c493290b87443b4091660b915fcf29f7c4d565c5168ac67745f")
@@ -47,7 +49,8 @@ class Fiat(CMakePackage):
4749
depends_on("fckit", when="+fckit")
4850

4951
patch("intel_warnings_v110.patch", when="@:1.1.0")
50-
patch("intel_warnings_v120.patch", when="@1.2.0:")
52+
patch("intel_warnings_v120.patch", when="@1.2.0:1.5.0")
53+
patch("intel_warnings_v151.patch", when="@1.5.1:")
5154

5255
def cmake_args(self):
5356
args = [

0 commit comments

Comments
 (0)