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

VTK: add version 9.0.0; update Python dependency constraints (#17019)

Browse source 
In Python 3.8, the reserved "tp_print" slot was changed from a function
pointer to a number, which broke the Python wrapping code in vtk@8
(causing "cannot convert 'std::nullptr_t' to 'Py_ssize_t'" errors in
various places).  This is fixed in vtk@9.0.0.

This patch:

1) adds vtk@9.0.0
2) updates depends_on constraints to only use python@3.8: for vtk@9:
   vtk@:8 depends on python@2, and vtk@8.0.1:8.9.9 depends on python@:3.7
3) Adds CMake flag VTK_PYTHON_VERSION=3 when using python@3 with vtk@9
This commit is contained in:
Tom Payerle 2020-06-16 14:33:35 -04:00 committed by GitHub
parent dc31afe67d
commit 4a948060cf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
var/spack/repos/builtin/packages/vtk/package.py
View file

@ -15,11 +15,12 @@ class Vtk(CMakePackage):
processing and visualization. """ processing and visualization. """
homepage = "http://www.vtk.org" homepage = "http://www.vtk.org"
url = "http://www.vtk.org/files/release/8.0/VTK-8.0.1.tar.gz" url = "https://www.vtk.org/files/release/9.0/VTK-9.0.0.tar.gz"
list_url = "http://www.vtk.org/download/" list_url = "http://www.vtk.org/download/"
maintainers = ['chuckatkins', 'danlipsa'] maintainers = ['chuckatkins', 'danlipsa']
version('9.0.0', sha256='15def4e6f84d72f82386617fe595ec124dda3cbd13ea19a0dcd91583197d8715')
version('8.2.0', sha256='34c3dc775261be5e45a8049155f7228b6bd668106c72a3c435d95730d17d57bb') version('8.2.0', sha256='34c3dc775261be5e45a8049155f7228b6bd668106c72a3c435d95730d17d57bb')
version('8.1.2', sha256='0995fb36857dd76ccfb8bb07350c214d9f9099e80b1e66b4a8909311f24ff0db') version('8.1.2', sha256='0995fb36857dd76ccfb8bb07350c214d9f9099e80b1e66b4a8909311f24ff0db')
version('8.1.1', sha256='71a09b4340f0a9c58559fe946dc745ab68a866cf20636a41d97b6046cb736324') version('8.1.1', sha256='71a09b4340f0a9c58559fe946dc745ab68a866cf20636a41d97b6046cb736324')
@ -44,11 +45,18 @@ class Vtk(CMakePackage):
# At the moment, we cannot build with both osmesa and qt, but as of # At the moment, we cannot build with both osmesa and qt, but as of
# VTK 8.1, that should change # VTK 8.1, that should change
conflicts('+osmesa', when='+qt') conflicts('+osmesa', when='+qt')
conflicts('^python@3:', when='@:8.0')
extends('python', when='+python') extends('python', when='+python')
depends_on('python@2.7:', when='+python', type=('build', 'run')) # Acceptable python versions depend on vtk version
# We need vtk at least 8.0.1 for python@3,
# and at least 9.0 for python@3.8
depends_on('python@2.7:2.9', when='@:8.0 +python', type=('build', 'run'))
depends_on('python@2.7:3.7.9', when='@8.0.1:8.9 +python',
type=('build', 'run'))
depends_on('python@2.7:', when='@9.0: +python', type=('build', 'run'))
# We need mpi4py if buidling python wrappers and using MPI
depends_on('py-mpi4py', when='+python+mpi', type='run') depends_on('py-mpi4py', when='+python+mpi', type='run')
# python3.7 compatibility patch backported from upstream # python3.7 compatibility patch backported from upstream
@ -164,6 +172,8 @@ def cmake_args(self):
]) ])
if '+mpi' in spec: if '+mpi' in spec:
cmake_args.append('-DVTK_USE_SYSTEM_MPI4PY:BOOL=ON') cmake_args.append('-DVTK_USE_SYSTEM_MPI4PY:BOOL=ON')
if spec.satisfies('@9.0.0: ^python@3:'):
cmake_args.append('-DVTK_PYTHON_VERSION=3')
else: else:
cmake_args.append('-DVTK_WRAP_PYTHON=OFF') cmake_args.append('-DVTK_WRAP_PYTHON=OFF')