Fenicsx package updates for basix install (#22679)

Co-authored-by: Garth N. Wells <gnw20@cam.ac.uk>
This commit is contained in:
Chris Richardson 2021-04-01 13:35:01 +01:00 committed by GitHub
parent efaa2c160f
commit 5ed00560cd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 34 additions and 9 deletions

View File

@ -0,0 +1,20 @@
# Copyright 2013-2021 Lawrence Livermore National Security, LLC and other
# Spack Project Developers. See the top-level COPYRIGHT file for details.
#
# SPDX-License-Identifier: (Apache-2.0 OR MIT)
from spack import *
class FenicsBasix(CMakePackage):
"""FEniCS element and quadrature runtime"""
homepage = "https://github.com/FEniCS/basix"
git = "https://github.com/FEniCS/basix.git"
maintainers = ["mscroggs", "chrisrichardson"]
version("main", branch="main")
depends_on("cmake@3.16:", type="build")
depends_on("xtensor@0.23.2:", type="build")
depends_on("blas")

View File

@ -13,7 +13,7 @@ class FenicsDolfinx(CMakePackage):
git = "https://github.com/FEniCS/dolfinx.git" git = "https://github.com/FEniCS/dolfinx.git"
maintainers = ["js947", "chrisrichardson"] maintainers = ["js947", "chrisrichardson"]
version("master", branch="master") version("main", branch="main")
variant("kahip", default=False, description="kahip support") variant("kahip", default=False, description="kahip support")
variant("parmetis", default=False, description="parmetis support") variant("parmetis", default=False, description="parmetis support")
@ -33,6 +33,7 @@ class FenicsDolfinx(CMakePackage):
depends_on("slepc", when="+slepc") depends_on("slepc", when="+slepc")
depends_on("py-fenics-ffcx", type=("build", "run")) depends_on("py-fenics-ffcx", type=("build", "run"))
depends_on("fenics-basix", type=("build", "run"))
depends_on("py-fenics-basix", type=("build", "run")) depends_on("py-fenics-basix", type=("build", "run"))
conflicts('%gcc@:8', msg='Improved C++17 support required') conflicts('%gcc@:8', msg='Improved C++17 support required')

View File

@ -16,11 +16,13 @@ class PyFenicsBasix(PythonPackage):
version("main", branch="main") version("main", branch="main")
depends_on("cmake@3.9:", type="build") depends_on("fenics-basix@main", type=("build", "run"))
depends_on("python@3.6:", type=('build', 'run'))
depends_on("eigen@3.3.7:") depends_on("eigen@3.3.7:")
depends_on("python@3.5:", type=('build', 'run'))
depends_on("py-setuptools", type="build") depends_on("py-setuptools", type="build")
depends_on("py-scikit-build", type="build") depends_on("cmake@3.18:", type="build")
depends_on("py-pybind11", type="build") depends_on("py-pybind11@2.6.2:", type="build")
phases = ['build', 'install'] phases = ['build_ext', 'build', 'install']
build_directory = 'python'

View File

@ -14,18 +14,20 @@ class PyFenicsDolfinx(PythonPackage):
git = "https://github.com/FEniCS/dolfinx.git" git = "https://github.com/FEniCS/dolfinx.git"
maintainers = ["js947", "chrisrichardson"] maintainers = ["js947", "chrisrichardson"]
version("master", branch="master") version("main", branch="main")
depends_on("cmake@3.9:", type="build") depends_on("cmake@3.9:", type="build")
depends_on("pkgconfig", type=("build", "run")) depends_on("pkgconfig", type=("build", "run"))
depends_on('python@3.5:', type=('build', 'run')) depends_on('python@3.5:', type=('build', 'run'))
depends_on("py-setuptools", type="build") depends_on("py-setuptools", type="build")
depends_on("fenics-dolfinx@master") depends_on("fenics-dolfinx@main")
depends_on("fenics-basix@main", type=("build", "run"))
depends_on("py-mpi4py", type=("build", "run")) depends_on("py-mpi4py", type=("build", "run"))
depends_on("py-petsc4py", type=("build", "run")) depends_on("py-petsc4py", type=("build", "run"))
depends_on("py-pybind11", type=("build", "run")) depends_on("py-pybind11", type=("build", "run"))
depends_on("py-fenics-ffcx", type=("run")) depends_on("py-fenics-ffcx", type=("run"))
depends_on("py-fenics-basix", type=("run"))
depends_on("py-fenics-ufl", type=("run")) depends_on("py-fenics-ufl", type=("run"))
depends_on("py-cffi", type=("run")) depends_on("py-cffi", type=("run"))
depends_on("py-numpy", type=("run")) depends_on("py-numpy", type=("run"))

View File

@ -13,7 +13,7 @@ class PyFenicsFfcx(PythonPackage):
git = "https://github.com/FEniCS/ffcx.git" git = "https://github.com/FEniCS/ffcx.git"
maintainers = ["js947", "chrisrichardson"] maintainers = ["js947", "chrisrichardson"]
version("master", branch="master") version("main", branch="main")
depends_on('python@3.5:', type=('build', 'run')) depends_on('python@3.5:', type=('build', 'run'))
depends_on("py-setuptools", type=("build", "run")) depends_on("py-setuptools", type=("build", "run"))