[gentoo-commits] repo/gentoo:master commit in: sci-libs/pastix/files/, sci-libs/pastix/

2024-07-31 Thread Pacho Ramos 
commit: 1e34d12ef2f2712ea85969bbb6b6908b9a9c8886
Author: Pacho Ramos  gentoo  org>
AuthorDate: Wed Jul 31 07:44:31 2024 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Wed Jul 31 09:23:07 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e34d12e

sci-libs/pastix: drop 5.2.3

Signed-off-by: Pacho Ramos  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..
--- 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, );
--  TEST_MPI("MPI_Type_struct");
-+  TEST_MPI("MPI_Type_create_struct");
-   CALL_MPI MPI_Type_commit();
-   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

[gentoo-commits] repo/gentoo:master commit in: sci-libs/pastix/files/, sci-libs/pastix/

2016-05-05 Thread David Seifert 
commit: c3c7b1fd5e5c3f2925ad71c73bd5ae12eb2e5956
Author: David Seifert  gentoo  org>
AuthorDate: Thu May  5 19:06:06 2016 +
Commit: David Seifert  gentoo  org>
CommitDate: Thu May  5 19:06:06 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c3c7b1fd

sci-libs/pastix: Add cast to double for C99 isnan macro

Gentoo-Bug: 580422
* Move patches into PATCHES bash array

Package-Manager: portage-2.2.28

 ...pastix-5.2.2.22-isnan-floating-point-cast.patch | 47 ++
 sci-libs/pastix/pastix-5.2.2.22-r1.ebuild  |  5 ++-
 2 files changed, 51 insertions(+), 1 deletion(-)

diff --git 
a/sci-libs/pastix/files/pastix-5.2.2.22-isnan-floating-point-cast.patch 
b/sci-libs/pastix/files/pastix-5.2.2.22-isnan-floating-point-cast.patch
new file mode 100644
index 000..8aa7c06
--- /dev/null
+++ b/sci-libs/pastix/files/pastix-5.2.2.22-isnan-floating-point-cast.patch
@@ -0,0 +1,47 @@
+Add missing cast to floating-point type:
+* sopalin/src/variable_csc.c: In function ‘vcsc_add_node’:
+* sopalin/src/variable_csc.c:138:13: error: non-floating-point argument in 
call to function ‘__builtin_isnan’
+*  if (isnan(vcsc->values[COL-1][i*dof2 + ii])) {
+See also:
+https://bugs.gentoo.org/show_bug.cgi?id=580422
+
+--- src/common/src/errors.h
 src/common/src/errors.h
+@@ -140,7 +140,7 @@
+  *   expr - The value to check.
+  */
+ #define CHECK_NAN(expr) { \
+-ASSERT_DEBUG(!isnan(expr), DBG_SOPALIN_NAN);  \
++ASSERT_DEBUG(!isnan(((double) expr)), DBG_SOPALIN_NAN);   \
+ ASSERT_DEBUG(!isinf(expr), DBG_SOPALIN_INF);  \
+   }
+ #else
+--- src/sopalin/src/variable_csc.c
 src/sopalin/src/variable_csc.c
+@@ -135,7 +135,7 @@
+ #endif
+ 
+   for (ii = 0; ii < dof2; ii++) {
+-if (isnan(vcsc->values[COL-1][i*dof2 + ii])) {
++if (isnan(((double) vcsc->values[COL-1][i*dof2 + ii]))) {
+   vcsc->values[COL-1][i*dof2 + ii] = VALUE[ii];
+ } else {
+   vcsc->values[COL-1][i*dof2 + ii] = 
op(vcsc->values[COL-1][i*dof2 + ii],
+@@ -252,7 +252,7 @@
+ vcsc->rows[COL_NODE][i]);
+   }
+ #endif
+-  if (isnan(vcsc->values[COL_NODE][idx])) {
++  if (isnan(((double) vcsc->values[COL_NODE][idx]))) {
+ vcsc->values[COL_NODE][idx] = VALUE;
+   } else {
+ vcsc->values[COL_NODE][idx] = op(vcsc->values[COL_NODE][idx],
+@@ -660,7 +660,7 @@
+   } else {
+ INTS iterdof;
+ for (iterdof = 0; iterdof < dof2; iterdof++) {
+-  if (!isnan(vcsc->values[MYCOL-1][dof2*iter2+iterdof])) {
++  if (!isnan(((double) 
vcsc->values[MYCOL-1][dof2*iter2+iterdof]))) {
+ /* ignore NaN values from VCSC */
+ (*values_o)[dof2*iter3+iterdof] = op(
+   (*values_o)[dof2*iter3+iterdof],

diff --git a/sci-libs/pastix/pastix-5.2.2.22-r1.ebuild 
b/sci-libs/pastix/pastix-5.2.2.22-r1.ebuild
index de59c9a..0fff267 100644
--- a/sci-libs/pastix/pastix-5.2.2.22-r1.ebuild
+++ b/sci-libs/pastix/pastix-5.2.2.22-r1.ebuild
@@ -41,11 +41,14 @@ RDEPEND="
 DEPEND="${RDEPEND}
virtual/pkgconfig"
 
+PATCHES=(
+   "${FILESDIR}/${P}-nosmp-undefined-variable.patch"
+   "${FILESDIR}/${P}-isnan-floating-point-cast.patch"
+)
 S="${WORKDIR}/${PN}_${PV}/src"
 
 src_prepare() {
default
-   epatch "${FILESDIR}"/${P}-nosmp-undefined-variable.patch
sed -e 's/^\(HOSTARCH\s*=\).*/\1 ${HOST}/' \
-e "s:^\(CCPROG\s*=\).*:\1 $(tc-getCC):" \
-e "s:^\(CFPROG\s*=\).*:\1 $(tc-getFC):" \

[gentoo-commits] repo/gentoo:master commit in: sci-libs/pastix/files/, sci-libs/pastix/

2016-02-23 Thread Sebastien Fabbro 
commit: f2fb1a2fcf3dba3c60979819a04caa4b91a3eeab
Author: Sébastien Fabbro  gentoo  org>
AuthorDate: Tue Feb 23 17:44:05 2016 +
Commit: Sebastien Fabbro  gentoo  org>
CommitDate: Tue Feb 23 17:44:33 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f2fb1a2f

sci-libs/pastix: re-add smp flag with patch and set it as default

Package-Manager: portage-2.2.27

 .../pastix-5.2.2.22-nosmp-undefined-variable.patch | 15 ++
 ...x-5.2.2.22.ebuild => pastix-5.2.2.22-r1.ebuild} | 56 --
 2 files changed, 45 insertions(+), 26 deletions(-)

diff --git 
a/sci-libs/pastix/files/pastix-5.2.2.22-nosmp-undefined-variable.patch 
b/sci-libs/pastix/files/pastix-5.2.2.22-nosmp-undefined-variable.patch
new file mode 100644
index 000..c01b02b
--- /dev/null
+++ b/sci-libs/pastix/files/pastix-5.2.2.22-nosmp-undefined-variable.patch
@@ -0,0 +1,15 @@
+--- ./sopalin/src/updo.c.orig  2016-02-23 01:42:00.0 +
 ./sopalin/src/updo.c   2016-02-23 01:42:10.0 +
+@@ -940,8 +940,10 @@
+ i = TASK_CBLKNUM(i);
+ #define END_LOOP(a) } SMP_END_LOOP(a)
+ #  else /* SMP_SOPALIN */
+-#define START_LOOP for (i=0;i config.in || die
-   sed -i -e 's/__SO_NAME__,$@/__SO_NAME__,$(notdir $@)/g' Makefile || die
-   default
+   sed -e 's/__SO_NAME__,$@/__SO_NAME__,$(notdir $@)/g' -i Makefile || die
 }
 
 src_configure() {
if use amd64; then
-   sed -i \
-   -e 's/^\(VERSIONBIT\s*=\).*/\1 _64bit/' config.in || die
+   sed -e 's/^\(VERSIONBIT\s*=\).*/\1 _64bit/' \
+   -i config.in || die
fi
 
if use int64; then
-   sed -i \
-   -e '/VERSIONINT.*_int64/s/#//' \
-   -e '/CCTYPES.*INTSSIZE64/s/#//' config.in || die
+   sed -e '/VERSIONINT.*_int64/s/#//' \
+   -e '/CCTYPES.*INTSSIZE64/s/#//' \
+   -i config.in || die
fi
 
if ! use mpi; then
-   sed -i \
-   -e '/VERSIONMPI.*_nompi/s/#//' \
+   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' \
-   config.in || die
+   -i config.in || die
fi
 
-#  if ! use smp; then
-#  sed \
-#  -e '/VERSIONSMP.*_nosmp/s/#//' \
-#  -e '/CCTYPES.*NOSMP/s/#//' \
-#  -i config.in || die
-#