hlrs-software-stack/spack
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Update sperr (#40626)

Browse source 
* update SPERR package
* remove blank line
* update SPERR to be version 0.7.1
* a little clean up
* bound versions that require zstd
* add USE_ZSTD
* add libpressio-sperr version upbound
* update libpressio-sperr
* address review comments
* improve format

---------

Co-authored-by: Samuel Li <Sam@Navada>
Co-authored-by: Samuel Li <sam@cisl-m121a>
This commit is contained in:
Samuel Li 2023-10-31 14:53:09 -06:00 committed by GitHub
parent 2f2d9ae30d
commit 26649e71f9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 26 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
var/spack/repos/builtin/packages/libpressio-sperr/package.py
View file

@ -10,17 +10,19 @@ class LibpressioSperr(CMakePackage):
"""A LibPressio plugin for Sperr""" """A LibPressio plugin for Sperr"""
homepage = "https://github.com/robertu94/libpressio-sperr" homepage = "https://github.com/robertu94/libpressio-sperr"
url = "https://github.com/robertu94/libpressio-sperr/archive/refs/tags/0.0.1.tar.gz" url = "https://github.com/robertu94/libpressio-sperr/archive/refs/tags/0.0.4.tar.gz"
git = homepage git = homepage
maintainers("robertu94") maintainers("robertu94")
depends_on("libpressio@0.88.0:", when="@0.0.3:")
depends_on("libpressio@:0.88.0", when="@:0.0.2")
depends_on("sperr")
depends_on("pkgconfig", type="build")
version("master", branch="master") version("master", branch="master")
version("0.0.4", sha256="97f2879460b1a28ed8ebf0c300c1cf7ceeb2c7aa7b8a1307ed19bf8cce0b7941")
version("0.0.3", sha256="e0d1fd083419aaaa243cbf780b7de17aeb96533000071088aa21ec238d358ecc") version("0.0.3", sha256="e0d1fd083419aaaa243cbf780b7de17aeb96533000071088aa21ec238d358ecc")
version("0.0.2", sha256="61995d687f9e7e798e17ec7238d19d917890dc0ff5dec18293b840c4d6f8c115") version("0.0.2", sha256="61995d687f9e7e798e17ec7238d19d917890dc0ff5dec18293b840c4d6f8c115")
version("0.0.1", sha256="e2c164822708624b97654046b42abff704594cba6537d6d0646d485bdf2d03ca") version("0.0.1", sha256="e2c164822708624b97654046b42abff704594cba6537d6d0646d485bdf2d03ca")
depends_on("libpressio@0.88.0:", when="@0.0.3:")
depends_on("libpressio@:0.88.0", when="@:0.0.2")
depends_on("sperr@:0.6.2", when="@:0.0.3")
depends_on("sperr@0.7.1:", when="@0.0.4:")
depends_on("pkgconfig", type="build")

27
var/spack/repos/builtin/packages/sperr/package.py
View file

@ -12,23 +12,32 @@ class Sperr(CMakePackage):
# Package info # Package info
homepage = "https://github.com/NCAR/SPERR" homepage = "https://github.com/NCAR/SPERR"
url = "https://github.com/NCAR/SPERR/archive/refs/tags/v0.6.2.tar.gz" url = "https://github.com/NCAR/SPERR/archive/refs/tags/v0.7.1.tar.gz"
git = "https://github.com/NCAR/SPERR.git" git = "https://github.com/NCAR/SPERR.git"
maintainers("shaomeng", "robertu94") maintainers("shaomeng", "robertu94")
# Versions # Versions
version("main", branch="main") version("main", branch="main")
version("0.7.1", sha256="1c3f46200be365427d1f57f5873f1b0b6dbcd297de4603a47a7fa3f41b273d79")
version("0.6.2", sha256="d986997e2d79a1f27146ad02c623359976a1e72a1ab0d957e128d430cda3782d") version("0.6.2", sha256="d986997e2d79a1f27146ad02c623359976a1e72a1ab0d957e128d430cda3782d")
version("0.5", sha256="20ad48c0e7599d3e5866e024d0c49648eb817f72ad5459f5468122cf14a97171") version("0.5", sha256="20ad48c0e7599d3e5866e024d0c49648eb817f72ad5459f5468122cf14a97171")
depends_on("git", type="build") # Variants
depends_on("zstd", type=("build", "link"), when="+zstd")
depends_on("pkgconfig", type=("build"), when="+zstd")
variant("shared", description="build shared libaries", default=True) variant("shared", description="build shared libaries", default=True)
variant("zstd", description="use zstd for more compression", default=True) variant("openmp", description="use OpenMP in 3D inputs", default=True)
variant("openmp", description="use openmp in 3D inputs", default=True)
variant("utilities", description="build SPERR CLI utilities", default=True) variant("utilities", description="build SPERR CLI utilities", default=True)
variant("zstd", description="use ZSTD for more compression", default=True, when="@:0.6.2")
variant(
"bundle_zstd",
description="Use SPERR bundled ZSTD. Keep it off in SPACK builds.",
default=False,
when="@:0.6.2",
)
# Depend ons
depends_on("git", type="build")
depends_on("pkgconfig", type=("build"), when="+zstd")
depends_on("zstd", type=("build", "link"), when="@:0.6.2+zstd")
def cmake_args(self): def cmake_args(self):
# ensure the compiler supports OpenMP if it is used # ensure the compiler supports OpenMP if it is used
@ -37,11 +46,11 @@ def cmake_args(self):
args = [ args = [
self.define_from_variant("BUILD_SHARED_LIBS", "shared"), self.define_from_variant("BUILD_SHARED_LIBS", "shared"),
self.define_from_variant("USE_ZSTD", "zstd"),
self.define_from_variant("USE_OMP", "openmp"), self.define_from_variant("USE_OMP", "openmp"),
self.define_from_variant("BUILD_CLI_UTILITIES", "utilities"), self.define_from_variant("BUILD_CLI_UTILITIES", "utilities"),
self.define_from_variant("USE_ZSTD", "zstd"),
self.define_from_variant("USE_BUNDLED_ZSTD", "bundle_zstd"),
"-DSPERR_PREFER_RPATH=OFF", "-DSPERR_PREFER_RPATH=OFF",
"-DUSE_BUNDLED_ZSTD=OFF",
"-DBUILD_UNIT_TESTS=OFF", "-DBUILD_UNIT_TESTS=OFF",
] ]
return args return args