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

dray: deprecate and simplify (#45015)

Browse Source
This commit is contained in:
Harmen Stoppels 2024-07-04 11:43:34 +02:00 committed by GitHub
parent 36d64fcbd4
commit ed1ebefd8f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 19 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
var/spack/repos/builtin/packages/apcomp/package.py
View File

@ -36,11 +36,12 @@ class Apcomp(Package):
maintainers("cyrush") maintainers("cyrush")
version("master", branch="master", submodules="True") with default_args(deprecated=True): # part of ascent
version("0.0.4", sha256="061876dd55e443de91a40d10662496f6bb58b0a3835aec78f5710f5a737d0494") version("master", branch="master", submodules="True")
version("0.0.3", sha256="07e8c1d6a23205f4cc66d0a030e65a69e8344545f4d56213d968b67a410adc6e") version("0.0.4", sha256="061876dd55e443de91a40d10662496f6bb58b0a3835aec78f5710f5a737d0494")
version("0.0.2", sha256="cb2e2c4524889408de2dd3d29665512c99763db13e6f5e35c3b55e52948c649c") version("0.0.3", sha256="07e8c1d6a23205f4cc66d0a030e65a69e8344545f4d56213d968b67a410adc6e")
version("0.0.1", sha256="cbf85fe58d5d5bc2f468d081386cc8b79861046b3bb7e966edfa3f8e95b998b2") version("0.0.2", sha256="cb2e2c4524889408de2dd3d29665512c99763db13e6f5e35c3b55e52948c649c")
version("0.0.1", sha256="cbf85fe58d5d5bc2f468d081386cc8b79861046b3bb7e966edfa3f8e95b998b2")
variant("openmp", default=True, description="Build with openmp support") variant("openmp", default=True, description="Build with openmp support")
variant("mpi", default=True, description="Build with MPI support") variant("mpi", default=True, description="Build with MPI support")
@ -60,19 +61,8 @@ def install(self, spec, prefix):
""" """
with working_dir("spack-build", create=True): with working_dir("spack-build", create=True):
host_cfg_fname = self.create_host_config(spec, prefix) host_cfg_fname = self.create_host_config(spec, prefix)
cmake_args = []
# if we have a static build, we need to avoid any of
# spack's default cmake settings related to rpaths
# (see: https://github.com/LLNL/spack/issues/2658)
if "+shared" in spec:
cmake_args.extend(std_cmake_args)
else:
for arg in std_cmake_args:
if arg.count("RPATH") == 0:
cmake_args.append(arg)
cmake_args.extend(["-C", host_cfg_fname, "../src"])
print("Configuring APComp...") print("Configuring APComp...")
cmake(*cmake_args) cmake(*std_cmake_args, "-C", host_cfg_fname, "../src")
print("Building APComp...") print("Building APComp...")
make() make()
print("Installing APComp...") print("Installing APComp...")

34
var/spack/repos/builtin/packages/dray/package.py
View File

@ -45,16 +45,17 @@ class Dray(Package, CudaPackage):
license("BSD-3-Clause") license("BSD-3-Clause")
version("develop", branch="develop", submodules="True") with default_args(deprecated=True): # part of ascent
version("0.1.8", sha256="ae78ca6a5a31f06f6400a4a1ff6fc1d75347c8b41027a80662179f5b877eee30") version("develop", branch="develop", submodules="True")
version("0.1.7", sha256="11ea794c1a24d7ed0d76bad7209d62bafc033ec40a2ea3a00e68fe598c6aa46d") version("0.1.8", sha256="ae78ca6a5a31f06f6400a4a1ff6fc1d75347c8b41027a80662179f5b877eee30")
version("0.1.6", sha256="43f39039599e3493cbbaeaf5621b611bef301ff504bed6e32c98f30bb2179e92") version("0.1.7", sha256="11ea794c1a24d7ed0d76bad7209d62bafc033ec40a2ea3a00e68fe598c6aa46d")
version("0.1.5", sha256="aaf0975561a8e7910b9353e2dc30bd78abf9f01c306ec042422b7da223d3a8b8") version("0.1.6", sha256="43f39039599e3493cbbaeaf5621b611bef301ff504bed6e32c98f30bb2179e92")
version("0.1.4", sha256="e763a3aa537b23486a4788f9d68db0a3eb545f6a2e617cd7c8a876682ca2d0a0") version("0.1.5", sha256="aaf0975561a8e7910b9353e2dc30bd78abf9f01c306ec042422b7da223d3a8b8")
version("0.1.3", sha256="b2f624a072463189997343b1ed911cc34c9bb1b6c7f0c3e48efeb40c05dd0d92") version("0.1.4", sha256="e763a3aa537b23486a4788f9d68db0a3eb545f6a2e617cd7c8a876682ca2d0a0")
version("0.1.2", sha256="46937f20124b28dc78a634e8e063a3e7a3bbfd9f424ce2680b08417010c376da") version("0.1.3", sha256="b2f624a072463189997343b1ed911cc34c9bb1b6c7f0c3e48efeb40c05dd0d92")
version("0.1.1", sha256="e5daa49ee3367c087f5028dc5a08655298beb318014c6f3f65ef4a08fcbe346c") version("0.1.2", sha256="46937f20124b28dc78a634e8e063a3e7a3bbfd9f424ce2680b08417010c376da")
version("0.1.0", sha256="8b341138e1069361351e0a94478608c5af479cca76e2f97d556229aed45c0169") version("0.1.1", sha256="e5daa49ee3367c087f5028dc5a08655298beb318014c6f3f65ef4a08fcbe346c")
version("0.1.0", sha256="8b341138e1069361351e0a94478608c5af479cca76e2f97d556229aed45c0169")
variant("openmp", default=True, description="Build OpenMP backend") variant("openmp", default=True, description="Build OpenMP backend")
variant("shared", default=True, description="Build as shared libs") variant("shared", default=True, description="Build as shared libs")
@ -115,19 +116,8 @@ def install(self, spec, prefix):
""" """
with working_dir("spack-build", create=True): with working_dir("spack-build", create=True):
host_cfg_fname = self.create_host_config(spec, prefix) host_cfg_fname = self.create_host_config(spec, prefix)
cmake_args = []
# if we have a static build, we need to avoid any of
# spack's default cmake settings related to rpaths
# (see: https://github.com/LLNL/spack/issues/2658)
if "+shared" in spec:
cmake_args.extend(std_cmake_args)
else:
for arg in std_cmake_args:
if arg.count("RPATH") == 0:
cmake_args.append(arg)
cmake_args.extend(["-C", host_cfg_fname, "../src"])
print("Configuring Devil Ray...") print("Configuring Devil Ray...")
cmake(*cmake_args) cmake(*std_cmake_args, "-C", host_cfg_fname, "../src")
print("Building Devil Ray...") print("Building Devil Ray...")
make() make()
# run unit tests if requested # run unit tests if requested