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

petsc, py-petsc4py: add v3.18.4, v3.18.5 (#36406)

Browse Source 
* py-petsc4py: update ldshared-dev.patch [to work with current @main]

* petsc4py: always force rebuild cython sources
This commit is contained in:
Satish Balay 2023-03-27 02:44:43 -05:00 committed by GitHub
parent 37fadd9b2f
commit 56d98c3f0a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
var/spack/repos/builtin/packages/petsc/package.py
View File

@ -22,6 +22,8 @@ class Petsc(Package, CudaPackage, ROCmPackage):
version("main", branch="main")
version("3.18.5", sha256="df73ae13a4c5758325a9d69350cac423742657d8a8fc5782504b0e469ce46499")
version("3.18.4", sha256="6173d30637261c5b740c0bea14747759200ca2012c7343139f9216bc296a6394")
version("3.18.3", sha256="8aaa005479c8ec2eed2b9cbb067cfc1ac0900b0de2176439f0d4f21e09c2020b")
version("3.18.2", sha256="4e055f92f3d5123d415f6f3ccf5ede9989f16d9e1f71cc7998ad244a3d3562f4")
version("3.18.1", sha256="02f5979a22f5961bb775d527f8450db77bc6a8d2541f3b05fb586829b82e9bc8")

4
var/spack/repos/builtin/packages/py-petsc4py/ldshared-dev.patch
View File

@ -1,7 +1,7 @@
diff --git a/src/binding/petsc4py/conf/baseconf.py b/src/binding/petsc4py/conf/baseconf.py
index 8a2466a5bd..73c08b923a 100644
--- a/src/binding/petsc4py/conf/baseconf.py
+++ b/src/binding/petsc4py/conf/baseconf.py
--- a/src/binding/petsc4py/conf/confpetsc.py
+++ b/src/binding/petsc4py/conf/confpetsc.py
@@ -211,7 +211,7 @@ class PetscConfig:
ldshared = getenv('LDSHARED', ldshared)
ldflags = getenv('LDFLAGS', cflags + ' ' + (ldflags or ''))

10
var/spack/repos/builtin/packages/py-petsc4py/package.py
View File

@ -16,6 +16,8 @@ class PyPetsc4py(PythonPackage):
maintainers("balay")
version("main", branch="main")
version("3.18.5", sha256="625cbb99d7d3000ad05afe60585c6aa24ca650894b09a1989127febb64b65470")
version("3.18.4", sha256="84a055b7f38d1200a8c486c89db05ce0724fe28da56afb656660cef054384e24")
version("3.18.3", sha256="853ab9620c4832cbfe1f490edde827a505c8a376cc1a7b4fa6406faac9059433")
version("3.18.2", sha256="1b6761b02ec6ef9099e2a048e234065c1c4096ace01e52e353624b80417cceec")
version("3.18.1", sha256="6d9d9632e2da0920c4e3905b7bac919837bdd85ecfaf1b9e461ba7e05ec4a5ce")
@ -50,7 +52,8 @@ class PyPetsc4py(PythonPackage):
patch("ldshared.patch", when="@:99")
patch("ldshared-dev.patch", when="@main")
depends_on("py-cython", type="build", when="@main")
depends_on("py-cython@0.29.32:", when="^python@3.11:", type="build")
depends_on("py-cython@0.24:", type="build")
depends_on("python@2.6:2.8,3.3:", type=("build", "run"))
depends_on("py-setuptools", type="build")
depends_on("py-numpy", type=("build", "run"))
@ -77,3 +80,8 @@ def build_directory(self):
return os.path.join(self.stage.source_path, "src", "binding", "petsc4py")
else:
return self.stage.source_path
@run_before("install")
def cythonize(self):
with working_dir(self.build_directory):
python(join_path("conf", "cythonize.py"))