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

ascent: a few small changes to the package (#25551)

Browse Source 
- provides the site packages fix
- excludes the hdf5 linking changes (which are fixed in conduit@develop's build system)
- relaxes constraints to allows building static ascent against shared python
This commit is contained in:
Cyrus Harrison 2021-08-21 09:01:27 -07:00 committed by GitHub
parent 9b66138054
commit 768ea7e8f7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -93,27 +93,25 @@ class Ascent(Package, CudaPackage):
# Certain CMake versions have been found to break for our use cases # Certain CMake versions have been found to break for our use cases
depends_on("cmake@3.14.1:3.14.99,3.18.2:", type='build') depends_on("cmake@3.14.1:3.14.99,3.18.2:", type='build')
depends_on("conduit~python", when="~python") depends_on("conduit~python", when="~python")
depends_on("conduit+python", when="+python+shared") depends_on("conduit+python", when="+python")
depends_on("conduit~shared~python", when="~shared") depends_on("conduit+mpi", when="+mpi")
depends_on("conduit~python~mpi", when="~python~mpi") depends_on("conduit~mpi", when="~mpi")
depends_on("conduit+python~mpi", when="+python+shared~mpi")
depends_on("conduit~shared~python~mpi", when="~shared~mpi")
####################### #######################
# Python # Python
####################### #######################
# we need a shared version of python b/c linking with static python lib # we need a shared version of python b/c linking with static python lib
# causes duplicate state issues when running compiled python modules. # causes duplicate state issues when running compiled python modules.
depends_on("python+shared", when="+python+shared") depends_on("python+shared", when="+python")
extends("python", when="+python+shared") extends("python", when="+python")
depends_on("py-numpy", when="+python+shared", type=('build', 'run')) depends_on("py-numpy", when="+python", type=('build', 'run'))
depends_on("py-pip", when="+python+shared", type=('build', 'run')) depends_on("py-pip", when="+python", type=('build', 'run'))
####################### #######################
# MPI # MPI
####################### #######################
depends_on("mpi", when="+mpi") depends_on("mpi", when="+mpi")
depends_on("py-mpi4py", when="+mpi+python+shared") depends_on("py-mpi4py", when="+mpi+python")
####################### #######################
# BabelFlow # BabelFlow
@ -185,7 +183,11 @@ def install(self, spec, prefix):
with working_dir('spack-build', create=True): with working_dir('spack-build', create=True):
py_site_pkgs_dir = None py_site_pkgs_dir = None
if "+python" in spec: if "+python" in spec:
py_site_pkgs_dir = site_packages_dir try:
py_site_pkgs_dir = site_packages_dir
except NameError:
# spack's site_packages_dir won't exist in a subclass
pass
host_cfg_fname = self.create_host_config(spec, host_cfg_fname = self.create_host_config(spec,
prefix, prefix,