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

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

@ -36,6 +36,7 @@ class Apcomp(Package):
maintainers("cyrush") maintainers("cyrush")
with default_args(deprecated=True): # part of ascent
version("master", branch="master", submodules="True") version("master", branch="master", submodules="True")
version("0.0.4", sha256="061876dd55e443de91a40d10662496f6bb58b0a3835aec78f5710f5a737d0494") version("0.0.4", sha256="061876dd55e443de91a40d10662496f6bb58b0a3835aec78f5710f5a737d0494")
version("0.0.3", sha256="07e8c1d6a23205f4cc66d0a030e65a69e8344545f4d56213d968b67a410adc6e") version("0.0.3", sha256="07e8c1d6a23205f4cc66d0a030e65a69e8344545f4d56213d968b67a410adc6e")
@ -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...")

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

@ -45,6 +45,7 @@ class Dray(Package, CudaPackage):
license("BSD-3-Clause") license("BSD-3-Clause")
with default_args(deprecated=True): # part of ascent
version("develop", branch="develop", submodules="True") version("develop", branch="develop", submodules="True")
version("0.1.8", sha256="ae78ca6a5a31f06f6400a4a1ff6fc1d75347c8b41027a80662179f5b877eee30") version("0.1.8", sha256="ae78ca6a5a31f06f6400a4a1ff6fc1d75347c8b41027a80662179f5b877eee30")
version("0.1.7", sha256="11ea794c1a24d7ed0d76bad7209d62bafc033ec40a2ea3a00e68fe598c6aa46d") version("0.1.7", sha256="11ea794c1a24d7ed0d76bad7209d62bafc033ec40a2ea3a00e68fe598c6aa46d")
@ -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