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

FEniCSx: updated dependencies (#25110)

Browse Source 
Co-authored-by: Massimiliano Culpo <massimiliano.culpo@gmail.com>
This commit is contained in:
Garth N. Wells 2021-07-30 10:32:28 +01:00 committed by GitHub
parent c1de2e926d
commit 711ed17606
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 28 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
var/spack/repos/builtin/packages/fenics-basix/package.py
View File

@ -17,6 +17,6 @@ class FenicsBasix(CMakePackage):
version("main", branch="main") version("main", branch="main")
version("0.1.0", sha256="2ab41fe6ad4f6c42f01b17a6e7c39debb4e0ae61c334d1caebee78b741bca4e7") version("0.1.0", sha256="2ab41fe6ad4f6c42f01b17a6e7c39debb4e0ae61c334d1caebee78b741bca4e7")
depends_on("cmake@3.16:", type="build") depends_on("cmake@3.18:", type="build")
depends_on("xtensor@0.23.4:", type="build") depends_on("xtensor@0.23.10:")
depends_on("blas", type=("build", "run")) depends_on("blas", type=("build", "run"))

13
var/spack/repos/builtin/packages/fenics-dolfinx/package.py
View File

@ -21,7 +21,7 @@ class FenicsDolfinx(CMakePackage):
variant("parmetis", default=False, description="parmetis support") variant("parmetis", default=False, description="parmetis support")
variant("slepc", default=False, description="slepc support") variant("slepc", default=False, description="slepc support")
depends_on("cmake@3.12:") depends_on("cmake@3.18:", type="build")
depends_on("pkgconfig", type="build") depends_on("pkgconfig", type="build")
depends_on("mpi") depends_on("mpi")
depends_on("hdf5") depends_on("hdf5")
@ -29,6 +29,7 @@ class FenicsDolfinx(CMakePackage):
depends_on("petsc+mpi+shared") depends_on("petsc+mpi+shared")
depends_on("petsc+mpi+shared@3.15.0:", when="@0.1.0") depends_on("petsc+mpi+shared@3.15.0:", when="@0.1.0")
depends_on("scotch+mpi") depends_on("scotch+mpi")
depends_on("xtensor@0.23.10:", type=("build", "link"))
depends_on("kahip", when="+kahip") depends_on("kahip", when="+kahip")
depends_on("parmetis", when="+parmetis") depends_on("parmetis", when="+parmetis")
@ -38,13 +39,9 @@ class FenicsDolfinx(CMakePackage):
depends_on("py-fenics-ffcx@main", type=("build", "run"), when="@main") depends_on("py-fenics-ffcx@main", type=("build", "run"), when="@main")
depends_on("py-fenics-ffcx@0.1.0", type=("build", "run"), when="@0.1.0") depends_on("py-fenics-ffcx@0.1.0", type=("build", "run"), when="@0.1.0")
depends_on("fenics-basix", type=("build", "run")) depends_on("fenics-basix", type=("build", "link"))
depends_on("fenics-basix@main", type=("build", "run"), when="@main") depends_on("fenics-basix@main", type=("build", "link"), when="@main")
depends_on("fenics-basix@0.1.0", type=("build", "run"), when="@0.1.0") depends_on("fenics-basix@0.1.0", type=("build", "link"), when="@0.1.0")
depends_on("py-fenics-basix", type=("build", "run"))
depends_on("py-fenics-basix@main", type=("build", "run"), when="@main")
depends_on("py-fenics-basix@0.1.0", type=("build", "run"), when="@0.1.0")
conflicts('%gcc@:8', msg='Improved C++17 support required') conflicts('%gcc@:8', msg='Improved C++17 support required')

3
var/spack/repos/builtin/packages/py-fenics-basix/package.py
View File

@ -24,7 +24,8 @@ class PyFenicsBasix(PythonPackage):
depends_on("python@3.7:", type=('build', 'run')) depends_on("python@3.7:", type=('build', 'run'))
depends_on("py-setuptools", type="build") depends_on("py-setuptools", type="build")
depends_on("cmake@3.18:", type="build") depends_on("cmake@3.18:", type="build")
depends_on("py-pybind11@2.6.2:", type="build") depends_on("xtensor@0.23.10:", type="build")
depends_on("py-pybind11@2.6.2:2.7.99", type="build")
phases = ['build_ext', 'build', 'install'] phases = ['build_ext', 'build', 'install']

23
var/spack/repos/builtin/packages/py-fenics-dolfinx/package.py
View File

@ -18,28 +18,27 @@ class PyFenicsDolfinx(PythonPackage):
version("main", branch="main") version("main", branch="main")
version("0.1.0", sha256="0269379769b5b6d4d1864ded64402ecaea08054c2a5793c8685ea15a59af5e33") version("0.1.0", sha256="0269379769b5b6d4d1864ded64402ecaea08054c2a5793c8685ea15a59af5e33")
depends_on("cmake@3.12:", type="build") depends_on("cmake@3.18:", type="build")
depends_on("hdf5", type="build") depends_on("hdf5", type="build")
depends_on("pkgconfig", type=("build", "run")) depends_on("pkgconfig", type=("build", "run"))
depends_on('python@3.7:', type=('build', 'run')) depends_on('python@3.7:', type=('build', 'run'))
depends_on("py-setuptools", type="build") depends_on("py-setuptools", type="build")
depends_on("fenics-dolfinx@main", when="@main") depends_on("fenics-dolfinx@main", when="@main")
depends_on("fenics-dolfinx@0.1.0", when="@0.1.0") depends_on("fenics-dolfinx@0.1.0", when="@0.1.0")
depends_on("fenics-basix@main", type=("build", "run"), when="@main") depends_on("fenics-basix@main", type=("build", "link"), when="@main")
depends_on("fenics-basix@0.1.0", type=("build", "run"), when="@0.1.0") depends_on("fenics-basix@0.1.0", type=("build", "link"), when="@0.1.0")
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@2.6.2:", type=("build", "run")) depends_on("py-pybind11@2.6.2:2.7.99", type=("build", "run"))
depends_on("xtensor@0.23.10:", type="build")
depends_on("py-fenics-ffcx@main", type=("run"), when="@main") depends_on("py-fenics-ffcx@main", type="run", when="@main")
depends_on("py-fenics-ffcx@0.1.0", type=("run"), when="@0.1.0") depends_on("py-fenics-ffcx@0.1.0", type="run", when="@0.1.0")
depends_on("py-fenics-basix", type=("run"), when="@main") depends_on("py-fenics-ufl@main", type="run", when="@main")
depends_on("py-fenics-basix@0.1.0", type=("run"), when="@0.1.0") depends_on("py-fenics-ufl@2021.1.0", type="run", when="@0.1.0")
depends_on("py-fenics-ufl@main", type=("run"), when="@main")
depends_on("py-fenics-ufl@2021.1.0", type=("run"), when="@0.1.0")
depends_on("py-cffi", type=("run")) depends_on("py-cffi", type="run")
depends_on("py-numpy", type=("run")) depends_on("py-numpy", type="run")
phases = ['build_ext', 'build', 'install'] phases = ['build_ext', 'build', 'install']

14
var/spack/repos/builtin/packages/py-fenics-ffcx/package.py
View File

@ -17,14 +17,14 @@ class PyFenicsFfcx(PythonPackage):
version('main', branch='main') version('main', branch='main')
version('0.1.0', sha256='98a47906146ac892fb4a358e04cbfd04066f12d0a4cdb505a6b08ff0b1a17e89') version('0.1.0', sha256='98a47906146ac892fb4a358e04cbfd04066f12d0a4cdb505a6b08ff0b1a17e89')
depends_on('python@3.5:', type=('build', 'run')) depends_on('python@3.7:', type=('build', 'run'))
depends_on('py-setuptools', type=('build', 'run')) depends_on('py-setuptools', type=('build', 'run'))
depends_on('py-cffi', type=('build', 'run')) depends_on('py-cffi', type='run')
depends_on('py-fenics-ufl@main', type=('build', 'run'), when='@main') depends_on('py-fenics-ufl@main', type='run', when='@main')
depends_on('py-fenics-ufl@2021.1.0', type=('build', 'run'), when='@0.1.0') depends_on('py-fenics-ufl@2021.1.0', type='run', when='@0.1.0')
depends_on('py-fenics-basix@main', type=('build', 'run'), when='@main') depends_on('py-fenics-basix@main', type='run', when='@main')
depends_on('py-fenics-basix@0.1.0', type=('build', 'run'), when='@0.1.0') depends_on('py-fenics-basix@0.1.0', type='run', when='@0.1.0')
depends_on('py-numpy', type=('build', 'run')) depends_on('py-numpy', type='run')

2
var/spack/repos/builtin/packages/py-fenics-ufl/package.py
View File

@ -27,6 +27,6 @@ class PyFenicsUfl(PythonPackage):
version('2017.1.0.post1', sha256='82c8170f44c2392c7e60aa86495df22cc209af50735af8115dc35aeda4b0ca96') version('2017.1.0.post1', sha256='82c8170f44c2392c7e60aa86495df22cc209af50735af8115dc35aeda4b0ca96')
version('2016.2.0', tag='ufl-2016.2.0') version('2016.2.0', tag='ufl-2016.2.0')
depends_on("python@3.5:", type=('build', 'run')) depends_on("python@3.7:", type=('build', 'run'))
depends_on("py-setuptools", type="build") depends_on("py-setuptools", type="build")
depends_on("py-numpy", type=("build", "run")) depends_on("py-numpy", type=("build", "run"))