From nobody Fri Jun 17 04:03:57 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 66F9B847563; Fri, 17 Jun 2022 04:03:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4LPQQP6cyWz3CML; Fri, 17 Jun 2022 04:03:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655438638; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HcNiZYusbPf+WiNHXXGJLTK3x3LuxsIw1Wp8nwlp+OA=; b=SaBp0WwRBMg1LnZEVd3ag+/N7XDtLdJJ/StTzUEojMpj4soUYN8HOPQtIDHtyjTYEJ13xI RpIjiazqVXRl9BuxuhkVwxTOtgSJOVWSVQOi6W4WX0N4UZrW95KVpRuMslXVf5g/fjT+Uq CQzoO6AVjS5onHNC8QyhWMrMqaGxT5UKjUWpjZtVsJDBmxWxTIM7E5TztoUcNKYFtIi+8T eTE459M4q/E16jXDeZgRoFZiabX4CsxjqGmJj6lWGwQia8YmGRfGqWui+rwWr10PSTtt/C wbiMo0oR/UBE3XOD/24CRyVYZ9lhihdNWy43N8MnuMNx2cNRutbT09lc8NUQlQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 83AAD18B0D; Fri, 17 Jun 2022 04:03:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 25H43vAW053985; Fri, 17 Jun 2022 04:03:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25H43v7Z053984; Fri, 17 Jun 2022 04:03:57 GMT (envelope-from git) Date: Fri, 17 Jun 2022 04:03:57 GMT Message-Id: <202206170403.25H43v7Z053984@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yuri Victorovich Subject: git: 72d92425644c - main - science/hypre: Update 2.24.0 -> 2.25.0 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 72d92425644c695b4e68da98263e3e68cecb84f3 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655438638; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HcNiZYusbPf+WiNHXXGJLTK3x3LuxsIw1Wp8nwlp+OA=; b=G6kQv6ZKXnNM80ZlFOS3YguLqzW8n84eLukv5jvVERCb690fjIUhTUqhLgZKsQrti73H6G 0lPPzi++cZSsECH+SGXn7NC0JoHZrvz2CaanzkhfcwE+NZfzSeWRQEV7YSoToYbG6FZ0kx DHX4IGkVIj2G16aO+pmW4Ir9iHQ2qIvaUok8CrIkNtTQvfhIzIMMPxjU3WCwnVRc+iHWoc PsWajwXT4KpY2dpOIVSEnseY53hB9N0n8Qg5wINjh7XVVzcLSRweYdw2N4GDe1XJ9YCQsi owvBYPB/XshE00eiaXTkC0lXKAza0II7gHSuVtCgsGu497H414KRRzESUEJ6ag== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1655438638; a=rsa-sha256; cv=none; b=uSYz9RTX4cj0kMMfQuCA4kHgOhfLB2cdEd2rJjPF/u0wEHmeRoRUzIiYkAAbOb1gOZ155m vVXWIedEmqHzRgd7ewoUv4Yz68f9mNR3ChSl59JVTe+8PmdXtOlSNXKSfsh2p+QV1WJDzI in6/UtqwyInJKKJbneplYIgSYksXI9Yrz3EyAqnYWWrqX6XCT8QM+nQQYEcSSTYDSbp1RU OXFu8dxltqGCiZ+e8AOvcq3uJsfv7uVy0WN3r991KTyRwRuDwtP8AEMD0gJ5xW3xbR7vJA nwxLQSZfXPbrLdSHHfBKoNFSw5C5M99ZT0JA1gyd+zyTPqJqyLW+mGfS6TOMfg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=72d92425644c695b4e68da98263e3e68cecb84f3 commit 72d92425644c695b4e68da98263e3e68cecb84f3 Author: Yuri Victorovich AuthorDate: 2022-06-17 03:58:41 +0000 Commit: Yuri Victorovich CommitDate: 2022-06-17 04:03:50 +0000 science/hypre: Update 2.24.0 -> 2.25.0 Reported by: portscout --- science/hypre/Makefile | 2 +- science/hypre/distinfo | 6 +- ...ibuted__ls_pilut_DistributedMatrixPilutSolver.h | 11 --- ..._ls_pilut_HYPRE__DistributedMatrixPilutSolver.c | 11 --- .../files/patch-distributed__ls_pilut_parilut.c | 79 ---------------------- .../files/patch-distributed__ls_pilut_serilut.c | 63 ----------------- .../hypre/files/patch-distributed__ls_pilut_util.c | 21 ------ 7 files changed, 4 insertions(+), 189 deletions(-) diff --git a/science/hypre/Makefile b/science/hypre/Makefile index 4e6a17497218..2b066733a8e1 100644 --- a/science/hypre/Makefile +++ b/science/hypre/Makefile @@ -2,7 +2,7 @@ PORTNAME= hypre DISTVERSIONPREFIX= v -DISTVERSION= 2.24.0 +DISTVERSION= 2.25.0 CATEGORIES= science MAINTAINER= yuri@FreeBSD.org diff --git a/science/hypre/distinfo b/science/hypre/distinfo index 2f9c845bbcd1..d90a595d2534 100644 --- a/science/hypre/distinfo +++ b/science/hypre/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1644722060 -SHA256 (hypre-space-hypre-v2.24.0_GH0.tar.gz) = f480e61fc25bf533fc201fdf79ec440be79bb8117650627d1f25151e8be2fdb5 -SIZE (hypre-space-hypre-v2.24.0_GH0.tar.gz) = 6116863 +TIMESTAMP = 1655437893 +SHA256 (hypre-space-hypre-v2.25.0_GH0.tar.gz) = f9fc8371d91239fca694284dab17175bfda3821d7b7a871fd2e8f9d5930f303c +SIZE (hypre-space-hypre-v2.25.0_GH0.tar.gz) = 6671758 diff --git a/science/hypre/files/patch-distributed__ls_pilut_DistributedMatrixPilutSolver.h b/science/hypre/files/patch-distributed__ls_pilut_DistributedMatrixPilutSolver.h deleted file mode 100644 index 02cda72afd71..000000000000 --- a/science/hypre/files/patch-distributed__ls_pilut_DistributedMatrixPilutSolver.h +++ /dev/null @@ -1,11 +0,0 @@ ---- distributed_ls/pilut/DistributedMatrixPilutSolver.h.orig 2021-11-07 01:57:53 UTC -+++ distributed_ls/pilut/DistributedMatrixPilutSolver.h -@@ -86,7 +86,7 @@ HYPRE_Int Ul_timer; - #define jr (globals->_jr) - #define jw (globals->_jw) - #define lastjr (globals->_lastjr) --#define lr (globals->_lr) -+#define hypre_lr (globals->_lr) - #define lastlr (globals->_lastlr) - #define w (globals->_w) - #define firstrow (globals->_firstrow) diff --git a/science/hypre/files/patch-distributed__ls_pilut_HYPRE__DistributedMatrixPilutSolver.c b/science/hypre/files/patch-distributed__ls_pilut_HYPRE__DistributedMatrixPilutSolver.c deleted file mode 100644 index 6de1489c4226..000000000000 --- a/science/hypre/files/patch-distributed__ls_pilut_HYPRE__DistributedMatrixPilutSolver.c +++ /dev/null @@ -1,11 +0,0 @@ ---- distributed_ls/pilut/HYPRE_DistributedMatrixPilutSolver.c.orig 2021-11-07 12:02:36 UTC -+++ distributed_ls/pilut/HYPRE_DistributedMatrixPilutSolver.c -@@ -39,7 +39,7 @@ HYPRE_Int HYPRE_NewDistributedMatrixPilutSolver( - (hypre_PilutSolverGlobals *) hypre_CTAlloc( hypre_PilutSolverGlobals, 1 , HYPRE_MEMORY_HOST); - - jr = NULL; -- lr = NULL; -+ hypre_lr = NULL; - jw = NULL; - w = NULL; - diff --git a/science/hypre/files/patch-distributed__ls_pilut_parilut.c b/science/hypre/files/patch-distributed__ls_pilut_parilut.c deleted file mode 100644 index 9ac4c1cab52c..000000000000 --- a/science/hypre/files/patch-distributed__ls_pilut_parilut.c +++ /dev/null @@ -1,79 +0,0 @@ ---- distributed_ls/pilut/parilut.c.orig 2021-11-07 12:05:55 UTC -+++ distributed_ls/pilut/parilut.c -@@ -145,7 +145,7 @@ void hypre_ParILUT(DataDistType *ddist, FactorMatType - newperm, newiperm, vrowdist, -1);*/ - hypre_TFree(jr, HYPRE_MEMORY_HOST); - hypre_TFree(jw, HYPRE_MEMORY_HOST); -- hypre_TFree(lr, HYPRE_MEMORY_HOST); -+ hypre_TFree(hypre_lr, HYPRE_MEMORY_HOST); - hypre_TFree(w, HYPRE_MEMORY_HOST); - hypre_TFree(pilut_map, HYPRE_MEMORY_HOST); - hypre_TFree(nrmat.rmat_rnz, HYPRE_MEMORY_HOST); -@@ -167,7 +167,7 @@ void hypre_ParILUT(DataDistType *ddist, FactorMatType - - jr = NULL; - jw = NULL; -- lr = NULL; -+ hypre_lr = NULL; - w = NULL; - - #ifdef HYPRE_DEBUG -@@ -651,9 +651,9 @@ void hypre_ComputeRmat(FactorMatType *ldu, ReduceMatTy - /* record L elements */ - if (IsInMIS(pilut_map[rcolind[lastjr]])) { - if (rcolind[lastjr] >= firstrow && rcolind[lastjr] < lastrow) -- lr[lastlr] = (newiperm[rcolind[lastjr]-firstrow] << 1); -+ hypre_lr[lastlr] = (newiperm[rcolind[lastjr]-firstrow] << 1); - else { -- lr[lastlr] = pilut_map[rcolind[lastjr]]; /* map[] == (l<<1) | 1 */ -+ hypre_lr[lastlr] = pilut_map[rcolind[lastjr]]; /* map[] == (l<<1) | 1 */ - hypre_assert(incolind[StripMIS(pilut_map[rcolind[lastjr]])+1] == - rcolind[lastjr]); - } -@@ -696,7 +696,7 @@ void hypre_ComputeRmat(FactorMatType *ldu, ReduceMatTy - /* record L elements -- these must be local */ - if (IsInMIS(pilut_map[ucolind[l]])) { - hypre_assert(ucolind[l] >= firstrow && ucolind[l] < lastrow); -- lr[lastlr] = (newiperm[ucolind[l]-firstrow] << 1); -+ hypre_lr[lastlr] = (newiperm[ucolind[l]-firstrow] << 1); - lastlr++; - } - -@@ -736,7 +736,7 @@ void hypre_ComputeRmat(FactorMatType *ldu, ReduceMatTy - /* record L elements -- these must be remote */ - if (IsInMIS(pilut_map[incolind[l]])) { - hypre_assert(incolind[l] < firstrow || incolind[l] >= lastrow); -- lr[lastlr] = pilut_map[incolind[l]]; /* map[] == (l<<1) | 1 */ -+ hypre_lr[lastlr] = pilut_map[incolind[l]]; /* map[] == (l<<1) | 1 */ - lastlr++; - } - -@@ -834,7 +834,7 @@ void hypre_FactorLocal(FactorMatType *ldu, ReduceMatTy - if (rcolind[lastjr] >= firstrow && - rcolind[lastjr] < lastrow && - newiperm[rcolind[lastjr]-firstrow] < diag) { -- lr[lastlr] = newiperm[rcolind[lastjr]-firstrow]; -+ hypre_lr[lastlr] = newiperm[rcolind[lastjr]-firstrow]; - lastlr++; - } - -@@ -873,7 +873,7 @@ void hypre_FactorLocal(FactorMatType *ldu, ReduceMatTy - ucolind[l] < lastrow && - newiperm[ucolind[l]-firstrow] < diag) { - hypre_assert(IsInMIS(pilut_map[ucolind[l]])); -- lr[lastlr] = newiperm[ucolind[l]-firstrow]; -+ hypre_lr[lastlr] = newiperm[ucolind[l]-firstrow]; - lastlr++; - } - -@@ -1353,8 +1353,8 @@ void hypre_ParINIT( ReduceMatType *nrmat, CommInfoType - /* Allocate work space */ - hypre_TFree(jr, HYPRE_MEMORY_HOST); - jr = hypre_idx_malloc_init(nrows, -1, "hypre_ParILUT: jr"); -- hypre_TFree(lr, HYPRE_MEMORY_HOST); -- lr = hypre_idx_malloc_init(nleft, -1, "hypre_ParILUT: lr"); -+ hypre_TFree(hypre_lr, HYPRE_MEMORY_HOST); -+ hypre_lr = hypre_idx_malloc_init(nleft, -1, "hypre_ParILUT: lr"); - hypre_TFree(jw, HYPRE_MEMORY_HOST); - jw = hypre_idx_malloc(nleft, "hypre_ParILUT: jw"); - hypre_TFree(w, HYPRE_MEMORY_HOST); diff --git a/science/hypre/files/patch-distributed__ls_pilut_serilut.c b/science/hypre/files/patch-distributed__ls_pilut_serilut.c deleted file mode 100644 index 359c1faa1fe1..000000000000 --- a/science/hypre/files/patch-distributed__ls_pilut_serilut.c +++ /dev/null @@ -1,63 +0,0 @@ ---- distributed_ls/pilut/serilut.c.orig 2021-11-07 12:06:04 UTC -+++ distributed_ls/pilut/serilut.c -@@ -70,8 +70,8 @@ HYPRE_Int hypre_SerILUT(DataDistType *ddist, HYPRE_Dis - /* Allocate work space */ - hypre_TFree(jr, HYPRE_MEMORY_HOST); - jr = hypre_idx_malloc_init(nrows, -1, "hypre_SerILUT: jr"); -- hypre_TFree(lr, HYPRE_MEMORY_HOST); -- lr = hypre_idx_malloc_init(nrows, -1, "hypre_SerILUT: lr"); -+ hypre_TFree(hypre_lr, HYPRE_MEMORY_HOST); -+ hypre_lr = hypre_idx_malloc_init(nrows, -1, "hypre_SerILUT: lr"); - hypre_TFree(jw, HYPRE_MEMORY_HOST); - jw = hypre_idx_malloc(nrows, "hypre_SerILUT: jw"); - hypre_TFree(w, HYPRE_MEMORY_HOST); -@@ -158,7 +158,7 @@ HYPRE_Int hypre_SerILUT(DataDistType *ddist, HYPRE_Dis - - for (lastjr=1, lastlr=0, j=0, diag_present=0; j= firstrow && - col_ind[j] < lastrow && - iperm[col_ind[j]-firstrow] < nlocal) -- lr[lastlr++] = iperm[col_ind[j]-firstrow]; /* Copy the L elements separately */ -+ hypre_lr[lastlr++] = iperm[col_ind[j]-firstrow]; /* Copy the L elements separately */ - - if (col_ind[j] != i+firstrow) { /* Off-diagonal element */ - jr[col_ind[j]] = lastjr; -@@ -304,7 +304,7 @@ HYPRE_Int hypre_SerILUT(DataDistType *ddist, HYPRE_Dis - if (m == -1) { /* Create fill */ - hypre_CheckBounds(firstrow, ucolind[l], lastrow, globals); - if (iperm[ucolind[l]-firstrow] < nlocal) -- lr[lastlr++] = iperm[ucolind[l]-firstrow]; /* Copy the L elements separately */ -+ hypre_lr[lastlr++] = iperm[ucolind[l]-firstrow]; /* Copy the L elements separately */ - - jr[ucolind[l]] = lastjr; - jw[lastjr] = ucolind[l]; -@@ -330,11 +330,11 @@ HYPRE_Int hypre_SerILUT(DataDistType *ddist, HYPRE_Dis - /*hypre_free_multi(jr, jw, lr, w, -1);*/ - hypre_TFree(jr, HYPRE_MEMORY_HOST); - hypre_TFree(jw, HYPRE_MEMORY_HOST); -- hypre_TFree(lr, HYPRE_MEMORY_HOST); -+ hypre_TFree(hypre_lr, HYPRE_MEMORY_HOST); - hypre_TFree(w, HYPRE_MEMORY_HOST); - jr = NULL; - jw = NULL; -- lr = NULL; -+ hypre_lr = NULL; - w = NULL; - - return(ierr); diff --git a/science/hypre/files/patch-distributed__ls_pilut_util.c b/science/hypre/files/patch-distributed__ls_pilut_util.c deleted file mode 100644 index e6ecf98bc445..000000000000 --- a/science/hypre/files/patch-distributed__ls_pilut_util.c +++ /dev/null @@ -1,21 +0,0 @@ ---- distributed_ls/pilut/util.c.orig 2021-11-07 12:06:10 UTC -+++ distributed_ls/pilut/util.c -@@ -28,15 +28,15 @@ HYPRE_Int hypre_ExtractMinLR( hypre_PilutSolverGlobals - HYPRE_Int i, j=0 ; - - for (i=1; i