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

Fides 1.2 (#36787)

Browse source 
* VTK-m: Add conflict for 64 bit ids and Ascent types

* Fides: Add version 1.2

* [@spackbot] updating style on behalf of kwryankrattiger
This commit is contained in:
kwryankrattiger 2023-04-11 17:44:10 -05:00 committed by GitHub
parent 9996812067
commit 68f50f9b11
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
var/spack/repos/builtin/packages/fides/package.py
View file

@ -16,6 +16,7 @@ class Fides(CMakePackage):
maintainers("caitlinross", "dpugmire") maintainers("caitlinross", "dpugmire")
version("master", branch="master") version("master", branch="master")
version("1.2.0", sha256="12be939d75c765dab9241f9ed2b64af01cce2b10281de402f64fb685e6ccd7df")
version("1.1.0", sha256="40d2e08b8d5cfdfc809eae6ed2ae0731108ce3b1383485f4934a5ec8aaa9425e") version("1.1.0", sha256="40d2e08b8d5cfdfc809eae6ed2ae0731108ce3b1383485f4934a5ec8aaa9425e")
version("1.0.0", sha256="c355fdb4ca3790c1fa9a4491a0d294b8f883b6946c540ad9e5633c9fd8c8c3aa") version("1.0.0", sha256="c355fdb4ca3790c1fa9a4491a0d294b8f883b6946c540ad9e5633c9fd8c8c3aa")
variant("mpi", default=True, description="build mpi support") variant("mpi", default=True, description="build mpi support")
@ -24,7 +25,10 @@ class Fides(CMakePackage):
depends_on("cmake@3.14.1:3.14,3.18.2:", type="build") depends_on("cmake@3.14.1:3.14,3.18.2:", type="build")
depends_on("mpi", when="+mpi") depends_on("mpi", when="+mpi")
depends_on("adios2~zfp") depends_on("adios2")
# Type check failures when using 32 bit IDs and ADIOS2 with ZFP in older
# versions of Fides
depends_on("adios2~zfp", when="@:1.1 ^vtk-m ~64bitids")
depends_on("vtk-m") depends_on("vtk-m")
# Fix missing implicit includes # Fix missing implicit includes

4
var/spack/repos/builtin/packages/vtk-m/package.py
View file

@ -132,6 +132,10 @@ class VtkM(CMakePackage, CudaPackage, ROCmPackage):
conflicts("+cuda", when="cuda_arch=none", msg="vtk-m +cuda requires that cuda_arch be set") conflicts("+cuda", when="cuda_arch=none", msg="vtk-m +cuda requires that cuda_arch be set")
conflicts(
"+ascent_types", when="+64bitids", msg="Ascent types requires 32 bit IDs for compatibility"
)
# Patch # Patch
patch("diy-include-cstddef.patch", when="@1.5.3:1.8.0") patch("diy-include-cstddef.patch", when="@1.5.3:1.8.0")