commit: 1e34d12ef2f2712ea85969bbb6b6908b9a9c8886 Author: Pacho Ramos <pacho <AT> gentoo <DOT> org> AuthorDate: Wed Jul 31 07:44:31 2024 +0000 Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org> CommitDate: Wed Jul 31 09:23:07 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e34d12e
sci-libs/pastix: drop 5.2.3 Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org> sci-libs/pastix/Manifest | 1 - sci-libs/pastix/files/pastix-5.2.3-MPI-3.0.patch | 139 ----------------------- sci-libs/pastix/pastix-5.2.3.ebuild | 118 ------------------- 3 files changed, 258 deletions(-) diff --git a/sci-libs/pastix/Manifest b/sci-libs/pastix/Manifest index 67a373f23211..2d332d8ba962 100644 --- a/sci-libs/pastix/Manifest +++ b/sci-libs/pastix/Manifest @@ -1,2 +1 @@ DIST pastix-6.0.3.tar.gz 1793579 BLAKE2B 9e0ee71c80b2c93c6762c1a824b2e1262fd1a9f406194fb99eeecbfc172cf82f497d23a541b56c44e5487c3c228cab781f47f683ee04c6cdf426da6126750a69 SHA512 5bf8dfa6ed02ee7e236c63e21c80bd45af807b465b21a8c0520b1328e179095f1416f925be9f8b5ec0e8078ca9bc4398bf0d091fdc8e9ea51b9af12a06d9a544 -DIST pastix_5.2.3.tar.bz2 2246903 BLAKE2B b13cb31bbc2aeb122e932b2a934598ec975a55f327483bf1383280976584858426c56982f6980b52f32f04e05c6e6c8de1cf35e378e61a7be9dddb705b1c033a SHA512 69acffac1be8c756886783c2a6307269ab4d14abfc4a77268b3d14995e53b16084c298446812484233d9d52c317490d6ad67788166adf367075e6c8442147b95 diff --git a/sci-libs/pastix/files/pastix-5.2.3-MPI-3.0.patch b/sci-libs/pastix/files/pastix-5.2.3-MPI-3.0.patch deleted file mode 100644 index d86ec5b78416..000000000000 --- a/sci-libs/pastix/files/pastix-5.2.3-MPI-3.0.patch +++ /dev/null @@ -1,139 +0,0 @@ -https://bugs.gentoo.org/692742 -rename MPI 1.0 to 3.0+ functions: -- MPI_Address -> MPI_Get_address -- MPI_Type_struct -> MPI_Type_create_struct - ---- a/common/src/nompi.h -+++ b/common/src/nompi.h -@@ -127,9 +127,9 @@ - #define MPI_Start(request) - #define MPI_Startall(count, array_of_requests) - #define MPI_Type_contiguous(count, oldtype, newtype) --#define MPI_Type_struct(count, array_of_blocklengths, array_of_displacement, \ -+#define MPI_Type_create_struct(count, array_of_blocklengths, array_of_displacement, \ - oldtype, newtype) --#define MPI_Address(location, newtype) -+#define MPI_Get_address(location, newtype) - #define MPI_Type_commit(datatype) - #define MPI_Type_free(datatype) - #define MPI_Request_free(request) ---- a/sopalin/src/sopalin_sendrecv.c -+++ b/sopalin/src/sopalin_sendrecv.c -@@ -1300,10 +1300,10 @@ - thread_data->gtaboffs[packnbr] = FANIN_INFOTAB(t); - thread_data->gtaboffs[packnbr+1] = FANIN_COEFTAB(t); - #else /* NO_MPI_TYPE */ -- CALL_MPI MPI_Address(FANIN_INFOTAB(t),&(thread_data->gtaboffs[packnbr])); -- TEST_MPI("MPI_Address"); -- CALL_MPI MPI_Address(FANIN_COEFTAB(t),&(thread_data->gtaboffs[packnbr+1])); -- TEST_MPI("MPI_Address"); -+ CALL_MPI MPI_Get_address(FANIN_INFOTAB(t),&(thread_data->gtaboffs[packnbr])); -+ TEST_MPI("MPI_Get_address"); -+ CALL_MPI MPI_Get_address(FANIN_COEFTAB(t),&(thread_data->gtaboffs[packnbr+1])); -+ TEST_MPI("MPI_Get_address"); - #endif /* NO_MPI_TYPE */ - - /* Add other contribution for the same task */ -@@ -1410,12 +1410,12 @@ - thread_data->gtaboffs[packnbr] = FANIN_INFOTAB(t); - thread_data->gtaboffs[packnbr+1] = FANIN_COEFTAB(t); - #else /* NO_MPI_TYPE */ -- CALL_MPI MPI_Address(FANIN_INFOTAB(t), -+ CALL_MPI MPI_Get_address(FANIN_INFOTAB(t), - &(thread_data->gtaboffs[packnbr])); -- TEST_MPI("MPI_Address"); -- CALL_MPI MPI_Address(FANIN_COEFTAB(t), -+ TEST_MPI("MPI_Get_address"); -+ CALL_MPI MPI_Get_address(FANIN_COEFTAB(t), - &(thread_data->gtaboffs[packnbr+1])); -- TEST_MPI("MPI_Address"); -+ TEST_MPI("MPI_Get_address"); - #endif /* NO_MPI_TYPE */ - - if (queueSize(sendqueue)) -@@ -1508,10 +1508,10 @@ - TEST_MPI("MPI_Rsend"); - # endif - #else /* NO_MPI_TYPE */ -- CALL_MPI MPI_Type_struct(2*(packnbr/2+1), thread_data->gtabsize, -+ CALL_MPI MPI_Type_create_struct(2*(packnbr/2+1), thread_data->gtabsize, - thread_data->gtaboffs, - thread_data->gtabtype, &newtype); -- TEST_MPI("MPI_Type_struct"); -+ TEST_MPI("MPI_Type_create_struct"); - CALL_MPI MPI_Type_commit(&newtype); - TEST_MPI("MPI_Type_commit"); - # ifdef TEST_ISEND -@@ -1602,15 +1602,15 @@ - (long)me, (unsigned int)(intptr_t)BTAG_COEFTAB(t)); - - #ifndef NO_MPI_TYPE -- CALL_MPI MPI_Address(BTAG_BTAGTAB(t),&(taboffs[0])); -- TEST_MPI("MPI_Address"); -- CALL_MPI MPI_Address(BTAG_BCOFTAB(t),&(taboffs[1])); -- TEST_MPI("MPI_Address"); -- CALL_MPI MPI_Address((void *)BTAG_COEFTAB(t),&(taboffs[2])); -- TEST_MPI("MPI_Address"); -+ CALL_MPI MPI_Get_address(BTAG_BTAGTAB(t),&(taboffs[0])); -+ TEST_MPI("MPI_Get_address"); -+ CALL_MPI MPI_Get_address(BTAG_BCOFTAB(t),&(taboffs[1])); -+ TEST_MPI("MPI_Get_address"); -+ CALL_MPI MPI_Get_address((void *)BTAG_COEFTAB(t),&(taboffs[2])); -+ TEST_MPI("MPI_Get_address"); - -- CALL_MPI MPI_Type_struct(3,tabsize,taboffs,tabtype,&newtype); -- TEST_MPI("MPI_Type_struct"); -+ CALL_MPI MPI_Type_create_struct(3,tabsize,taboffs,tabtype,&newtype); -+ TEST_MPI("MPI_Type_create_struct"); - - CALL_MPI MPI_Type_commit(&newtype); - TEST_MPI("MPI_Type_commit"); ---- a/sopalin/src/updo_sendrecv.c -+++ b/sopalin/src/updo_sendrecv.c -@@ -347,12 +347,12 @@ - tabtype[0] = COMM_INT; - tabtype[1] = COMM_FLOAT; - -- CALL_MPI MPI_Address(infotab,&(taboffs[0])); -- TEST_MPI("MPI_Address"); -- CALL_MPI MPI_Address(FANIN_COEFTAB(SOLV_FTGTIND(j)),&(taboffs[1])); -- TEST_MPI("MPI_Address"); -- CALL_MPI MPI_Type_struct(2,tabsize,taboffs,tabtype,&newtype); -- TEST_MPI("MPI_Type_struct"); -+ CALL_MPI MPI_Get_address(infotab,&(taboffs[0])); -+ TEST_MPI("MPI_Get_address"); -+ CALL_MPI MPI_Get_address(FANIN_COEFTAB(SOLV_FTGTIND(j)),&(taboffs[1])); -+ TEST_MPI("MPI_Get_address"); -+ CALL_MPI MPI_Type_create_struct(2,tabsize,taboffs,tabtype,&newtype); -+ TEST_MPI("MPI_Type_create_struct"); - CALL_MPI MPI_Type_commit(&newtype); - TEST_MPI("MPI_Type_commit"); - # endif /* NO_MPI_TYPE */ -@@ -974,8 +974,8 @@ - - tabtype[0] = COMM_INT; - -- CALL_MPI MPI_Address(infotab,&(taboffs[0])); -- TEST_MPI("MPI_Address"); -+ CALL_MPI MPI_Get_address(infotab,&(taboffs[0])); -+ TEST_MPI("MPI_Get_address"); - - /* If schur, send empty data */ - if ((sopalin_data->sopar->iparm[IPARM_SCHUR] == API_YES && -@@ -988,12 +988,12 @@ - for (iter=1; iter<UPDOWN_SM2XNBR+1; iter++) { - tabsize[iter] = size; - tabtype[iter] = COMM_FLOAT; -- CALL_MPI MPI_Address(gb+((iter-1)*UPDOWN_SM2XSZE),&(taboffs[iter])); -- TEST_MPI("MPI_Address"); -+ CALL_MPI MPI_Get_address(gb+((iter-1)*UPDOWN_SM2XSZE),&(taboffs[iter])); -+ TEST_MPI("MPI_Get_address"); - } - } -- CALL_MPI MPI_Type_struct(UPDOWN_SM2XNBR+1,tabsize,taboffs,tabtype,&newtype); -- TEST_MPI("MPI_Type_struct"); -+ CALL_MPI MPI_Type_create_struct(UPDOWN_SM2XNBR+1,tabsize,taboffs,tabtype,&newtype); -+ TEST_MPI("MPI_Type_create_struct"); - CALL_MPI MPI_Type_commit(&newtype); - TEST_MPI("MPI_Type_commit"); - diff --git a/sci-libs/pastix/pastix-5.2.3.ebuild b/sci-libs/pastix/pastix-5.2.3.ebuild deleted file mode 100644 index 4b0bafedefaf..000000000000 --- a/sci-libs/pastix/pastix-5.2.3.ebuild +++ /dev/null @@ -1,118 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit fortran-2 toolchain-funcs - -# TODO: -# testing: emake examples? -# better doc instalation and building -# pypastix (separate package?) -# multilib with eselect? -# static libs building without pic -# metis? - -# package id: change every version, see the link on inriaforge -PID=218 -DESCRIPTION="Parallel solver for very large sparse linear systems" -HOMEPAGE="https://solverstack.gitlabpages.inria.fr/pastix/ https://gitlab.inria.fr/solverstack/pastix"; -SRC_URI="https://gforge.inria.fr/frs/download.php/latestfile/${PID}/${PN}_${PV}.tar.bz2"; -S="${WORKDIR}/${PN}_${PV}/src" - -LICENSE="CeCILL-C" -SLOT="0" -KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux" -IUSE="doc int64 mpi +smp starpu static-libs" - -RDEPEND=" - sci-libs/scotch:0=[int64?,mpi?] - sys-apps/hwloc:0= - virtual/blas - mpi? ( virtual/mpi ) - starpu? ( dev-libs/starpu:0= )" -DEPEND="${RDEPEND}" -BDEPEND="virtual/pkgconfig" - -PATCHES=( "${FILESDIR}"/${P}-MPI-3.0.patch ) - -src_prepare() { - default - sed -e 's/^\(HOSTARCH\s*=\).*/\1 ${HOST}/' \ - -e "s:^\(CCPROG\s*=\).*:\1 $(tc-getCC):" \ - -e "s:^\(CFPROG\s*=\).*:\1 $(tc-getFC):" \ - -e "s:^\(CF90PROG\s*=\).*:\1 $(tc-getFC):" \ - -e "s:^\(ARPROG\s*=\).*:\1 $(tc-getAR):" \ - -e "s:^\(CCFOPT\s*=\).*:\1 ${FFLAGS}:" \ - -e "s:^\(CCFDEB\s*=\).*:\1 ${FFLAGS}:" \ - -e 's:^\(EXTRALIB\s*=\).*:\1 -lm -lrt:' \ - -e "s:^#\s*\(ROOT\s*=\).*:\1 \$(DESTDIR)${EPREFIX}/usr:" \ - -e 's:^#\s*\(INCLUDEDIR\s*=\).*:\1 $(ROOT)/include:' \ - -e 's:^#\s*\(BINDIR\s*=\).*:\1 $(ROOT)/bin:' \ - -e "s:^#\s*\(LIBDIR\s*=\).*:\1 \$(ROOT)/$(get_libdir):" \ - -e 's:^#\s*\(SHARED\s*=\).*:\1 1:' \ - -e 's:^#\s*\(SOEXT\s*=\).*:\1 .so:' \ - -e '/fPIC/s/^#//g' \ - -e "s:^#\s*\(SHARED_FLAGS\s*=.*\):\1 ${LDFLAGS}:" \ - -e "s:pkg-config:$(tc-getPKG_CONFIG):g" \ - -e "s:^\(BLASLIB\s*=\).*:\1 $($(tc-getPKG_CONFIG) --libs blas):" \ - -e "s:^\s*\(HWLOC_HOME\s*?=\).*:\1 ${EPREFIX}/usr:" \ - -e "s:-I\$(HWLOC_INC):$($(tc-getPKG_CONFIG) --cflags hwloc):" \ - -e "s:-L\$(HWLOC_LIB) -lhwloc:$($(tc-getPKG_CONFIG) --libs hwloc):" \ - -e "s:^\s*\(SCOTCH_HOME\s*?=\).*:\1 ${EPREFIX}/usr:" \ - -e "s:^\s*\(SCOTCH_INC\s*?=.*\):\1/scotch:" \ - -e "s:^\s*\(SCOTCH_LIB\s*?=.*\)lib:\1$(get_libdir):" \ - config/LINUX-GNU.in > config.in || die - sed -e 's/__SO_NAME__,$@/__SO_NAME__,$(notdir $@)/g' -i Makefile || die -} - -src_configure() { - if use amd64; then - sed -e 's/^\(VERSIONBIT\s*=\).*/\1 _64bit/' \ - -i config.in || die - fi - - if use int64; then - sed -e '/VERSIONINT.*_int64/s/#//' \ - -e '/CCTYPES.*INTSSIZE64/s/#//' \ - -i config.in || die - fi - - if ! use mpi; then - sed -e '/VERSIONMPI.*_nompi/s/#//' \ - -e '/CCTYPES.*NOMPI/s/#//' \ - -e '/MPCCPROG\s*= $(CCPROG)/s/#//' \ - -e '/MCFPROG\s*= $(CFPROG)/s/#//' \ - -e 's/-DDISTRIBUTED//' \ - -e 's/-lptscotch/-lscotch/g' \ - -i config.in || die - fi - - if ! use smp; then - sed -e '/VERSIONSMP.*_nosmp/s/#//' \ - -e '/CCTYPES.*NOSMP/s/#//' \ - -i config.in || die - fi - - if use starpu; then - sed -e '/libstarpu/s/#//g' -i config.in || die - fi -} - -src_compile() { - emake all drivers -} - -src_test() { - # both test and tests targets are defined and do not work - emake examples - echo -} - -src_install() { - default - sed -e "s:${D}::g" -i "${ED}"/usr/bin/pastix-conf || die - # quick and dirty (static libs should really be built without pic) - cd .. || die - dodoc README.txt doc/refcard/refcard.pdf -}
