diff --git a/.gitignore b/.gitignore index 350fefe..d0825d6 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /psblas3-3.5.0-3.tar.gz /psblas3-3.5.1.tar.gz /psblas3-3.5.2.tar.gz +/psblas3-3.5.2-2.tar.gz diff --git a/psblas3-fix_bug9.patch b/psblas3-fix_bug9.patch deleted file mode 100644 index 130e75c..0000000 --- a/psblas3-fix_bug9.patch +++ /dev/null @@ -1,99 +0,0 @@ -From 1a5ee8c46a4a332fce997522560d7b9f6dbde547 Mon Sep 17 00:00:00 2001 -From: Salvatore Filippone -Date: Thu, 13 Sep 2018 14:21:52 +0100 -Subject: [PATCH] Fix bounds computation in set_vect. Bug report by Alexandre - Silva Lopes - ---- - base/modules/serial/psb_c_base_vect_mod.f90 | 5 +++-- - base/modules/serial/psb_d_base_vect_mod.f90 | 5 +++-- - base/modules/serial/psb_i_base_vect_mod.f90 | 5 +++-- - base/modules/serial/psb_s_base_vect_mod.f90 | 5 +++-- - base/modules/serial/psb_z_base_vect_mod.f90 | 5 +++-- - 5 files changed, 15 insertions(+), 10 deletions(-) - -diff --git a/base/modules/serial/psb_c_base_vect_mod.f90 b/base/modules/serial/psb_c_base_vect_mod.f90 -index 6fa0bc70..54635a6d 100644 ---- a/base/modules/serial/psb_c_base_vect_mod.f90 -+++ b/base/modules/serial/psb_c_base_vect_mod.f90 -@@ -749,9 +749,10 @@ subroutine c_base_set_vect(x,val,first,last) - - integer(psb_ipk_) :: info, first_, last_, nr - -- first_=1 -- last_=min(psb_size(x%v),size(val)) -+ -+ first_ = 1 - if (present(first)) first_ = max(1,first) -+ last_ = min(psb_size(x%v),first_+size(val)-1) - if (present(last)) last_ = min(last,last_) - - if (allocated(x%v)) then -diff --git a/base/modules/serial/psb_d_base_vect_mod.f90 b/base/modules/serial/psb_d_base_vect_mod.f90 -index 36e95142..3ec2356a 100644 ---- a/base/modules/serial/psb_d_base_vect_mod.f90 -+++ b/base/modules/serial/psb_d_base_vect_mod.f90 -@@ -749,9 +749,10 @@ subroutine d_base_set_vect(x,val,first,last) - - integer(psb_ipk_) :: info, first_, last_, nr - -- first_=1 -- last_=min(psb_size(x%v),size(val)) -+ -+ first_ = 1 - if (present(first)) first_ = max(1,first) -+ last_ = min(psb_size(x%v),first_+size(val)-1) - if (present(last)) last_ = min(last,last_) - - if (allocated(x%v)) then -diff --git a/base/modules/serial/psb_i_base_vect_mod.f90 b/base/modules/serial/psb_i_base_vect_mod.f90 -index 4cc592ac..cdbe91e5 100644 ---- a/base/modules/serial/psb_i_base_vect_mod.f90 -+++ b/base/modules/serial/psb_i_base_vect_mod.f90 -@@ -718,9 +718,10 @@ subroutine i_base_set_vect(x,val,first,last) - - integer(psb_ipk_) :: info, first_, last_, nr - -- first_=1 -- last_=min(psb_size(x%v),size(val)) -+ -+ first_ = 1 - if (present(first)) first_ = max(1,first) -+ last_ = min(psb_size(x%v),first_+size(val)-1) - if (present(last)) last_ = min(last,last_) - - if (allocated(x%v)) then -diff --git a/base/modules/serial/psb_s_base_vect_mod.f90 b/base/modules/serial/psb_s_base_vect_mod.f90 -index 9ee77ea6..97c7c11e 100644 ---- a/base/modules/serial/psb_s_base_vect_mod.f90 -+++ b/base/modules/serial/psb_s_base_vect_mod.f90 -@@ -749,9 +749,10 @@ subroutine s_base_set_vect(x,val,first,last) - - integer(psb_ipk_) :: info, first_, last_, nr - -- first_=1 -- last_=min(psb_size(x%v),size(val)) -+ -+ first_ = 1 - if (present(first)) first_ = max(1,first) -+ last_ = min(psb_size(x%v),first_+size(val)-1) - if (present(last)) last_ = min(last,last_) - - if (allocated(x%v)) then -diff --git a/base/modules/serial/psb_z_base_vect_mod.f90 b/base/modules/serial/psb_z_base_vect_mod.f90 -index 0960624a..8c1b6baf 100644 ---- a/base/modules/serial/psb_z_base_vect_mod.f90 -+++ b/base/modules/serial/psb_z_base_vect_mod.f90 -@@ -749,9 +749,10 @@ subroutine z_base_set_vect(x,val,first,last) - - integer(psb_ipk_) :: info, first_, last_, nr - -- first_=1 -- last_=min(psb_size(x%v),size(val)) -+ -+ first_ = 1 - if (present(first)) first_ = max(1,first) -+ last_ = min(psb_size(x%v),first_+size(val)-1) - if (present(last)) last_ = min(last,last_) - - if (allocated(x%v)) then diff --git a/psblas3.spec b/psblas3.spec index 06dfb7e..05a305e 100644 --- a/psblas3.spec +++ b/psblas3.spec @@ -1,36 +1,23 @@ -%global with_mpich 1 -%global with_openmpi 1 +%global with_mpich 0 +%global with_openmpi 0 %global with_serial 1 -# openblas available on these architectures. -%if 0%{?rhel} -%{!?openblas_arches:%global openblas_arches x86_64 %{ix86} armv7hl %{power64} aarch64} -%endif - %global major_version 3 -#%%global postrelease_version +%global postrelease_version 2 -Name: psblas3 +Name: psblas3 Summary: Parallel Sparse Basic Linear Algebra Subroutines Version: %{major_version}.5.2 -Release: 3%{?dist} +Release: 4%{?dist} License: BSD -URL: https://github.com/sfilippone/psblas3 -Source0: https://github.com/sfilippone/psblas3/archive/v%{version}.tar.gz#/psblas3-%{version}.tar.gz +URL: https://github.com/sfilippone/psblas3 +Source0: https://github.com/sfilippone/psblas3/archive/V%{version}-%{postrelease_version}/psblas3-%{version}-%{postrelease_version}.tar.gz # Call default Fedora ldflags when linker creates links -Patch0: %{name}-fix_ldflags.patch - -# https://github.com/sfilippone/psblas3/issues/9 -Patch1: %{name}-fix_bug9.patch +Patch0: %{name}-fix_ldflags.patch BuildRequires: suitesparse-devel -%ifarch %{openblas_arches} BuildRequires: openblas-devel, openblas-srpm-macros -%else -BuildRequires: blas-devel -BuildRequires: lapack-devel -%endif BuildRequires: metis-devel %description @@ -142,26 +129,25 @@ Shared links, header files and static libraries for MPICH %{name}. ########################################################## %prep -%setup -qc -n psblas3-%{version} +%setup -qc -n psblas3-%{version}-%{postrelease_version} -pushd psblas3-%{version} +pushd psblas3-%{version}-%{postrelease_version} %patch0 -p0 -%patch1 -p1 popd ####################################################### ## Copy source for MPI versions %if 0%{?with_openmpi} -cp -a psblas3-%{version} openmpi-build +cp -a psblas3-%{version}-%{postrelease_version} openmpi-build %endif %if 0%{?with_mpich} -cp -a psblas3-%{version} mpich-build +cp -a psblas3-%{version}-%{postrelease_version} mpich-build %endif ###################################################### %build %if 0%{?with_serial} -cd psblas3-%{version} +cd psblas3-%{version}-%{postrelease_version} %ifarch %{openblas_arches} export LIBBLAS=-lopenblas @@ -171,9 +157,10 @@ export LIBBLAS=-lblas export LIBLAPACK=-llapack export INCBLAS=-I%{_includedir} %endif -%configure --enable-serial --with-fcopt="%{optflags} -Wno-unused-variable -fPIC -I%{_fmoddir} $INCBLAS" --with-ccopt="%{optflags} -fPIC $INCBLAS" \ - --with-metis=-lmetis --with-amd=-lamd --with-blas=$LIBBLAS --with-lapack=$LIBLAPACK \ - --with-amdincdir=%{_includedir}/suitesparse +%configure \ + --enable-serial --with-fcopt="%{optflags} -Wno-unused-variable -fPIC -I%{_fmoddir} $INCBLAS" --with-ccopt="%{optflags} -fPIC $INCBLAS" \ + --with-metis=-lmetis --with-amd=-lamd --with-blas=$LIBBLAS --with-lapack=$LIBLAPACK \ + --with-amdincdir=%{_includedir}/suitesparse %make_build # Make shared libraries @@ -205,11 +192,12 @@ export LIBBLAS=-lblas export LIBLAPACK=-llapack export INCBLAS=-I%{_includedir} %endif -%configure --with-fcopt="%{optflags} -fPIC -I%{_fmoddir} $INCBLAS" \ - --with-ccopt="%{optflags} -fPIC $INCBLAS" \ - FC=mpifort F77=mpif77 F90=mpif90 MPIFC=mpifort MPIF77=mpif77 MPCC=mpicc \ - --with-metis=-lmetis --with-amd=-lamd --with-blas=$LIBBLAS --with-lapack=$LIBLAPACK \ - --with-amdincdir=%{_includedir}/suitesparse +%configure \ + --with-fcopt="%{optflags} -fPIC -I%{_fmoddir} $INCBLAS" \ + --with-ccopt="%{optflags} -fPIC $INCBLAS" \ + FC=mpifort F77=mpif77 F90=mpif90 MPIFC=mpifort MPIF77=mpif77 MPCC=mpicc \ + --with-metis=-lmetis --with-amd=-lamd --with-blas=$LIBBLAS --with-lapack=$LIBLAPACK \ + --with-amdincdir=%{_includedir}/suitesparse %make_build # Make shared libraries @@ -239,11 +227,12 @@ export LIBBLAS=-lblas export LIBLAPACK=-llapack export INCBLAS=-I%{_includedir} %endif -%configure --with-fcopt="%{optflags} -fPIC -I%{_fmoddir} $INCBLAS" \ - --with-ccopt="%{optflags} -fPIC $INCBLAS" \ - FC=mpif77 F77=mpif77 F90=mpif90 MPIFC=mpif77 MPIF77=mpif77 MPCC=mpicc \ - --with-metis=-lmetis --with-amd=-lamd --with-blas=$LIBBLAS --with-lapack=$LIBLAPACK \ - --with-amdincdir=%{_includedir}/suitesparse +%configure \ + --with-fcopt="%{optflags} -fPIC -I%{_fmoddir} $INCBLAS" \ + --with-ccopt="%{optflags} -fPIC $INCBLAS" \ + FC=mpif77 F77=mpif77 F90=mpif90 MPIFC=mpif77 MPIF77=mpif77 MPCC=mpicc \ + --with-metis=-lmetis --with-amd=-lamd --with-blas=$LIBBLAS --with-lapack=$LIBLAPACK \ + --with-amdincdir=%{_includedir}/suitesparse %make_build # Make shared libraries @@ -274,7 +263,7 @@ popd %install %if 0%{?with_serial} -pushd psblas3-%{version} +pushd psblas3-%{version}-%{postrelease_version} mkdir -p $RPM_BUILD_ROOT%{_includedir}/%{name} mkdir -p $RPM_BUILD_ROOT%{_fmoddir}/%{name} @@ -375,10 +364,10 @@ popd %endif %files common -%doc psblas3-%{version}/README.md psblas3-%{version}/Changelog -%doc psblas3-%{version}/ReleaseNews -%doc psblas3-%{version}/docs/html psblas3-%{version}/docs/*.pdf -%license psblas3-%{version}/LICENSE +%doc psblas3-%{version}-%{postrelease_version}/README.md psblas3-%{version}-%{postrelease_version}/Changelog +%doc psblas3-%{version}-%{postrelease_version}/ReleaseNews +%doc psblas3-%{version}-%{postrelease_version}/docs/html psblas3-%{version}-%{postrelease_version}/docs/*.pdf +%license psblas3-%{version}-%{postrelease_version}/LICENSE ####################################################### ## MPI versions @@ -414,6 +403,9 @@ popd ###################################################### %changelog +* Fri Nov 02 2018 Antonio Trande - 3.5.2-4 +- Update to release 3.5.2-2 + * Fri Sep 14 2018 Antonio Trande - 3.5.2-3 - Fix upstream bug #9 (rhbz #1628858) diff --git a/sources b/sources index 53eb403..47bd4d1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (psblas3-3.5.2.tar.gz) = 0b25252a1f089d6d14dc0629dc217b68eb1098cf6a413deab4f590e05b340df6e65462be5333828a628cbae3560d6475fef07b2290bb9bb15f1bdc10ee658e22 +SHA512 (psblas3-3.5.2-2.tar.gz) = b3784193ad393062cf04e35e82a4fe3b46bfe64b25577d67679110f022c55a5fb8157c82d71d5cf38bec530b32472e4e4838ba954b92bd356fd9fc51bd974cd8