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

Fenicsx ecosystem: various updates (#24940)

Browse Source 
* Updates for dependencies in main branch

* Add more depends

* Make CMake available at runtime for fenics-dolfinx

* Add maintainer

Co-authored-by: Garth N. Wells <gnw20@cam.ac.uk>
This commit is contained in:
Chris Richardson 2021-07-20 09:03:02 +01:00 committed by GitHub
parent 55fe16991c
commit 967743adc7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 29 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -12,7 +12,7 @@ class FenicsBasix(CMakePackage):
homepage = "https://github.com/FEniCS/basix" homepage = "https://github.com/FEniCS/basix"
url = "https://github.com/FEniCS/basix/archive/0.1.0.tar.gz" url = "https://github.com/FEniCS/basix/archive/0.1.0.tar.gz"
git = "https://github.com/FEniCS/basix.git" git = "https://github.com/FEniCS/basix.git"
maintainers = ["mscroggs", "chrisrichardson"] maintainers = ["mscroggs", "chrisrichardson", "garth-wells"]
version("main", branch="main") version("main", branch="main")
version("0.1.0", sha256="2ab41fe6ad4f6c42f01b17a6e7c39debb4e0ae61c334d1caebee78b741bca4e7") version("0.1.0", sha256="2ab41fe6ad4f6c42f01b17a6e7c39debb4e0ae61c334d1caebee78b741bca4e7")

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

@ -12,7 +12,7 @@ class FenicsDolfinx(CMakePackage):
homepage = "https://github.com/FEniCS/dolfinx" homepage = "https://github.com/FEniCS/dolfinx"
git = "https://github.com/FEniCS/dolfinx.git" git = "https://github.com/FEniCS/dolfinx.git"
url = "https://github.com/FEniCS/dolfinx/archive/0.1.0.tar.gz" url = "https://github.com/FEniCS/dolfinx/archive/0.1.0.tar.gz"
maintainers = ["js947", "chrisrichardson"] maintainers = ["js947", "chrisrichardson", "garth-wells"]
version("main", branch="main") version("main", branch="main")
version("0.1.0", sha256="0269379769b5b6d4d1864ded64402ecaea08054c2a5793c8685ea15a59af5e33") version("0.1.0", sha256="0269379769b5b6d4d1864ded64402ecaea08054c2a5793c8685ea15a59af5e33")
@ -21,25 +21,29 @@ 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.9:", type="build") depends_on("cmake@3.12:")
depends_on("pkgconfig", type="build") depends_on("pkgconfig", type="build")
depends_on("mpi") depends_on("mpi")
depends_on("hdf5") depends_on("hdf5")
depends_on("boost@1.7.0:+filesystem+program_options+timer") depends_on("boost@1.7.0:+filesystem+program_options+timer")
depends_on("petsc+mpi+shared", when="@main") 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("kahip", when="+kahip") depends_on("kahip", when="+kahip")
depends_on("parmetis", when="+parmetis") depends_on("parmetis", when="+parmetis")
depends_on("slepc", when="+slepc") depends_on("slepc", when="+slepc")
depends_on("py-fenics-ffcx", type=("build", "run"), when="@main") depends_on("py-fenics-ffcx", type=("build", "run"))
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"), when="@main") depends_on("fenics-basix", type=("build", "run"))
depends_on("fenics-basix@main", type=("build", "run"), 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", "run"), when="@0.1.0")
depends_on("py-fenics-basix", type=("build", "run"), when="@main")
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") 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')

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

@ -13,7 +13,7 @@ class PyFenicsBasix(PythonPackage):
homepage = "https://github.com/FEniCS/basix" homepage = "https://github.com/FEniCS/basix"
url = "https://github.com/FEniCS/basix/archive/0.1.0.tar.gz" url = "https://github.com/FEniCS/basix/archive/0.1.0.tar.gz"
git = "https://github.com/FEniCS/basix.git" git = "https://github.com/FEniCS/basix.git"
maintainers = ["chrisrichardson", "mscroggs"] maintainers = ["chrisrichardson", "mscroggs", "garth-wells"]
version("main", branch="main") version("main", branch="main")
version("0.1.0", sha256="2ab41fe6ad4f6c42f01b17a6e7c39debb4e0ae61c334d1caebee78b741bca4e7") version("0.1.0", sha256="2ab41fe6ad4f6c42f01b17a6e7c39debb4e0ae61c334d1caebee78b741bca4e7")
@ -21,10 +21,10 @@ class PyFenicsBasix(PythonPackage):
depends_on("fenics-basix@main", type=("build", "run"), when="@main") depends_on("fenics-basix@main", type=("build", "run"), 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", "run"), when="@0.1.0")
depends_on("python@3.6:", 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.1:2.6.99", type="build") depends_on("py-pybind11@2.6.2:", type="build")
phases = ['build_ext', 'build', 'install'] phases = ['build_ext', 'build', 'install']

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

@ -13,28 +13,29 @@ class PyFenicsDolfinx(PythonPackage):
homepage = "https://github.com/FEniCS/dolfinx" homepage = "https://github.com/FEniCS/dolfinx"
url = "https://github.com/FEniCS/dolfinx/archive/0.1.0.tar.gz" url = "https://github.com/FEniCS/dolfinx/archive/0.1.0.tar.gz"
git = "https://github.com/FEniCS/dolfinx.git" git = "https://github.com/FEniCS/dolfinx.git"
maintainers = ["js947", "chrisrichardson"] maintainers = ["js947", "chrisrichardson", "garth-wells"]
version("main", branch="main") version("main", branch="main")
version("0.1.0", sha256="0269379769b5b6d4d1864ded64402ecaea08054c2a5793c8685ea15a59af5e33") version("0.1.0", sha256="0269379769b5b6d4d1864ded64402ecaea08054c2a5793c8685ea15a59af5e33")
depends_on("cmake@3.9:", type="build") depends_on("cmake@3.12:", type="build")
depends_on("hdf5", 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.7:', type=('build', 'run'))
depends_on("py-setuptools", type="build") depends_on("py-setuptools", type="build")
depends_on("fenics-dolfinx", 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", type=("build", "run"), when="@main") depends_on("fenics-basix@main", type=("build", "run"), 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", "run"), 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.1:2.6.99", type=("build", "run")) depends_on("py-pybind11@2.6.2:", type=("build", "run"))
depends_on("py-fenics-ffcx", type=("run")) 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")) depends_on("py-fenics-basix", type=("run"), when="@main")
depends_on("py-fenics-basix@0.1.0", type=("run"), when="@0.1.0") depends_on("py-fenics-basix@0.1.0", type=("run"), when="@0.1.0")
depends_on("py-fenics-ufl", type=("run")) 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-fenics-ufl@2021.1.0", type=("run"), when="@0.1.0")
depends_on("py-cffi", type=("run")) depends_on("py-cffi", type=("run"))

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

@ -12,7 +12,7 @@ class PyFenicsFfcx(PythonPackage):
homepage = "https://github.com/FEniCS/ffcx" homepage = "https://github.com/FEniCS/ffcx"
url = "https://github.com/FEniCS/ffcx/archive/0.1.0.tar.gz" url = "https://github.com/FEniCS/ffcx/archive/0.1.0.tar.gz"
git = "https://github.com/FEniCS/ffcx.git" git = "https://github.com/FEniCS/ffcx.git"
maintainers = ["js947", "chrisrichardson"] maintainers = ["js947", "chrisrichardson", "garth-wells"]
version('main', branch='main') version('main', branch='main')
version('0.1.0', sha256='98a47906146ac892fb4a358e04cbfd04066f12d0a4cdb505a6b08ff0b1a17e89') version('0.1.0', sha256='98a47906146ac892fb4a358e04cbfd04066f12d0a4cdb505a6b08ff0b1a17e89')
@ -21,10 +21,10 @@ class PyFenicsFfcx(PythonPackage):
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=('build', 'run'))
depends_on('py-fenics-ufl', type=('build', 'run'), when='@main') depends_on('py-fenics-ufl@main', type=('build', '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=('build', 'run'), when='@0.1.0')
depends_on('py-fenics-basix', type=('build', 'run'), when='@main') 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') depends_on('py-fenics-basix@0.1.0', type=('build', 'run'), when='@0.1.0')
depends_on('py-numpy', type=('build', 'run')) depends_on('py-numpy', type=('build', 'run'))

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

@ -16,7 +16,7 @@ class PyFenicsUfl(PythonPackage):
homepage = "https://fenicsproject.org/" homepage = "https://fenicsproject.org/"
url = "https://github.com/FEniCS/ufl/archive/2019.1.0.tar.gz" url = "https://github.com/FEniCS/ufl/archive/2019.1.0.tar.gz"
git = "https://github.com/FEniCS/ufl.git" git = "https://github.com/FEniCS/ufl.git"
maintainers = ["js947", "chrisrichardson"] maintainers = ["js947", "chrisrichardson", "garth-wells"]
version("main", branch="main") version("main", branch="main")
version('2021.1.0', sha256='130fdc09bb7fcd39dcd2618426912b8a25a03431d94575711068b38c666b4337') version('2021.1.0', sha256='130fdc09bb7fcd39dcd2618426912b8a25a03431d94575711068b38c666b4337')