From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 4E254158087 for ; Sat, 29 Jan 2022 00:00:39 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 82E8A2BC002; Sat, 29 Jan 2022 00:00:38 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id F024C2BC002 for ; Sat, 29 Jan 2022 00:00:37 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 09E783432BC for ; Sat, 29 Jan 2022 00:00:36 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 150812AE for ; Sat, 29 Jan 2022 00:00:34 +0000 (UTC) From: "David Seifert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "David Seifert" Message-ID: <1643414415.017a3b4500248d207227590d7728f66f4195db9a.soap@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-libs/pastix/, sci-libs/pastix/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-libs/pastix/files/pastix-5.2.3-MPI-3.0.patch sci-libs/pastix/pastix-5.2.3.ebuild X-VCS-Directories: sci-libs/pastix/files/ sci-libs/pastix/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: 017a3b4500248d207227590d7728f66f4195db9a X-VCS-Branch: master Date: Sat, 29 Jan 2022 00:00:34 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: a0d43181-5a33-4738-b90a-acb306f1e0fe X-Archives-Hash: 6abac64a0b091109537b32b16059e635 commit: 017a3b4500248d207227590d7728f66f4195db9a Author: David Seifert gentoo org> AuthorDate: Sat Jan 29 00:00:15 2022 +0000 Commit: David Seifert gentoo org> CommitDate: Sat Jan 29 00:00:15 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=017a3b45 sci-libs/pastix: fix building against OpenMPI 4.1+ Closes: https://bugs.gentoo.org/692742 Signed-off-by: David Seifert gentoo.org> sci-libs/pastix/files/pastix-5.2.3-MPI-3.0.patch | 139 +++++++++++++++++++++++ sci-libs/pastix/pastix-5.2.3.ebuild | 5 +- 2 files changed, 142 insertions(+), 2 deletions(-) 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 new file mode 100644 index 000000000000..d86ec5b78416 --- /dev/null +++ b/sci-libs/pastix/files/pastix-5.2.3-MPI-3.0.patch @@ -0,0 +1,139 @@ +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