zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Darshan variant cleanup (#33165)

Browse Source 
* Darshan-Runtime: Cleanup version dependent variants

* Darshan-Util: Cleanup version dependent variants.
This commit is contained in:
kwryankrattiger
2022-10-11 14:04:22 -05:00
committed by GitHub
parent 5d0f0914b8
commit 4b866e8ffc
2 changed files with 13 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
var/spack/repos/builtin/packages/darshan-runtime/package.py
View File

@@ -63,14 +63,15 @@ class DarshanRuntime(AutotoolsPackage):
depends_on("m4", type="build", when="@3.4.0:") depends_on("m4", type="build", when="@3.4.0:")
variant("mpi", default=True, description="Compile with MPI support") variant("mpi", default=True, description="Compile with MPI support")
variant("hdf5", default=False, description="Compile with HDF5 module") variant("hdf5", default=False, description="Compile with HDF5 module", when="@3.2:")
variant("apmpi", default=False, description="Compile with AutoPerf MPI module") variant("apmpi", default=False, description="Compile with AutoPerf MPI module", when="@3.3:")
variant( variant(
"apmpi_sync", "apmpi_sync",
default=False, default=False,
description="Compile with AutoPerf MPI module (with collective synchronization timing)", description="Compile with AutoPerf MPI module (with collective synchronization timing)",
when="@3.3:",
) )
variant("apxc", default=False, description="Compile with AutoPerf XC module") variant("apxc", default=False, description="Compile with AutoPerf XC module", when="@3.3:")
variant( variant(
"scheduler", "scheduler",
default="NONE", default="NONE",
@@ -79,21 +80,6 @@ class DarshanRuntime(AutotoolsPackage):
multi=False, multi=False,
) )
conflicts(
"+hdf5", when="@:3.1.8", msg="+hdf5 variant only available starting from version 3.2.0"
)
conflicts(
"+apmpi", when="@:3.2.1", msg="+apmpi variant only available starting from version 3.3.0"
)
conflicts(
"+apmpi_sync",
when="@:3.2.1",
msg="+apmpi variant only available starting from version 3.3.0",
)
conflicts(
"+apxc", when="@:3.2.1", msg="+apxc variant only available starting from version 3.3.0"
)
@property @property
def configure_directory(self): def configure_directory(self):
return "darshan-runtime" return "darshan-runtime"

18
var/spack/repos/builtin/packages/darshan-util/package.py
View File

@@ -46,8 +46,15 @@ class DarshanUtil(AutotoolsPackage):
version("3.0.0", sha256="95232710f5631bbf665964c0650df729c48104494e887442596128d189da43e0") version("3.0.0", sha256="95232710f5631bbf665964c0650df729c48104494e887442596128d189da43e0")
variant("bzip2", default=False, description="Enable bzip2 compression") variant("bzip2", default=False, description="Enable bzip2 compression")
variant("apmpi", default=False, description="Compile with AutoPerf MPI module support") variant(
variant("apxc", default=False, description="Compile with AutoPerf XC module support") "apmpi",
default=False,
description="Compile with AutoPerf MPI module support",
when="@3.3:",
)
variant(
"apxc", default=False, description="Compile with AutoPerf XC module support", when="@3.3:"
)
depends_on("zlib") depends_on("zlib")
depends_on("bzip2", when="+bzip2", type=("build", "link", "run")) depends_on("bzip2", when="+bzip2", type=("build", "link", "run"))
@@ -62,13 +69,6 @@ class DarshanUtil(AutotoolsPackage):
patch("retvoid.patch", when="@3.2.0:3.2.1") patch("retvoid.patch", when="@3.2.0:3.2.1")
conflicts(
"+apmpi", when="@:3.2.1", msg="+apmpi variant only available starting from version 3.3.0"
)
conflicts(
"+apxc", when="@:3.2.1", msg="+apxc variant only available starting from version 3.3.0"
)
@property @property
def configure_directory(self): def configure_directory(self):
return "darshan-util" return "darshan-util"