From 5c3bc36fdeb01b3044a8b3b00edd8048bb1622d4 Mon Sep 17 00:00:00 2001 From: Satish Balay Date: Sat, 1 Apr 2023 12:40:19 -0500 Subject: petsc,py-petsc4py,slepc,py-slepc4py: add version 3.19.0 (#36588) --- var/spack/repos/builtin/packages/petsc/package.py | 2 ++ .../repos/builtin/packages/py-petsc4py/ldshared-dev.patch | 13 ------------- var/spack/repos/builtin/packages/py-petsc4py/package.py | 6 ++++-- .../repos/builtin/packages/py-slepc4py/ldshared-dev.patch | 13 ------------- var/spack/repos/builtin/packages/py-slepc4py/package.py | 6 ++++-- var/spack/repos/builtin/packages/slepc/package.py | 2 ++ 6 files changed, 12 insertions(+), 30 deletions(-) delete mode 100644 var/spack/repos/builtin/packages/py-petsc4py/ldshared-dev.patch delete mode 100644 var/spack/repos/builtin/packages/py-slepc4py/ldshared-dev.patch diff --git a/var/spack/repos/builtin/packages/petsc/package.py b/var/spack/repos/builtin/packages/petsc/package.py index 35c1f29ae8..d0bf68bf87 100644 --- a/var/spack/repos/builtin/packages/petsc/package.py +++ b/var/spack/repos/builtin/packages/petsc/package.py @@ -22,6 +22,8 @@ class Petsc(Package, CudaPackage, ROCmPackage): version("main", branch="main") + version("3.19.0", sha256="8ced753e4d2fb6565662b2b1fbba75a426cbf8438203f82717ce270f0591322c") + version("3.18.6", sha256="8b53c8b6652459ba0bbe6361b5baf8c4d17c1d04b6654a76e3b6a9ab4a576680") version("3.18.5", sha256="df73ae13a4c5758325a9d69350cac423742657d8a8fc5782504b0e469ce46499") version("3.18.4", sha256="6173d30637261c5b740c0bea14747759200ca2012c7343139f9216bc296a6394") version("3.18.3", sha256="8aaa005479c8ec2eed2b9cbb067cfc1ac0900b0de2176439f0d4f21e09c2020b") diff --git a/var/spack/repos/builtin/packages/py-petsc4py/ldshared-dev.patch b/var/spack/repos/builtin/packages/py-petsc4py/ldshared-dev.patch deleted file mode 100644 index 77d808d9fe..0000000000 --- a/var/spack/repos/builtin/packages/py-petsc4py/ldshared-dev.patch +++ /dev/null @@ -1,13 +0,0 @@ -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/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 '')) - ldcmd = split_quoted(ld) + split_quoted(ldflags) -- ldshared = [flg for flg in split_quoted(ldshared) if flg not in ldcmd] -+ ldshared = [flg for flg in split_quoted(ldshared) if flg not in ldcmd and (flg.find('/lib/spack/env')<0)] - ldshared = str.join(' ', ldshared) - # - def get_flags(cmd): diff --git a/var/spack/repos/builtin/packages/py-petsc4py/package.py b/var/spack/repos/builtin/packages/py-petsc4py/package.py index 8457e8df1e..7abe9fd90a 100644 --- a/var/spack/repos/builtin/packages/py-petsc4py/package.py +++ b/var/spack/repos/builtin/packages/py-petsc4py/package.py @@ -16,6 +16,8 @@ class PyPetsc4py(PythonPackage): maintainers("balay") version("main", branch="main") + version("3.19.0", sha256="d1660092c9be9547e9a17d3d5bb139eaad737c3e1c4ef2ee41c71c8dc3bb9955") + version("3.18.6", sha256="e4976e42895955cbb2c56f1b0f791c838338348a10664b8dcfc3fe56198bf943") version("3.18.5", sha256="625cbb99d7d3000ad05afe60585c6aa24ca650894b09a1989127febb64b65470") version("3.18.4", sha256="84a055b7f38d1200a8c486c89db05ce0724fe28da56afb656660cef054384e24") version("3.18.3", sha256="853ab9620c4832cbfe1f490edde827a505c8a376cc1a7b4fa6406faac9059433") @@ -49,8 +51,7 @@ class PyPetsc4py(PythonPackage): variant("mpi", default=True, description="Activates MPI support") - patch("ldshared.patch", when="@:99") - patch("ldshared-dev.patch", when="@main") + patch("ldshared.patch", when="@:3.18") depends_on("py-cython@0.29.32:", when="^python@3.11:", type="build") depends_on("py-cython@0.24:", type="build") @@ -62,6 +63,7 @@ class PyPetsc4py(PythonPackage): depends_on("petsc+mpi", when="+mpi") depends_on("petsc~mpi", when="~mpi") depends_on("petsc@main", when="@main") + depends_on("petsc@3.19.0:3.19", when="@3.19.0:3.19") depends_on("petsc@3.18.0:3.18", when="@3.18.0:3.18") depends_on("petsc@3.17.0:3.17", when="@3.17.0:3.17") depends_on("petsc@3.16.0:3.16", when="@3.16.0:3.16") diff --git a/var/spack/repos/builtin/packages/py-slepc4py/ldshared-dev.patch b/var/spack/repos/builtin/packages/py-slepc4py/ldshared-dev.patch deleted file mode 100644 index be5b2569aa..0000000000 --- a/var/spack/repos/builtin/packages/py-slepc4py/ldshared-dev.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/binding/slepc4py/conf/baseconf.py b/src/binding/slepc4py/conf/baseconf.py -index b0707a65a..44ba8f194 100644 ---- a/src/binding/slepc4py/conf/confpetsc.py -+++ b/src/binding/slepc4py/conf/confpetsc.py -@@ -213,7 +213,7 @@ class PetscConfig: - ldshared = getenv('LDSHARED', ldshared) - ldflags = getenv('LDFLAGS', cflags + ' ' + (ldflags or '')) - ldcmd = split_quoted(ld) + split_quoted(ldflags) -- ldshared = [flg for flg in split_quoted(ldshared) if flg not in ldcmd] -+ ldshared = [flg for flg in split_quoted(ldshared) if flg not in ldcmd and (flg.find('/lib/spack/env')<0)] - ldshared = str.join(' ', ldshared) - # - def get_flags(cmd): diff --git a/var/spack/repos/builtin/packages/py-slepc4py/package.py b/var/spack/repos/builtin/packages/py-slepc4py/package.py index 22517d6774..1874cb2489 100644 --- a/var/spack/repos/builtin/packages/py-slepc4py/package.py +++ b/var/spack/repos/builtin/packages/py-slepc4py/package.py @@ -16,6 +16,7 @@ class PySlepc4py(PythonPackage): maintainers("joseeroman", "balay") version("main", branch="main") + version("3.19.0", sha256="ae84d33cce259c1d6ff64308b2f819d1c0f7b018e048f9049ec6d5be15614ba5") version("3.18.3", sha256="93c978f115683900a575026111ff2abe6f3ce4de8c21eec53c07dfd97ea43c85") version("3.18.2", sha256="402297fd8e583ed2618d2cba05e5cae8e9d0a2c3943812a1a138f431ef3479b3") version("3.18.1", sha256="4c2bc0947d6a9cdb209e3174b7f54fe7b029220e2c90106f52844e8f8795f8f0") @@ -34,8 +35,7 @@ class PySlepc4py(PythonPackage): version("3.12.0", sha256="d8c06953b7d00f529a9a7fd016dfa8efdf1d05995baeea7688d1d59611f424f7") version("3.11.0", sha256="1e591056beee209f585cd781e5fe88174cd2a61215716a71d9eaaf9411b6a775") - patch("ldshared.patch", when="@:99") - patch("ldshared-dev.patch", when="@main") + patch("ldshared.patch", when="@:3.18") depends_on("py-cython@0.29.32:", when="^python@3.11:", type="build") depends_on("py-cython@0.24:", type="build") @@ -43,6 +43,7 @@ class PySlepc4py(PythonPackage): depends_on("py-petsc4py", type=("build", "run")) depends_on("py-petsc4py@main", when="@main", type=("build", "run")) + depends_on("py-petsc4py@3.19.0:3.19", when="@3.19.0:3.19", type=("build", "run")) depends_on("py-petsc4py@3.18.0:3.18", when="@3.18.0:3.18", type=("build", "run")) depends_on("py-petsc4py@3.17.0:3.17", when="@3.17.0:3.17", type=("build", "run")) depends_on("py-petsc4py@3.16.0:3.16", when="@3.16.0:3.16", type=("build", "run")) @@ -53,6 +54,7 @@ class PySlepc4py(PythonPackage): depends_on("slepc") depends_on("slepc@main", when="@main") + depends_on("slepc@3.19.0:3.19", when="@3.19.0:3.19") depends_on("slepc@3.18.0:3.18", when="@3.18.0:3.18") depends_on("slepc@3.17.0:3.17", when="@3.17.0:3.17") depends_on("slepc@3.16.0:3.16", when="@3.16.0:3.16") diff --git a/var/spack/repos/builtin/packages/slepc/package.py b/var/spack/repos/builtin/packages/slepc/package.py index beab2aeebe..1350c0afa0 100644 --- a/var/spack/repos/builtin/packages/slepc/package.py +++ b/var/spack/repos/builtin/packages/slepc/package.py @@ -22,6 +22,7 @@ class Slepc(Package, CudaPackage, ROCmPackage): test_requires_compiler = True version("main", branch="main") + version("3.19.0", sha256="724f6610a2e38b1be7586fd494fe350b58f5aee1ca734bd85e783aa9d3daa8de") version("3.18.3", sha256="1b02bdf87c083749e81b3735aae7728098eaab78143b262b92c2ab164924c6f5") version("3.18.2", sha256="5bd90a755934e702ab1fdb3320b9fe75ab5fc28c93d364248ea86a372fbe6a62") version("3.18.1", sha256="f6e6e16d8399c3f94d187da9d4bfdfca160de50ebda7d63f6fa8ef417597e9b4") @@ -60,6 +61,7 @@ class Slepc(Package, CudaPackage, ROCmPackage): # Cannot mix release and development versions of SLEPc and PETSc: depends_on("petsc@main", when="@main") + depends_on("petsc@3.19.0:3.19", when="@3.19.0:3.19") depends_on("petsc@3.18.0:3.18", when="@3.18.0:3.18") depends_on("petsc@3.17.0:3.17", when="@3.17.0:3.17") depends_on("petsc@3.16.0:3.16", when="@3.16.0:3.16") -- cgit v1.2.3-70-g09d2