Skip to content

Commit

Permalink
Merge branch 'jcsda_emc_spack_stack' into bugfix/odc146_appleclang1403
Browse files Browse the repository at this point in the history
  • Loading branch information
climbfuji authored May 19, 2023
2 parents e1751dd + 792bf0d commit bf69d38
Show file tree
Hide file tree
Showing 7 changed files with 17 additions and 4 deletions.
1 change: 1 addition & 0 deletions var/spack/repos/builtin/packages/esmf/package.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ class Esmf(MakefilePackage):
# Develop is a special name for spack and is always considered the newest version
version("develop", branch="develop")
# generate chksum with spack checksum esmf@x.y.z
version("8.4.2", sha256="969304efa518c7859567fa6e65efd960df2b4f6d72dbf2c3f29e39e4ab5ae594")
version("8.4.1", sha256="1b54cee91aacaa9df400bd284614cbb0257e175f6f3ec9977a2d991ed8aa1af6")
version(
"8.4.0",
Expand Down
1 change: 1 addition & 0 deletions var/spack/repos/builtin/packages/fms/package.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ class Fms(CMakePackage):

maintainers("AlexanderRichert-NOAA", "Hang-Lei-NOAA", "edwardhartnett", "rem1776")

version("2023.01", sha256="6079ea885e9365513b453c77aadfc7c305bf413b840656bb333db1eabba0f18e")
version("2022.04", sha256="f741479128afc2b93ca8291a4c5bcdb024a8cbeda1a26bf77a236c0f629e1b03")
version("2022.03", sha256="42d2ac53d3c889a8177a6d7a132583364c0f6e5d5cbde0d980443b6797ad4838")
version("2022.02", sha256="ad4978302b219e11b883b2f52519e1ee455137ad947474abb316c8654f72c874")
Expand Down
5 changes: 5 additions & 0 deletions var/spack/repos/builtin/packages/hdf5/package.py
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,11 @@ class Hdf5(CMakePackage):
version("1.13.2", sha256="01643fa5b37dba7be7c4db6bbf3c5d07adf5c1fa17dbfaaa632a279b1b2f06da")

# Even versions are maintenance versions
version(
"1.14.1-2",
sha256="cbe93f275d5231df28ced9549253793e40cd2b555e3d288df09d7b89a9967b07",
preferred=True,
)
version(
"1.14.0",
sha256="a571cc83efda62e1a51a0a912dd916d01895801c5025af91669484a1575a6ef4",
Expand Down
7 changes: 6 additions & 1 deletion var/spack/repos/builtin/packages/scotch/package.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ class Scotch(CMakePackage, MakefilePackage):

maintainers("pghysels")

version("7.0.3", sha256="5b5351f0ffd6fcae9ae7eafeccaa5a25602845b9ffd1afb104db932dd4d4f3c5")
version("7.0.1", sha256="0618e9bc33c02172ea7351600fce4fccd32fe00b3359c4aabb5e415f17c06fed")
version("6.1.3", sha256="4e54f056199e6c23d46581d448fcfe2285987e5554a0aa527f7931684ef2809e")
version("6.1.2", sha256="9c2c75c75f716914a2bd1c15dffac0e29a2f8069b2df1ad2b6207c984b699450")
Expand All @@ -36,6 +37,8 @@ class Scotch(CMakePackage, MakefilePackage):
version("5.1.10b", sha256="54c9e7fafefd49d8b2017d179d4f11a655abe10365961583baaddc4eeb6a9add")

build_system(conditional("cmake", when="@7:"), "makefile", default="cmake")
variant("threads", default=True, description="use POSIX Pthreads within Scotch and PT-Scotch")
variant("mpi_thread", default=True, description="use multi-threaded algorithms in conjunction with MPI")
variant("mpi", default=True, description="Compile parallel libraries")
variant("compression", default=True, description="May use compressed files")
variant("esmumps", default=False, description="Compile esmumps (needed by mumps)")
Expand All @@ -53,7 +56,7 @@ class Scotch(CMakePackage, MakefilePackage):

# Does not build with flex 2.6.[23]
depends_on("flex@:2.6.1,2.6.4:", type="build")
depends_on("bison", type="build")
depends_on("bison@3.4:", type="build")
depends_on("mpi", when="+mpi")
depends_on("zlib", when="+compression")

Expand Down Expand Up @@ -114,6 +117,8 @@ def cmake_args(self):
self.define_from_variant("BUILD_LIBESMUMPS", "esmumps"),
self.define_from_variant("BUILD_SHARED_LIBS", "shared"),
self.define_from_variant("BUILD_PTSCOTCH", "mpi"),
self.define_from_variant("THREADS", "threads"),
self.define_from_variant("MPI_THREAD_MULTIPLE", "mpi_thread")
]

# TODO should we enable/disable THREADS?
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ class JediUfsEnv(BundlePackage):
version("1.0.0")

depends_on("jedi-base-env", type="run")
depends_on("fms@2022.04+pic", type="run")
depends_on("fms@2023.01+pic", type="run")

depends_on("bacio", type="run")
depends_on("g2", type="run")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ class UfsSrwAppEnv(BundlePackage):
depends_on("netcdf-fortran")
depends_on("parallelio")
depends_on("esmf")
depends_on("fms@2022.04")
depends_on("fms@2023.01")
depends_on("bacio")
depends_on("crtm@2.4.0")
depends_on("g2")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,15 @@ class UfsWeatherModelEnv(BundlePackage):
depends_on("base-env", type="run")
depends_on("ufs-pyenv", type="run", when="+python")

depends_on("fms@2022.04", type="run")
depends_on("fms@2023.01", type="run")
depends_on("bacio", type="run")
depends_on("crtm@2.4.0", type="run")
depends_on("g2", type="run")
depends_on("g2tmpl", type="run")
depends_on("ip", type="run")
depends_on("sp", type="run")
depends_on("w3emc", type="run")
depends_on("scotch", type="run")

depends_on("esmf~debug", type="run", when="~debug")
depends_on("esmf+debug", type="run", when="+debug")
Expand Down

0 comments on commit bf69d38

Please sign in to comment.