diff options
author | Adam J. Stewart <ajstewart426@gmail.com> | 2022-11-22 17:02:30 -0600 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-11-22 15:02:30 -0800 |
commit | c5883fffd7310f704a8adc2f3666d7539cdfe4e1 (patch) | |
tree | 6878ac2edd4efab60b0655a25891e8f010c17f1a /var/spack/repos/builtin/packages/bigdft-libabinit | |
parent | 4bf964e6b36e8756b014c2e30343507c1cb71b03 (diff) | |
download | spack-c5883fffd7310f704a8adc2f3666d7539cdfe4e1.tar.gz spack-c5883fffd7310f704a8adc2f3666d7539cdfe4e1.tar.bz2 spack-c5883fffd7310f704a8adc2f3666d7539cdfe4e1.tar.xz spack-c5883fffd7310f704a8adc2f3666d7539cdfe4e1.zip |
Python: drop EOL versions (#33898)
This PR removes [end of life](https://endoflife.date/python) versions of Python from Spack. Specifically, this includes all versions of Python older than 3.7.
See https://github.com/spack/spack/discussions/31824 for rationale. Deprecated in #32615. And #28003.
For anyone using software that relies on Python 2, you have a few options:
* Upgrade the software to support Python 3. The `3to2` tool may get you most of the way there, although more complex libraries may need manual tweaking.
* Add Python 2 as an [external package](https://spack.readthedocs.io/en/latest/build_settings.html#external-packages). Many Python libraries do not support Python 2, but you may be able to add older versions that did once upon a time.
* Use Spack 0.19. Spack 0.19 is the last release to officially support Python 3.6 and older
* Create and maintain your own [custom repository](https://spack.readthedocs.io/en/latest/repositories.html). Basically, you would need a package for Python 2 and any other Python 2-specific libraries you need.
Diffstat (limited to 'var/spack/repos/builtin/packages/bigdft-libabinit')
-rw-r--r-- | var/spack/repos/builtin/packages/bigdft-libabinit/m_libpaw_mpi.F90.patch | 222 | ||||
-rw-r--r-- | var/spack/repos/builtin/packages/bigdft-libabinit/package.py | 17 |
2 files changed, 3 insertions, 236 deletions
diff --git a/var/spack/repos/builtin/packages/bigdft-libabinit/m_libpaw_mpi.F90.patch b/var/spack/repos/builtin/packages/bigdft-libabinit/m_libpaw_mpi.F90.patch deleted file mode 100644 index 4ee3c1df31..0000000000 --- a/var/spack/repos/builtin/packages/bigdft-libabinit/m_libpaw_mpi.F90.patch +++ /dev/null @@ -1,222 +0,0 @@ ---- a/libABINIT/src/libpaw/m_libpaw_mpi.F90 -+++ b/libABINIT/src/libpaw/m_libpaw_mpi.F90 -@@ -54,6 +54,24 @@ - integer,public,parameter :: xpaw_mpi_comm_null = 0 - #endif - -+ type xpaw_mpi_attr -+ integer :: attr_data -+ end type -+ -+ interface xpaw_mpi_attr -+ module procedure new_xpaw_mpi_attr -+ end interface -+ -+ interface mod -+ module procedure mod_xpaw_mpi_attr -+ end interface -+ -+#ifdef HAVE_MPI -+ type(xpaw_mpi_attr),public,parameter :: xpaw_mpi_tag_ub = xpaw_mpi_attr(MPI_TAG_UB) -+#else -+ integer,public,parameter :: xpaw_mpi_tag_ub = 1 -+#endif -+ - !---------------------------------------------------------------------- - !MPI public procedures. - -@@ -180,6 +198,32 @@ - CONTAINS !=========================================================== - !!*** - -+function new_xpaw_mpi_attr(key_val) -+ type(xpaw_mpi_attr) :: new_xpaw_mpi_attr -+ integer, intent(in) :: key_val -+!Local variables------------------- -+ integer :: mpierr -+#ifdef HAVE_MPI -+ integer :: attribute_val -+ logical :: lflag -+#endif -+ -+ ! Deprecated in MPI2 but not all MPI2 implementations provide MPI_Comm_get_attr ! -+ call MPI_ATTR_GET(xpaw_mpi_world, key_val, attribute_val, lflag, mpierr) -+ !call MPI_Comm_get_attr(xpaw_mpi_world, key_val, attribute_val, lflag, mpierr) -+ -+ if (lflag) new_xpaw_mpi_attr%attr_data = attribute_val -+end function -+ -+ -+function mod_xpaw_mpi_attr(a, p) -+ integer :: mod_xpaw_mpi_attr -+ integer, intent(in) :: a -+ type(xpaw_mpi_attr), intent(in) :: p -+ -+ mod_xpaw_mpi_attr = mod(a, p%attr_data) -+end function -+ - !!****f* m_libpaw_mpi/xpaw_mpi_abort - !! NAME - !! xpaw_mpi_abort -@@ -2297,7 +2341,7 @@ - #if defined HAVE_MPI - if (spaceComm /= xpaw_mpi_comm_self .and. spaceComm /= xpaw_mpi_comm_null) then - n1=size(xval,dim=1) -- my_tag = MOD(tag,MPI_TAG_UB) -+ my_tag = MOD(tag,xpaw_mpi_tag_ub) - call MPI_RECV(xval,n1,MPI_INTEGER,source,my_tag,spaceComm,MPI_STATUS_IGNORE,ier) - end if - #endif -@@ -2358,7 +2402,7 @@ - #if defined HAVE_MPI - if (spaceComm /= xpaw_mpi_comm_self .and. spaceComm /= xpaw_mpi_comm_null) then - n1=size(xval,dim=1) -- my_tag = MOD(tag,MPI_TAG_UB) -+ my_tag = MOD(tag,xpaw_mpi_tag_ub) - call MPI_RECV(xval,n1,MPI_DOUBLE_PRECISION,source,my_tag,spaceComm,MPI_STATUS_IGNORE,ier) - end if - #endif -@@ -2419,7 +2463,7 @@ - #if defined HAVE_MPI - if (spaceComm /= xpaw_mpi_comm_self .and. spaceComm /= xpaw_mpi_comm_null) then - n1=size(xval,dim=1) ; n2=size(xval,dim=2) -- my_tag=MOD(tag,MPI_TAG_UB) -+ my_tag=MOD(tag,xpaw_mpi_tag_ub) - call MPI_RECV(xval,n1*n2,MPI_DOUBLE_PRECISION,source,my_tag,spaceComm,MPI_STATUS_IGNORE,ier) - end if - #endif -@@ -2480,7 +2524,7 @@ - #if defined HAVE_MPI - if (spaceComm /= xpaw_mpi_comm_self .and. spaceComm /= xpaw_mpi_comm_null) then - n1=size(xval,dim=1) ; n2=size(xval,dim=2) ; n3=size(xval,dim=3) -- my_tag=MOD(tag,MPI_TAG_UB) -+ my_tag=MOD(tag,xpaw_mpi_tag_ub) - call MPI_RECV(xval,n1*n2*n3,MPI_DOUBLE_PRECISION,source,my_tag,spaceComm,MPI_STATUS_IGNORE,ier) - end if - #endif -@@ -2541,7 +2585,7 @@ - ierr=0 - #if defined HAVE_MPI - if (spaceComm /= xpaw_mpi_comm_self .and. spaceComm /= xpaw_mpi_comm_null) then -- my_tag=MOD(tag,MPI_TAG_UB) -+ my_tag=MOD(tag,xpaw_mpi_tag_ub) - n1=size(xval) - call MPI_IRECV(xval,n1,MPI_INTEGER,source,my_tag,spaceComm,request,ier) - ierr=ier -@@ -2604,7 +2648,7 @@ - #if defined HAVE_MPI - if (spaceComm /= xpaw_mpi_comm_self .and. spaceComm /= xpaw_mpi_comm_null) then - n1=size(xval,dim=1) -- my_tag=MOD(tag,MPI_TAG_UB) -+ my_tag=MOD(tag,xpaw_mpi_tag_ub) - call MPI_IRECV(xval,n1,MPI_DOUBLE_PRECISION,source,my_tag,spaceComm,request,ier) - ierr=ier - end if -@@ -2666,7 +2710,7 @@ - #if defined HAVE_MPI - if (spaceComm /= xpaw_mpi_comm_self .and. spaceComm /= xpaw_mpi_comm_null) then - n1=size(xval,dim=1);n2=size(xval,dim=2) -- my_tag=MOD(tag,MPI_TAG_UB) -+ my_tag=MOD(tag,xpaw_mpi_tag_ub) - call MPI_IRECV(xval,n1*n2,MPI_DOUBLE_PRECISION,source,my_tag,spaceComm,request,ier) - ierr=ier - end if -@@ -2727,7 +2771,7 @@ - #if defined HAVE_MPI - if (spaceComm /= xpaw_mpi_comm_self .and. spaceComm /= xpaw_mpi_comm_null) then - n1=size(xval,dim=1) -- my_tag = MOD(tag,MPI_TAG_UB) -+ my_tag = MOD(tag,xpaw_mpi_tag_ub) - call MPI_SEND(xval,n1,MPI_INTEGER,dest,my_tag,spaceComm,ier) - end if - #endif -@@ -2785,7 +2829,7 @@ - #if defined HAVE_MPI - if (spaceComm /= xpaw_mpi_comm_self .and. spaceComm /= xpaw_mpi_comm_null) then - n1=size(xval,dim=1) -- my_tag = MOD(tag,MPI_TAG_UB) -+ my_tag = MOD(tag,xpaw_mpi_tag_ub) - call MPI_SEND(xval,n1,MPI_DOUBLE_PRECISION,dest,my_tag,spaceComm,ier) - end if - #endif -@@ -2843,7 +2887,7 @@ - #if defined HAVE_MPI - if (spaceComm /= xpaw_mpi_comm_self .and. spaceComm /= xpaw_mpi_comm_null) then - n1=size(xval,dim=1) ; n2=size(xval,dim=2) -- my_tag = MOD(tag,MPI_TAG_UB) -+ my_tag = MOD(tag,xpaw_mpi_tag_ub) - call MPI_SEND(xval,n1*n2,MPI_DOUBLE_PRECISION,dest,my_tag,spaceComm,ier) - end if - #endif -@@ -2901,7 +2945,7 @@ - #if defined HAVE_MPI - if (spaceComm /= xpaw_mpi_comm_self .and. spaceComm /= xpaw_mpi_comm_null) then - n1=size(xval,dim=1) ; n2=size(xval,dim=2) ; n3=size(xval,dim=3) -- my_tag = MOD(tag,MPI_TAG_UB) -+ my_tag = MOD(tag,xpaw_mpi_tag_ub) - call MPI_SEND(xval,n1*n2*n3,MPI_DOUBLE_PRECISION,dest,my_tag,spaceComm,ier) - end if - #endif -@@ -2961,7 +3005,7 @@ - #if defined HAVE_MPI - if (spaceComm /= xpaw_mpi_comm_self .and. spaceComm /= xpaw_mpi_comm_null) then - n1=size(xval,dim=1) -- my_tag = MOD(tag,MPI_TAG_UB) -+ my_tag = MOD(tag,xpaw_mpi_tag_ub) - call MPI_ISEND(xval,n1,MPI_INTEGER,dest,my_tag,spaceComm,request,ier) - ierr=ier - end if -@@ -3020,7 +3064,7 @@ - #if defined HAVE_MPI - if (spaceComm /= xpaw_mpi_comm_self .and. spaceComm /= xpaw_mpi_comm_null) then - n1=size(xval,dim=1) -- my_tag = MOD(tag,MPI_TAG_UB) -+ my_tag = MOD(tag,xpaw_mpi_tag_ub) - call MPI_ISEND(xval,n1,MPI_DOUBLE_PRECISION,dest,my_tag,spaceComm,request,ier) - ierr=ier - end if -@@ -3079,7 +3123,7 @@ - #if defined HAVE_MPI - if (spaceComm /= xpaw_mpi_comm_self .and. spaceComm /= xpaw_mpi_comm_null) then - n1=size(xval,dim=1) ; n1=size(xval,dim=2) -- my_tag = MOD(tag,MPI_TAG_UB) -+ my_tag = MOD(tag,xpaw_mpi_tag_ub) - call MPI_ISEND(xval,n1*n2,MPI_DOUBLE_PRECISION,dest,my_tag,spaceComm,request,ier) - ierr=ier - end if -@@ -3145,7 +3189,7 @@ - #if defined HAVE_MPI - if (sender==recever.or.spaceComm==xpaw_mpi_comm_null.or.(n1==0)) return - call MPI_COMM_RANK(spaceComm,me,ier) -- tag = MOD(n1,MPI_TAG_UB) -+ tag = MOD(n1,xpaw_mpi_tag_ub) - if (recever==me) then - call MPI_RECV(vrecv,n1,MPI_INTEGER,sender,tag,spaceComm,status,ier) - end if -@@ -3212,7 +3256,7 @@ - #if defined HAVE_MPI - if (sender==recever.or.spaceComm==xpaw_mpi_comm_null.or.(n1==0)) return - call MPI_COMM_RANK(spaceComm,me,ier) -- tag = MOD(n1,MPI_TAG_UB) -+ tag = MOD(n1,xpaw_mpi_tag_ub) - if (recever==me) then - call MPI_RECV(vrecv,n1,MPI_DOUBLE_PRECISION,sender,tag,spaceComm,status,ier) - end if -@@ -3279,7 +3323,7 @@ - #if defined HAVE_MPI - if (sender==recever.or.spaceComm==xpaw_mpi_comm_null.or.(nt==0)) return - call MPI_COMM_RANK(spaceComm,me,ier) -- tag=MOD(nt,MPI_TAG_UB) -+ tag=MOD(nt,xpaw_mpi_tag_ub) - if (recever==me) then - call MPI_RECV(vrecv,nt,MPI_DOUBLE_PRECISION,sender,tag,spaceComm,status,ier) - end if -@@ -3346,7 +3390,7 @@ - #if defined HAVE_MPI - if (sender==recever.or.spaceComm==xpaw_mpi_comm_null.or.(nt==0)) return - call MPI_COMM_RANK(spaceComm,me,ier) -- tag=MOD(nt,MPI_TAG_UB) -+ tag=MOD(nt,xpaw_mpi_tag_ub) - if (recever==me) then - call MPI_RECV(vrecv,nt,MPI_DOUBLE_PRECISION,sender,tag,spaceComm,status,ier) - end if diff --git a/var/spack/repos/builtin/packages/bigdft-libabinit/package.py b/var/spack/repos/builtin/packages/bigdft-libabinit/package.py index 62791417c9..3c772493d7 100644 --- a/var/spack/repos/builtin/packages/bigdft-libabinit/package.py +++ b/var/spack/repos/builtin/packages/bigdft-libabinit/package.py @@ -20,36 +20,25 @@ class BigdftLibabinit(AutotoolsPackage): version("1.9.2", sha256="dc9e49b68f122a9886fa0ef09970f62e7ba21bb9ab1b86be9b7d7e22ed8fbe0f") version("1.9.1", sha256="3c334da26d2a201b572579fc1a7f8caad1cbf971e848a3e10d83bc4dc8c82e41") version("1.9.0", sha256="4500e505f5a29d213f678a91d00a10fef9dc00860ea4b3edf9280f33ed0d1ac8") - version("1.8.3", sha256="f112bb08833da4d11dd0f14f7ab10d740b62bc924806d77c985eb04ae0629909") - version("1.8.2", sha256="042e5a3b478b1a4c050c450a9b1be7bcf8e13eacbce4759b7f2d79268b298d61") - version("1.8.1", sha256="e09ff0ba381f6ffbe6a3c0cb71db5b73117874beb41f22a982a7e5ba32d018b3") variant("mpi", default=True, description="Enable MPI support") - depends_on("python@:2.8", type=("build", "run"), when="@:1.8.3") - depends_on("python@3.0:", type=("build", "run"), when="@1.9.0:") - depends_on("python@3.0:", type=("build", "run"), when="@develop") + depends_on("python@3.0:", type=("build", "run")) depends_on("mpi", when="+mpi") depends_on("libxc@:2.2.2", when="@:1.9.1") depends_on("libxc@:4.3.4", when="@1.9.1:") - depends_on("libxc@:4.3.4", when="@develop") - for vers in ["1.8.1", "1.8.2", "1.8.3", "1.9.0", "1.9.1", "1.9.2", "develop"]: + for vers in ["1.9.0", "1.9.1", "1.9.2", "develop"]: depends_on("bigdft-futile@{0}".format(vers), when="@{0}".format(vers)) - patch("m_libpaw_mpi.F90.patch", when="@:1.8.2") - build_directory = "libABINIT" def autoreconf(self, spec, prefix): autoreconf = which("autoreconf") with working_dir(self.build_directory): - if spec.satisfies("@:1.8.2"): - autoreconf("-i") - else: - autoreconf("-fi") + autoreconf("-fi") def configure_args(self): spec = self.spec |