diff options
| author | Garth N. Wells <gnw20@cam.ac.uk> | 2022-06-01 03:49:49 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-31 18:49:49 -0700 |
| commit | d166b948ce4eb2524a162a90d0ca825b93d86d7c (patch) | |
| tree | 264aed2e3b0b8237d0f2bb2db260f848c7acfad6 | |
| parent | 9cc3a2942d7933a676967363d913b6aaa3dd37d3 (diff) | |
| download | spack-d166b948ce4eb2524a162a90d0ca825b93d86d7c.tar.gz spack-d166b948ce4eb2524a162a90d0ca825b93d86d7c.tar.bz2 spack-d166b948ce4eb2524a162a90d0ca825b93d86d7c.tar.xz spack-d166b948ce4eb2524a162a90d0ca825b93d86d7c.zip | |
fenics-dolfinx: dependency updates (#30919)
* Add pugixml dependency
* Dependency updates
* Fix Spack Numpy verion
* Test more generous NumPy constraint
* Fix NumPy requirment
| -rw-r--r-- | var/spack/repos/builtin/packages/fenics-dolfinx/package.py | 2 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/py-fenics-dolfinx/package.py | 7 |
2 files changed, 6 insertions, 3 deletions
diff --git a/var/spack/repos/builtin/packages/fenics-dolfinx/package.py b/var/spack/repos/builtin/packages/fenics-dolfinx/package.py index 57bf98d826..3e1ab12a87 100644 --- a/var/spack/repos/builtin/packages/fenics-dolfinx/package.py +++ b/var/spack/repos/builtin/packages/fenics-dolfinx/package.py @@ -59,6 +59,7 @@ class FenicsDolfinx(CMakePackage): depends_on("slepc", when="+slepc") depends_on("adios2+mpi", when="+adios2") + depends_on("pugixml", when="@main") depends_on("fenics-ufcx@main", when="@main") depends_on("fenics-ufcx@0.4.2", when="@0.4.1") @@ -86,6 +87,7 @@ class FenicsDolfinx(CMakePackage): if self.spec.satisfies('@0.4.0:'): args += [ + self.define('DOLFINX_UFCX_PYTHON', False), self.define('DOLFINX_ENABLE_KAHIP', 'partitioners=kahip' in self.spec), self.define('DOLFINX_ENABLE_PARMETIS', 'partitioners=parmetis' in self.spec), 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 91dc5052ee..c671f3555b 100644 --- a/var/spack/repos/builtin/packages/py-fenics-dolfinx/package.py +++ b/var/spack/repos/builtin/packages/py-fenics-dolfinx/package.py @@ -32,12 +32,12 @@ class PyFenicsDolfinx(PythonPackage): depends_on("fenics-dolfinx@0.3.0", when="@0.3.0") depends_on("fenics-dolfinx@0.2.0", when="@0.2.0") depends_on("fenics-dolfinx@0.1.0", when="@0.1.0") + depends_on("fenics-basix@main", type=("build", "link"), when="@main") depends_on("fenics-basix@0.4.2", type=("build", "link"), when="@0.4.1") depends_on("fenics-basix@0.3.0", type=("build", "link"), when="@0.3.0") depends_on("fenics-basix@0.2.0", type=("build", "link"), when="@0.2.0") depends_on("fenics-basix@0.1.0", type=("build", "link"), when="@0.1.0") - depends_on("py-fenics-ffcx@main", type="run", when="@main") depends_on("py-fenics-ffcx@0.4.2", type="run", when="@0.4.1") depends_on("py-fenics-ffcx@0.3.0", type="run", when="@0.3.0") @@ -47,13 +47,14 @@ class PyFenicsDolfinx(PythonPackage): depends_on("py-fenics-ufl@2022.1.0", type="run", when="@0.4.1") depends_on("py-fenics-ufl@2021.1.0", type="run", when="@0.1:0.3.99") - depends_on("py-numpy@:1.20.3", type=("build", "run")) + depends_on("py-numpy@1.21:", type=("build", "run"), when="@main") + depends_on("py-numpy", type=("build", "run")) + depends_on("py-mpi4py", type=("build", "run")) depends_on("py-petsc4py", type=("build", "run")) depends_on("py-pybind11@2.6.2:", type=("build", "run")) depends_on("xtensor@0.23.10:", type="build") depends_on("py-cffi", type="run") - depends_on("py-numpy", type="run") build_directory = 'python' |