Release 8.1.1 | Enable colamd support

This commit is contained in:
Antonio Trande 2022-10-02 18:47:26 +02:00
parent 3a285e327e
commit 48ffda45ac
4 changed files with 16 additions and 8 deletions

1
.gitignore vendored
View File

@ -9,3 +9,4 @@
/superlu_dist-7.2.0.tar.gz
/superlu_dist-8.0.0.tar.gz
/superlu_dist-8.1.0.tar.gz
/superlu_dist-8.1.1.tar.gz

View File

@ -1 +1 @@
SHA512 (superlu_dist-8.1.0.tar.gz) = 4c7fc7e4649282755cff018fa37413161224e9a35a471c4e64c09e439f4397d196fb4e7976edc6ca030867c1b61d88d91cb1505be522a1588c7b4de4a813a625
SHA512 (superlu_dist-8.1.1.tar.gz) = db3c23bbf66a68f27256625d4bbe889558caf1e6411f8128016d767bd686e4dc9a7986ae267ec579ef6bf637730f1280748804b746b4578c3b79fc2d139d2a4d

View File

@ -14,6 +14,6 @@
-Libs: -L${libdir} -lsuperlu_dist
+Libs: -L@CMAKE_INSTALL_LIBDIR@ -lsuperlu_dist
Libs.private: @BLAS_LIB@ -lm
Libs.private: @BLAS_LIB@ @LAPACK_LIB@ @PARMETIS_LIB@ @COLAMD_LIB@ @COMBBLAS_LIB@ -lm
-Cflags: -I${includedir}
+Cflags: -I@CMAKE_INSTALL_INCLUDEDIR@

View File

@ -86,8 +86,8 @@ BuildRequires: metis-devel
%endif
Name: superlu_dist
Version: 8.1.0
Release: 2%{?dist}
Version: 8.1.1
Release: 1%{?dist}
Epoch: 1
Summary: Solution of large, sparse, nonsymmetric systems of linear equations
@ -113,6 +113,7 @@ BuildRequires: cmake3
%if %{with optimized_blas}
BuildRequires: %{blaslib}-devel
%endif
BuildRequires: suitesparse-devel
%global desc \
@ -277,9 +278,10 @@ export LDFLAGS="%build_ldflags -L$MPI_LIB -lptscotch"
-DTPL_COMBBLAS_INCLUDE_DIRS:PATH="$MPI_INCLUDE/CombBLAS;$MPI_INCLUDE/CombBLAS/3DSpGEMM;$MPI_INCLUDE/CombBLAS/Applications;$MPI_INCLUDE/CombBLAS/BipartiteMatchings" \
-DTPL_COMBBLAS_LIBRARIES:STRING=$MPI_LIB/libCombBLAS.so -DTPL_ENABLE_COMBBLASLIB:BOOL=ON \
%endif
-DTPL_BLAS_LIBRARIES:FILEPATH=%{_libdir}%{OPENBLASLIB} -DTPL_ENABLE_LAPACKLIB:BOOL=OFF -DTPL_LAPACK_LIBRARIES:BOOL=OFF \
-DTPL_ENABLE_COLAMD=ON -DTPL_COLAMD_INCLUDE_DIRS:PATH=%{_includedir}/suitesparse -DTPL_COLAMD_LIBRARIES:STRING=%{_libdir}/libcolamd.so \
-DTPL_BLAS_LIBRARIES:BOOL=ON -DTPL_BLAS_LIBRARIES:FILEPATH=%{_libdir}%{OPENBLASLIB} -DTPL_ENABLE_LAPACKLIB:BOOL=OFF -DTPL_LAPACK_LIBRARIES:BOOL=OFF \
-DMPI_C_HEADER_DIR:PATH="$MPI_INCLUDE -I%{METISINC}" \
-DMPI_C_LINK_FLAGS:STRING="-L$MPI_LIB -lptscotch -lptscotcherr -lptscotcherrexit -L%{_libdir} %{METISLINK} -lscotch" \
-DMPI_C_LINK_FLAGS:STRING="-L$MPI_LIB -lptscotch -lptscotcherr -lptscotcherrexit -L%{_libdir} %{METISLINK} -lscotch -lcolamd" \
-DMPI_CXX_LINK_FLAGS:STRING="-L$MPI_LIB -lptscotch -lptscotcherr -lptscotcherrexit -L%{_libdir} %{METISLINK} -lscotch -fopenmp" \
%if 0%{?fedora} || 0%{?rhel} < 8
-DTPL_PARMETIS_INCLUDE_DIRS:PATH=$MPI_INCLUDE \
@ -321,9 +323,10 @@ export LDFLAGS="%build_ldflags -L$MPI_LIB -lptscotch"
-DTPL_COMBBLAS_INCLUDE_DIRS:PATH="$MPI_INCLUDE/CombBLAS;$MPI_INCLUDE/CombBLAS/3DSpGEMM;$MPI_INCLUDE/CombBLAS/Applications;$MPI_INCLUDE/CombBLAS/BipartiteMatchings" \
-DTPL_COMBBLAS_LIBRARIES:STRING=$MPI_LIB/libCombBLAS.so -DTPL_ENABLE_COMBBLASLIB:BOOL=ON \
%endif
-DTPL_BLAS_LIBRARIES:FILEPATH=%{_libdir}%{OPENBLASLIB} -DTPL_ENABLE_LAPACKLIB:BOOL=OFF -DTPL_LAPACK_LIBRARIES:BOOL=OFF \
-DTPL_ENABLE_COLAMD:BOOL=ON -DTPL_COLAMD_INCLUDE_DIRS:PATH=%{_includedir}/suitesparse -DTPL_COLAMD_LIBRARIES:FILEPATH=%{_libdir}/libcolamd.so \
-DTPL_BLAS_LIBRARIES:BOOL=ON -DTPL_BLAS_LIBRARIES:FILEPATH=%{_libdir}%{OPENBLASLIB} -DTPL_ENABLE_LAPACKLIB:BOOL=OFF -DTPL_LAPACK_LIBRARIES:BOOL=OFF \
-DMPI_C_HEADER_DIR:PATH="$MPI_INCLUDE -I%{METISINC}" \
-DMPI_C_LINK_FLAGS:STRING="-L$MPI_LIB -lptscotch -lptscotcherr -lptscotcherrexit -L%{_libdir} %{METISLINK} -lscotch -fopenmp" \
-DMPI_C_LINK_FLAGS:STRING="-L$MPI_LIB -lptscotch -lptscotcherr -lptscotcherrexit -L%{_libdir} %{METISLINK} -lscotch -fopenmp -lcolamd" \
-DMPI_CXX_LINK_FLAGS:STRING="-L$MPI_LIB -lptscotch -lptscotcherr -lptscotcherrexit -L%{_libdir} %{METISLINK} -lscotch" \
%if 0%{?fedora} || 0%{?rhel} < 8
-DTPL_PARMETIS_INCLUDE_DIRS:PATH=$MPI_INCLUDE \
@ -481,6 +484,10 @@ popd
%changelog
* Sun Oct 02 2022 Antonio Trande <sagitter@fedoraproject.org> - 1:8.1.1-1
- Release 8.1.1
- Enable colamd support
* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1:8.1.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild