From 5ed00560cd0f717a50afdbdf66db7ccfd1e5a182 Mon Sep 17 00:00:00 2001 From: Chris Richardson Date: Thu, 1 Apr 2021 13:35:01 +0100 Subject: Fenicsx package updates for basix install (#22679) Co-authored-by: Garth N. Wells --- .../repos/builtin/packages/fenics-basix/package.py | 20 ++++++++++++++++++++ .../repos/builtin/packages/fenics-dolfinx/package.py | 3 ++- .../builtin/packages/py-fenics-basix/package.py | 12 +++++++----- .../builtin/packages/py-fenics-dolfinx/package.py | 6 ++++-- .../repos/builtin/packages/py-fenics-ffcx/package.py | 2 +- 5 files changed, 34 insertions(+), 9 deletions(-) create mode 100644 var/spack/repos/builtin/packages/fenics-basix/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/fenics-basix/package.py b/var/spack/repos/builtin/packages/fenics-basix/package.py new file mode 100644 index 0000000000..f2d97cbc74 --- /dev/null +++ b/var/spack/repos/builtin/packages/fenics-basix/package.py @@ -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") diff --git a/var/spack/repos/builtin/packages/fenics-dolfinx/package.py b/var/spack/repos/builtin/packages/fenics-dolfinx/package.py index 411fb1042e..7607387afa 100644 --- a/var/spack/repos/builtin/packages/fenics-dolfinx/package.py +++ b/var/spack/repos/builtin/packages/fenics-dolfinx/package.py @@ -13,7 +13,7 @@ class FenicsDolfinx(CMakePackage): git = "https://github.com/FEniCS/dolfinx.git" maintainers = ["js947", "chrisrichardson"] - version("master", branch="master") + version("main", branch="main") variant("kahip", default=False, description="kahip support") variant("parmetis", default=False, description="parmetis support") @@ -33,6 +33,7 @@ class FenicsDolfinx(CMakePackage): depends_on("slepc", when="+slepc") depends_on("py-fenics-ffcx", type=("build", "run")) + depends_on("fenics-basix", type=("build", "run")) depends_on("py-fenics-basix", type=("build", "run")) conflicts('%gcc@:8', msg='Improved C++17 support required') diff --git a/var/spack/repos/builtin/packages/py-fenics-basix/package.py b/var/spack/repos/builtin/packages/py-fenics-basix/package.py index 581dabfcf3..9fec47e0db 100644 --- a/var/spack/repos/builtin/packages/py-fenics-basix/package.py +++ b/var/spack/repos/builtin/packages/py-fenics-basix/package.py @@ -16,11 +16,13 @@ class PyFenicsBasix(PythonPackage): 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("python@3.5:", type=('build', 'run')) depends_on("py-setuptools", type="build") - depends_on("py-scikit-build", type="build") - depends_on("py-pybind11", type="build") + depends_on("cmake@3.18:", type="build") + depends_on("py-pybind11@2.6.2:", type="build") - phases = ['build', 'install'] + phases = ['build_ext', 'build', 'install'] + + build_directory = 'python' diff --git a/var/spack/repos/builtin/packages/py-fenics-dolfinx/package.py b/var/spack/repos/builtin/packages/py-fenics-dolfinx/package.py index 9532b4da86..d23c7dd508 100644 --- a/var/spack/repos/builtin/packages/py-fenics-dolfinx/package.py +++ b/var/spack/repos/builtin/packages/py-fenics-dolfinx/package.py @@ -14,18 +14,20 @@ class PyFenicsDolfinx(PythonPackage): git = "https://github.com/FEniCS/dolfinx.git" maintainers = ["js947", "chrisrichardson"] - version("master", branch="master") + version("main", branch="main") depends_on("cmake@3.9:", type="build") depends_on("pkgconfig", type=("build", "run")) depends_on('python@3.5:', type=('build', 'run')) 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-petsc4py", type=("build", "run")) depends_on("py-pybind11", type=("build", "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-cffi", type=("run")) depends_on("py-numpy", type=("run")) diff --git a/var/spack/repos/builtin/packages/py-fenics-ffcx/package.py b/var/spack/repos/builtin/packages/py-fenics-ffcx/package.py index b74de19508..53959c1278 100644 --- a/var/spack/repos/builtin/packages/py-fenics-ffcx/package.py +++ b/var/spack/repos/builtin/packages/py-fenics-ffcx/package.py @@ -13,7 +13,7 @@ class PyFenicsFfcx(PythonPackage): git = "https://github.com/FEniCS/ffcx.git" maintainers = ["js947", "chrisrichardson"] - version("master", branch="master") + version("main", branch="main") depends_on('python@3.5:', type=('build', 'run')) depends_on("py-setuptools", type=("build", "run")) -- cgit v1.2.3-60-g2f50