From debbugs-submit-bounces@debbugs.gnu.org Tue Apr 22 11:30:18 2025 Received: (at submit) by debbugs.gnu.org; 22 Apr 2025 15:30:18 +0000 Received: from localhost ([127.0.0.1]:49429 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1u7FZh-0001D9-Ax for submit@debbugs.gnu.org; Tue, 22 Apr 2025 11:30:18 -0400 Received: from lists.gnu.org ([2001:470:142::17]:38464) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1u7FZd-00015w-8N for submit@debbugs.gnu.org; Tue, 22 Apr 2025 11:30:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1u7FZG-0003Bi-V3 for guix-patches@gnu.org; Tue, 22 Apr 2025 11:29:51 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1u7FZE-0001Dt-QU; Tue, 22 Apr 2025 11:29:49 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:Date:Subject:To:From:in-reply-to: references; bh=/YG8ELA4GMuYiu5PdmDP4tPlCwZD7Dp79wQlN34EKxY=; b=okBz6mq3WSQP6B tRzu1eDAyysQrN7ecqxSF2SZ81kgqaXk7ITW2asKYuroUsjnF/XC1kosPM1nHnvqm9dTlV9M64Bu7 n14N6S5Ay+fZeigZeyGCWDNyj4+RKxvTxZbRqvHcs+gbQnQBAbUIsIay0Qz17aMaN6z8klqURP74S a+EPAubLwgtL0mUL458mmsjQkLKjByYjD0+KQrP8BWnoe6eMNNOH8surysmf3/5EKDuBISQi5Fofu DNUE2eSz1nUD6X9Za8zo+8Lqe8X+QBhFbVObqY6qBIy/mvBM7oJdyGqARpkRBhNxwBQlyy9XXleWe OO5odvzlNPOOKMFZFK4Q==; From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= To: guix-patches@gnu.org Subject: [PATCH 0/4] Upgrade Scotch to 7.0.7 Date: Tue, 22 Apr 2025 17:29:23 +0200 Message-ID: X-Mailer: git-send-email 2.49.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-Debbugs-Cc: Andreas Enge , Eric Bavier , Sharlatan Hellseher Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: submit Cc: marc.fuentes@inria.fr, =?UTF-8?q?Ludovic=20Court=C3=A8s?= , romain.garbage@inria.fr, julien.castelneau@inria.fr X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hello, This fixes a bug with Scotch’s parmetis compatibility layer CMake files, upgrades it, and modernizes the definitions. Tested with: guix build -P1 scotch -P1 pt-scotch -P1 scotch32 -P1 pt-scotch32 … ignoring fenics* and superlu-dist, which are already broken on ‘master’. Thanks, Ludo’. Ludovic Courtès (4): gnu: scotch: Remove “-shared” deprecated aliases. gnu: scotch: Keep *.cmake in the main output. gnu: scotch, scotch32, pt-scotch, pt-scotch32: Use gexps. gnu: scotch: Update to 7.0.7. gnu/packages/maths.scm | 78 +++++++++++++++++++----------------------- 1 file changed, 36 insertions(+), 42 deletions(-) base-commit: 7a4193ec4a09fecc68dc726c1e0bbb5ad03d404a -- 2.49.0 From debbugs-submit-bounces@debbugs.gnu.org Tue Apr 22 11:32:09 2025 Received: (at 77991) by debbugs.gnu.org; 22 Apr 2025 15:32:09 +0000 Received: from localhost ([127.0.0.1]:49449 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1u7FbU-0001Hw-GU for submit@debbugs.gnu.org; Tue, 22 Apr 2025 11:32:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40262) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1u7FbR-0001H3-HB for 77991@debbugs.gnu.org; Tue, 22 Apr 2025 11:32:06 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1u7FbL-0001a4-TT; Tue, 22 Apr 2025 11:31:59 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=mwHGmD/mYqHEPW5rIRiHRUsNoZV9zkmxXl9yeRjTn4U=; b=jG69989w8Nc36mdmDNUl XmG/rmfLBFzUYN1LO3jgUhDgwr0xQnwiX9CiO4SOzuXfKOc69jWBnIQkw1bJOA27ziPn7SvtUnJrj gECdwJooTnM/ukGNkgJhSzi0N/n16kjmP5oy2PKxIKaLldAQCfgX/1xAvyi21eJWH9sF/bugKiOmz je7+axfNxedtAxzKCxjJ9uflLtz2SaTuDghu7pvN8BOcyoHZh2m+YL1+GgpnhmtchPW1EIgLtFMuH PoiawsFy+uWkPtZaOJ35hTOA4N/hosqUi88ysPMnB8oEmFhFJzIJkh2A2bASHEhR5pYA7t4WOzjM+ Wr8Dj7VatDztVg==; From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= To: 77991@debbugs.gnu.org Subject: [PATCH 1/4] =?UTF-8?q?gnu:=20scotch:=20Remove=20=E2=80=9C-shared?= =?UTF-8?q?=E2=80=9D=20deprecated=20aliases.?= Date: Tue, 22 Apr 2025 17:31:47 +0200 Message-ID: <96bbf47ff95242e5bb2658c91e3adba5c330d845.1745335552.git.ludo@gnu.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-Debbugs-Cc: Andreas Enge , Eric Bavier , Sharlatan Hellseher Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 77991 Cc: =?UTF-8?q?Ludovic=20Court=C3=A8s?= X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) From: Ludovic Courtès These aliases were added in commit d4709d78c3b460d7be02f15f6cc6c85f398b1a46, Feb. 2022. * gnu/packages/maths.scm (scotch-shared, pt-scotch-shared): Remove. Change-Id: I971bbf999a9fce5dae05c865316defe55eaeb212 --- gnu/packages/maths.scm | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index b0c5b8685c..2c53f6d8af 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -5290,17 +5290,6 @@ (define-public pt-scotch32 (synopsis "Programs and libraries for graph algorithms (with MPI and 32-bit integers)"))) -(define-public scotch-shared - ;; There used to be separate shared library variants while the default would - ;; provide .a files including PIC objects. With the switch to CMake, .a - ;; files contain non-PIC objects, which breaks some users, and switching to - ;; shared libraries by default seems to make more sense, as discussed here: - ;; . - (deprecated-package "scotch-shared" scotch)) - -(define-public pt-scotch-shared - (deprecated-package "pt-scotch-shared" pt-scotch)) - (define-public gklib (let ((commit "8bd6bad750b2b0d90800c632cf18e8ee93ad72d7") (revision "1")) -- 2.49.0 From debbugs-submit-bounces@debbugs.gnu.org Tue Apr 22 11:32:11 2025 Received: (at 77991) by debbugs.gnu.org; 22 Apr 2025 15:32:12 +0000 Received: from localhost ([127.0.0.1]:49453 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1u7FbX-0001ID-4u for submit@debbugs.gnu.org; Tue, 22 Apr 2025 11:32:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40276) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1u7FbS-0001H4-7a for 77991@debbugs.gnu.org; Tue, 22 Apr 2025 11:32:07 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1u7FbM-0001aK-Rq; Tue, 22 Apr 2025 11:32:00 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=YWNHFoA5a4L+xd0H65srd4uGnLD84UBW4JjiLsLGJc0=; b=dcWJuWNfwisFAEI2N/hg y9mVfLc/tx6uXlV5XkPfAzFGVn6+oo0zMF3USjjze3oz89GIv86zerWkS24VsncjCO8QwMewYvXfi pKqAJdarMS2UF8KYB+cZ3O6i2dWsmuE7Kz0v8OxBsi7yVYCk0ZwTllfAAtSlzsf+mfCFVATxULeoh kEvwEC/ubATUCC3lFlw1D706rTNigwhVjWHLVJb18ZM0MrhVPECukxgOzO+ri5Zay/ZMCg2Pj2Cqg AUgyprM1m5RrWZT0ENRrA5JdLb5jLylPD9MAVk19TPN4rd/VqT4iU5Wg782Du4KxJc5KdkoXofYIP 8vrkY+Vo6YISgg==; From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= To: 77991@debbugs.gnu.org Subject: [PATCH 2/4] gnu: scotch: Keep *.cmake in the main output. Date: Tue, 22 Apr 2025 17:31:48 +0200 Message-ID: X-Mailer: git-send-email 2.49.0 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-Debbugs-Cc: Andreas Enge , Eric Bavier , Sharlatan Hellseher Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 77991 Cc: =?UTF-8?q?Ludovic=20Court=C3=A8s?= X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) From: Ludovic Courtès This fixes a bug whereby ‘SCOTCHConfig.cmake’ would fail to find ‘scotchmetisTargets.cmake’ because it expects it to be in the same directory as itself, ${CMAKE_CURRENT_LIST_DIR}. * gnu/packages/maths.scm (scotch)[arguments]: Adjust ‘install-metis’ phase to keep *.cmake in “out”. Change-Id: If8d8f890852c35cede6e81c33d18b9101988a635 --- gnu/packages/maths.scm | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 2c53f6d8af..6a11103e3b 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -5220,15 +5220,22 @@ (define-public scotch (modify-phases %standard-phases (add-after 'install 'install-metis (lambda* (#:key outputs #:allow-other-keys) + ;; Move the METIS compatibility library to a separate output to + ;; avoid a name clash on . (let* ((out (assoc-ref outputs "out")) (metis (assoc-ref outputs "metis")) (prefix (string-length out))) (for-each (lambda (file) - (let ((target (string-append - metis - (string-drop file prefix)))) - (mkdir-p (dirname target)) - (rename-file file target))) + ;; 'SCOTCHConfig.cmake' includes + ;; *metisTargets.cmake from + ;; ${CMAKE_CURRENT_LIST_DIR} so keep all *.cmake + ;; files in "out". + (unless (string-suffix? ".cmake" file) + (let ((target (string-append + metis + (string-drop file prefix)))) + (mkdir-p (dirname target)) + (rename-file file target)))) (find-files out "metis")))))))) (home-page "https://www.labri.fr/perso/pelegrin/scotch/") (properties -- 2.49.0 From debbugs-submit-bounces@debbugs.gnu.org Tue Apr 22 11:32:12 2025 Received: (at 77991) by debbugs.gnu.org; 22 Apr 2025 15:32:12 +0000 Received: from localhost ([127.0.0.1]:49455 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1u7FbX-0001IF-UU for submit@debbugs.gnu.org; Tue, 22 Apr 2025 11:32:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40286) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1u7FbT-0001HG-Ip for 77991@debbugs.gnu.org; Tue, 22 Apr 2025 11:32:08 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1u7FbN-0001aW-Uh; Tue, 22 Apr 2025 11:32:02 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=9pnm5sIfUI9enmQ4+Ks6NwpKJlBi2sbi0IYnvzjBcww=; b=ckYGDLBxBwZrPew6gqo+ jym0Zc4m1tfGaDjUZirqUERUoyq6orhZkdO7lA8emZlsXrQHLPryYdxjkPEdxgMxWFaQeoew23h1A ooJ8tQcT5KmpUAt/t3jnzosMY7TkxP0WsNkuy5xpiNrn3BdOHl850Y2lZPqSDWJBL0ExrEkcgnG05 455S5+3HJge1qrpBAhc23jn2YHs5nShiRx1qC2T1TkkifvQQHI5XwAWxTijryByBStD/HqdBeJZ8T f2/NT62qPPAFYC3/DFzobUpvLVhUwFG91tyrmBtRhqWtqR2Kb/sbsSy2txUweNPfraTpoJk0tLZpg +svg2dmroJjxDQ==; From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= To: 77991@debbugs.gnu.org Subject: [PATCH 3/4] gnu: scotch, scotch32, pt-scotch, pt-scotch32: Use gexps. Date: Tue, 22 Apr 2025 17:31:49 +0200 Message-ID: <8907d0e03e2bf27d5398517a1ff31acfdb9ff0cb.1745335552.git.ludo@gnu.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Andreas Enge , Eric Bavier , Sharlatan Hellseher Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 77991 Cc: =?UTF-8?q?Ludovic=20Court=C3=A8s?= X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/packages/maths.scm (scotch, scotch32) (pt-scotch, pt-scotch32): Use gexps. Change-Id: I93febc994c5345e133eddbd016b1974d08df5bdf --- gnu/packages/maths.scm | 70 ++++++++++++++++++++---------------------- 1 file changed, 34 insertions(+), 36 deletions(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 6a11103e3b..abd05b9d63 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -5214,29 +5214,30 @@ (define-public scotch (list flex bison gfortran)) (outputs '("out" "metis")) (arguments - `(#:configure-flags '("-DBUILD_SHARED_LIBS=YES" "-DINTSIZE=64" - "-DBUILD_PTSCOTCH=OFF") - #:phases - (modify-phases %standard-phases - (add-after 'install 'install-metis - (lambda* (#:key outputs #:allow-other-keys) - ;; Move the METIS compatibility library to a separate output to - ;; avoid a name clash on . - (let* ((out (assoc-ref outputs "out")) - (metis (assoc-ref outputs "metis")) - (prefix (string-length out))) - (for-each (lambda (file) - ;; 'SCOTCHConfig.cmake' includes - ;; *metisTargets.cmake from - ;; ${CMAKE_CURRENT_LIST_DIR} so keep all *.cmake - ;; files in "out". - (unless (string-suffix? ".cmake" file) - (let ((target (string-append - metis - (string-drop file prefix)))) - (mkdir-p (dirname target)) - (rename-file file target)))) - (find-files out "metis")))))))) + (list #:configure-flags #~'("-DBUILD_SHARED_LIBS=YES" "-DINTSIZE=64" + "-DBUILD_PTSCOTCH=OFF") + #:phases + #~(modify-phases %standard-phases + (add-after 'install 'install-metis + (lambda* (#:key outputs #:allow-other-keys) + ;; Move the METIS compatibility library to a separate output to + ;; avoid a name clash on . + (let* ((out (assoc-ref outputs "out")) + (metis (assoc-ref outputs "metis")) + (prefix (string-length out))) + (for-each (lambda (file) + ;; 'SCOTCHConfig.cmake' includes + ;; *metisTargets.cmake from + ;; ${CMAKE_CURRENT_LIST_DIR} so keep all + ;; *.cmake files in "out". + (unless (string-suffix? ".cmake" file) + (let ((target + (string-append metis + (string-drop file + prefix)))) + (mkdir-p (dirname target)) + (rename-file file target)))) + (find-files out "metis")))))))) (home-page "https://www.labri.fr/perso/pelegrin/scotch/") (properties `((release-monitoring-url @@ -5260,9 +5261,8 @@ (define-public scotch32 (name "scotch32") (arguments (substitute-keyword-arguments (package-arguments scotch) - ((#:configure-flags flags ''()) - ''("-DBUILD_SHARED_LIBS=YES" "-DBUILD_PTSCOTCH=OFF" - "-DINTSIZE=32")))) + ((#:configure-flags flags #~'()) + #~'("-DBUILD_SHARED_LIBS=YES" "-DBUILD_PTSCOTCH=OFF" "-DINTSIZE=32")))) (synopsis "Programs and libraries for graph algorithms (32-bit integers)"))) @@ -5274,13 +5274,12 @@ (define-public pt-scotch (list openmpi)) ;headers include MPI headers (arguments (substitute-keyword-arguments (package-arguments scotch) - ((#:configure-flags flags ''()) - ''("-DBUILD_SHARED_LIBS=YES" "-DBUILD_PTSCOTCH=ON" - "-DINTSIZE=64")) - ((#:phases phases '%standard-phases) - `(modify-phases ,phases - (add-before 'check 'mpi-setup - ,%openmpi-setup))))) + ((#:configure-flags flags #~'()) + #~'("-DBUILD_SHARED_LIBS=YES" "-DBUILD_PTSCOTCH=ON" "-DINTSIZE=64")) + ((#:phases phases #~%standard-phases) + #~(modify-phases #$phases + (add-before 'check 'mpi-setup + #$%openmpi-setup))))) (synopsis "Programs and libraries for graph algorithms (with MPI)"))) (define-public pt-scotch32 @@ -5291,9 +5290,8 @@ (define-public pt-scotch32 (list openmpi)) ;headers include MPI headers (arguments (substitute-keyword-arguments (package-arguments pt-scotch) - ((#:configure-flags flags ''()) - ''("-DBUILD_SHARED_LIBS=YES" "-DBUILD_PTSCOTCH=ON" - "-DINTSIZE=32")))) + ((#:configure-flags flags #~'()) + #~'("-DBUILD_SHARED_LIBS=YES" "-DBUILD_PTSCOTCH=ON" "-DINTSIZE=32")))) (synopsis "Programs and libraries for graph algorithms (with MPI and 32-bit integers)"))) -- 2.49.0 From debbugs-submit-bounces@debbugs.gnu.org Tue Apr 22 11:32:12 2025 Received: (at 77991) by debbugs.gnu.org; 22 Apr 2025 15:32:13 +0000 Received: from localhost ([127.0.0.1]:49457 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1u7FbY-0001IP-Hl for submit@debbugs.gnu.org; Tue, 22 Apr 2025 11:32:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40302) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1u7FbU-0001Ha-Md for 77991@debbugs.gnu.org; Tue, 22 Apr 2025 11:32:08 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1u7FbO-0001af-TK; Tue, 22 Apr 2025 11:32:03 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=w2h4I7m/OPv2DyE/wT+PZw0KlU6m89O31HC2VJIYk+Q=; b=J7LixhRHMXlz04mrKdCW SypL9bH/x1cObNFCxh6hcx0gyJIb7u6fM7zTkES3DKx3QeHvcLbABpGpZB4TvcQ5+OiJ7ftzLzX3A dEG8we4uWpTUqELTK/rOXj+XEqujN0eTPfz39n3MuGVHe4njvTXqDoWJlnjj5o0TJbUpYVy9d53Hs lZIe5vMfMPp0dehZJbp8ZckBgDtNoqiE2ZS7rmt2YBueM8yVJdoYDLbDhIjVAxQ/yctAJSB0kdY8X uFG3PGglSQnN7GcnoYDC3JfRvDli2oH8tri1SXzwnoXiWJ9uFNX5QsjtOHI7TVlVFYmOlLDqMF3lD sW3qQyd0pxkEFQ==; From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= To: 77991@debbugs.gnu.org Subject: [PATCH 4/4] gnu: scotch: Update to 7.0.7. Date: Tue, 22 Apr 2025 17:31:50 +0200 Message-ID: <636528fd7d7d8c0195c3037a1e582eb690d57b9e.1745335552.git.ludo@gnu.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Andreas Enge , Eric Bavier , Sharlatan Hellseher Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 77991 Cc: =?UTF-8?q?Ludovic=20Court=C3=A8s?= X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) From: Ludovic Courtès * gnu/packages/maths.scm (scotch): Update to 7.0.7. Change-Id: Idef8e0956d9da1aef13fb423c53db60b6a61b04b --- gnu/packages/maths.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index abd05b9d63..5683c24f84 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -5190,7 +5190,7 @@ (define-public superlu-dist (define-public scotch (package (name "scotch") - (version "7.0.4") + (version "7.0.7") (source (origin (method git-fetch) @@ -5199,7 +5199,7 @@ (define-public scotch (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0rbc51albpd2923dkirpkj8rfkic6rsvwqqnv1mmsk391zhk3amr")) + (base32 "0r46bmnz9xjlgcb3vvlx3sg2qh4gfgga89vs4vlbzz3s4lj48g46")) (modules '((guix build utils))) (snippet #~(substitute* "src/libscotchmetis/library_parmetis.h" -- 2.49.0 From debbugs-submit-bounces@debbugs.gnu.org Thu Apr 24 10:37:36 2025 Received: (at 77991) by debbugs.gnu.org; 24 Apr 2025 14:37:37 +0000 Received: from localhost ([127.0.0.1]:39914 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1u7xhl-0002OM-Lg for submit@debbugs.gnu.org; Thu, 24 Apr 2025 10:37:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39746) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1u7xhg-0002Nn-QN for 77991@debbugs.gnu.org; Thu, 24 Apr 2025 10:37:30 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1u7xha-0003kp-Sd; Thu, 24 Apr 2025 10:37:22 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:Date:Subject:To:From:in-reply-to: references; bh=gSkFkJIiqERbdoCOhPodcfmBXrPoLxEzg1mZFiBz83I=; b=dKihvYzU7V1ogp HCj0BmP4G+o8FXS3OKSFy0MYxc5asQwY2NqSTUizsj8UlNAGJ/doIpoGCT7z7AytuvXxXYGlgE9Gx RZfmRdaLIZ7jIx0+uPXNvUBZJN1l8w7p5CuF9hDZtmClp0iduy+kPDqdpJv/Iu4LY5V/scLoevWRy pcuAS+i1t8TjTz+jLltRQNS4LR1jJIfcWJ56qYC+1bab6lbSozNJOjQqT5FTEaeM6Gq3zvuCJN7AU i4D1N6h8GUDYs+nuLtLTOYgneV81b2RqGe2lHzgFtxqBSlLs7iEJvePC6yMcv3gKnhD5oL2+YEKmr 6xEiAAzUG53YIQIZ8oUQ==; From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= To: 77991@debbugs.gnu.org Subject: [PATCH v2 0/4] Upgrade Scotch to 7.0.7 Date: Thu, 24 Apr 2025 16:36:53 +0200 Message-ID: X-Mailer: git-send-email 2.49.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-Debbugs-Cc: Andreas Enge , Eric Bavier , Sharlatan Hellseher Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 77991 Cc: =?UTF-8?q?Ludovic=20Court=C3=A8s?= X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) As colleagues found out, the commit that was meant to fix 'SCOTCHConfig.cmake' was ineffective: the *metisTargets.cmake file were indeed found, but then lib*scotchmetis.so would not be found, causing 'cmake' to fail. This version fixes that. I tested again all the dependents. Ludo'. Ludovic Courtès (4): gnu: scotch: Remove “-shared” deprecated aliases. gnu: scotch: Remove CMake machinery for the Metis compatibility layer. gnu: scotch, scotch32, pt-scotch, pt-scotch32: Use gexps. gnu: scotch: Update to 7.0.7. gnu/local.mk | 1 + gnu/packages/maths.scm | 74 ++++++++----------- .../patches/scotch-cmake-remove-metis.patch | 24 ++++++ 3 files changed, 57 insertions(+), 42 deletions(-) create mode 100644 gnu/packages/patches/scotch-cmake-remove-metis.patch base-commit: 9f4bdb270e178eac636df3f4bbffbe4aa3b90a67 -- 2.49.0 From debbugs-submit-bounces@debbugs.gnu.org Thu Apr 24 10:37:39 2025 Received: (at 77991) by debbugs.gnu.org; 24 Apr 2025 14:37:39 +0000 Received: from localhost ([127.0.0.1]:39920 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1u7xhq-0002P6-Ok for submit@debbugs.gnu.org; Thu, 24 Apr 2025 10:37:39 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39762) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1u7xhj-0002Nr-Nj for 77991@debbugs.gnu.org; Thu, 24 Apr 2025 10:37:32 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1u7xhe-0003lN-B0; Thu, 24 Apr 2025 10:37:26 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=J4BUc2u9ZnTtAAs7EpoxMxglc3zHFSPSwDFI6015gL8=; b=nirDeYjRuCHEmH9mS+3f wroFk4lWh6uNveT3u+p6JwKz0mQ+WYLlVp91MXnGbCasGUpsf1EcClg6SnLnrWoj/u/FF1GzB9xeo Z8sQy5GoiY8MR5foqfD91wT9MQ21qYYQk94vN6obxzW9WWdmLzuWWMHEzE8CPWvJxZ/668pGGRERt HGKFeQOrnmex4zILWOgb0c3ewKABum6Y+jACpuHBJ1n58T3krQDD107MdwFjHs6F+Ix59SAsFexqn bRZQfrwyDoRAXmUETd3a0LQ/9fgV+Yqxd/aYNLWaHkenbkcskI5WTm1qiZypWv9KY2iS+JPW+WA66 RMyZdVpvo2CjkA==; From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= To: 77991@debbugs.gnu.org Subject: [PATCH v2 1/4] =?UTF-8?q?gnu:=20scotch:=20Remove=20=E2=80=9C-shar?= =?UTF-8?q?ed=E2=80=9D=20deprecated=20aliases.?= Date: Thu, 24 Apr 2025 16:36:54 +0200 Message-ID: <30c81ad6f2f6d2d74633651bbc0799630ac88bb3.1745505295.git.ludo@gnu.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-Debbugs-Cc: Andreas Enge , Eric Bavier , Sharlatan Hellseher Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 77991 Cc: =?UTF-8?q?Ludovic=20Court=C3=A8s?= X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) From: Ludovic Courtès These aliases were added in commit d4709d78c3b460d7be02f15f6cc6c85f398b1a46, Feb. 2022. * gnu/packages/maths.scm (scotch-shared, pt-scotch-shared): Remove. Change-Id: I971bbf999a9fce5dae05c865316defe55eaeb212 --- gnu/packages/maths.scm | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 28c71283a7..7327aeaf40 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -5290,17 +5290,6 @@ (define-public pt-scotch32 (synopsis "Programs and libraries for graph algorithms (with MPI and 32-bit integers)"))) -(define-public scotch-shared - ;; There used to be separate shared library variants while the default would - ;; provide .a files including PIC objects. With the switch to CMake, .a - ;; files contain non-PIC objects, which breaks some users, and switching to - ;; shared libraries by default seems to make more sense, as discussed here: - ;; . - (deprecated-package "scotch-shared" scotch)) - -(define-public pt-scotch-shared - (deprecated-package "pt-scotch-shared" pt-scotch)) - (define-public gklib (let ((commit "8bd6bad750b2b0d90800c632cf18e8ee93ad72d7") (revision "1")) -- 2.49.0 From debbugs-submit-bounces@debbugs.gnu.org Thu Apr 24 10:37:40 2025 Received: (at 77991) by debbugs.gnu.org; 24 Apr 2025 14:37:40 +0000 Received: from localhost ([127.0.0.1]:39922 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1u7xhr-0002PD-Dg for submit@debbugs.gnu.org; Thu, 24 Apr 2025 10:37:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39764) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1u7xhl-0002Nv-0m for 77991@debbugs.gnu.org; Thu, 24 Apr 2025 10:37:34 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1u7xhf-0003ld-Ew; Thu, 24 Apr 2025 10:37:27 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=kNwHryhMlSwIA7FMGoi3+HJ9kFnu/HZgR3/xE0Xev1g=; b=JK5rUZfBP3DRlaf8QE5Y MpBRQElnufARSHQSQHUdoXCRMKWgjqpU1R3fLlyc8QFiQErZ4oLXWQapvAQcFhs83aWop/qEebXPb sINDjsvY84TLkIyQmZY+c1qvr8ZOQon+5wLbqcFym4X2K1++Plb6UaL9xnxN+77p+1HVE9tULIEEx yslvW2NhxBInAYWUDxf2bKdghDyTaaniFbg/KpqjgYf0/wBFe3Mrmt7M745E0OZsT5EsSXQdFt+Y2 YGCkFQZB0+TO0ClKMfBnukO/XjHJovnRTuOz06WUKg3MpWWFcfv9mLxWMruShKk4hhV2X9UGZ/vKe pDync2gNofxpuQ==; From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= To: 77991@debbugs.gnu.org Subject: [PATCH v2 2/4] gnu: scotch: Remove CMake machinery for the Metis compatibility layer. Date: Thu, 24 Apr 2025 16:36:55 +0200 Message-ID: <316ce8695c3b7b06fee2e483218b434ad8511b50.1745505295.git.ludo@gnu.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-Debbugs-Cc: Andreas Enge , Eric Bavier , Sharlatan Hellseher Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 77991 Cc: =?UTF-8?q?Ludovic=20Court=C3=A8s?= X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) From: Ludovic Courtès This fixes a bug whereby ‘SCOTCHConfig.cmake’ would fail to find ‘scotchmetisTargets.cmake’ because it expects it to be in the same directory as itself, ${CMAKE_CURRENT_LIST_DIR}. * gnu/packages/patches/scotch-cmake-remove-metis.patch: New file. * gnu/packages/maths.scm (scotch)[source]: Use it. * gnu/local.mk (dist_patch_DATA): Add it. Change-Id: If8d8f890852c35cede6e81c33d18b9101988a635 --- gnu/local.mk | 1 + gnu/packages/maths.scm | 3 +++ .../patches/scotch-cmake-remove-metis.patch | 24 +++++++++++++++++++ 3 files changed, 28 insertions(+) create mode 100644 gnu/packages/patches/scotch-cmake-remove-metis.patch diff --git a/gnu/local.mk b/gnu/local.mk index 4aa84f8ef9..a250b3f748 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -2249,6 +2249,7 @@ dist_patch_DATA = \ %D%/packages/patches/scilab-better-compiler-detection.patch \ %D%/packages/patches/scilab-tbx_build_help.patch \ %D%/packages/patches/scons-test-environment.patch \ + %D%/packages/patches/scotch-cmake-remove-metis.patch \ %D%/packages/patches/screen-hurd-path-max.patch \ %D%/packages/patches/scsh-nonstring-search-path.patch \ %D%/packages/patches/seed-webkit.patch \ diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 7327aeaf40..33eb4cda7b 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -5200,6 +5200,7 @@ (define-public scotch (file-name (git-file-name name version)) (sha256 (base32 "0rbc51albpd2923dkirpkj8rfkic6rsvwqqnv1mmsk391zhk3amr")) + (patches (search-patches "scotch-cmake-remove-metis.patch")) (modules '((guix build utils))) (snippet #~(substitute* "src/libscotchmetis/library_parmetis.h" @@ -5220,6 +5221,8 @@ (define-public scotch (modify-phases %standard-phases (add-after 'install 'install-metis (lambda* (#:key outputs #:allow-other-keys) + ;; Move the METIS compatibility library to a separate output to + ;; avoid a name clash on . (let* ((out (assoc-ref outputs "out")) (metis (assoc-ref outputs "metis")) (prefix (string-length out))) diff --git a/gnu/packages/patches/scotch-cmake-remove-metis.patch b/gnu/packages/patches/scotch-cmake-remove-metis.patch new file mode 100644 index 0000000000..91bb36f86e --- /dev/null +++ b/gnu/packages/patches/scotch-cmake-remove-metis.patch @@ -0,0 +1,24 @@ +Remove the CMake machinery for the Metis/Parmetis compatibility layer: +it has zero users and complicates things due to the separate "metis" +output. + +Notably, the assumption in 'SCOTCHConfig.cmake' is that *metisTargets.cmake +are in the same directory, which is not the case here. Furthermore, +'*metisTargets-relwithdebuginfo.cmake' assumes 'libscotchmetis*.so*' is +available under '_IMPORT_PREFIX', which is only the case when +'libscotchmetis*.so' is installed in the same directory as 'libscotch.so'. + +diff --git a/cmake/SCOTCHConfig.cmake.in b/cmake/SCOTCHConfig.cmake.in +index ec52ac5..4ce5c30 100644 +--- a/cmake/SCOTCHConfig.cmake.in ++++ b/cmake/SCOTCHConfig.cmake.in +@@ -77,9 +77,3 @@ if(@BUILD_LIBESMUMPS@) + include("${CMAKE_CURRENT_LIST_DIR}/ptesmumpsTargets.cmake") + endif() + endif() +-if(@BUILD_LIBSCOTCHMETIS@) +- include("${CMAKE_CURRENT_LIST_DIR}/scotchmetisTargets.cmake") +- if(@BUILD_PTSCOTCH@) +- include("${CMAKE_CURRENT_LIST_DIR}/ptscotchparmetisTargets.cmake") +- endif() +-endif() -- 2.49.0 From debbugs-submit-bounces@debbugs.gnu.org Thu Apr 24 10:37:40 2025 Received: (at 77991) by debbugs.gnu.org; 24 Apr 2025 14:37:40 +0000 Received: from localhost ([127.0.0.1]:39924 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1u7xhs-0002PM-4R for submit@debbugs.gnu.org; Thu, 24 Apr 2025 10:37:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39776) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1u7xhl-0002Nx-Pb for 77991@debbugs.gnu.org; Thu, 24 Apr 2025 10:37:35 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1u7xhg-0003ln-DS; Thu, 24 Apr 2025 10:37:28 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=a0p9nZZmOMSztECXb0/iVSxX2W/t941RFDIRcGfP2wQ=; b=P41ypoBG592Z3D7dyYsX 5cSfOYWYePwimRF6pBzmoEevBuYCqzpVrEMSMr08S2jARID49TgOOEXExag+fk7wPgzCucLDpDB1o j6IBJBCrVxIUZ+skELBa5ORAUTU2c3VaXcMWDbvZi2H84LVkv7h7mgGs6NbLwnhukmazR+RbbeoPL YS/lJK4znn0Qu/8t2tYqR5HmUFwvW4tTWpw+/lNpe5TM4/iOX64ZeYII8bGGoKuea8KILQbIQG4lm amHwTe8aUaEQRNFwBk6sVFqiE27JxKsbJNHe+Aj/Iegd7xpt4CB9rK1Oy7fbThWzBxYs/xKvKtgCl YY5bLopup0suOw==; From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= To: 77991@debbugs.gnu.org Subject: [PATCH v2 3/4] gnu: scotch, scotch32, pt-scotch, pt-scotch32: Use gexps. Date: Thu, 24 Apr 2025 16:36:56 +0200 Message-ID: <8183442a110262953babb735450d10e630d87a24.1745505295.git.ludo@gnu.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Andreas Enge , Eric Bavier , Sharlatan Hellseher Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 77991 Cc: =?UTF-8?q?Ludovic=20Court=C3=A8s?= X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/packages/maths.scm (scotch, scotch32) (pt-scotch, pt-scotch32): Use gexps. Change-Id: I93febc994c5345e133eddbd016b1974d08df5bdf --- gnu/packages/maths.scm | 60 ++++++++++++++++++++---------------------- 1 file changed, 29 insertions(+), 31 deletions(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 33eb4cda7b..47dc63bcec 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -5215,24 +5215,25 @@ (define-public scotch (list flex bison gfortran)) (outputs '("out" "metis")) (arguments - `(#:configure-flags '("-DBUILD_SHARED_LIBS=YES" "-DINTSIZE=64" - "-DBUILD_PTSCOTCH=OFF") - #:phases - (modify-phases %standard-phases - (add-after 'install 'install-metis - (lambda* (#:key outputs #:allow-other-keys) - ;; Move the METIS compatibility library to a separate output to - ;; avoid a name clash on . - (let* ((out (assoc-ref outputs "out")) - (metis (assoc-ref outputs "metis")) - (prefix (string-length out))) - (for-each (lambda (file) - (let ((target (string-append - metis - (string-drop file prefix)))) - (mkdir-p (dirname target)) - (rename-file file target))) - (find-files out "metis")))))))) + (list #:configure-flags #~'("-DBUILD_SHARED_LIBS=YES" "-DINTSIZE=64" + "-DBUILD_PTSCOTCH=OFF") + #:phases + #~(modify-phases %standard-phases + (add-after 'install 'install-metis + (lambda* (#:key outputs #:allow-other-keys) + ;; Move the METIS compatibility library to a separate output to + ;; avoid a name clash on . + (let* ((out (assoc-ref outputs "out")) + (metis (assoc-ref outputs "metis")) + (prefix (string-length out))) + (for-each (lambda (file) + (let ((target + (string-append metis + (string-drop file + prefix)))) + (mkdir-p (dirname target)) + (rename-file file target))) + (find-files out "metis")))))))) (home-page "https://www.labri.fr/perso/pelegrin/scotch/") (properties `((release-monitoring-url @@ -5256,9 +5257,8 @@ (define-public scotch32 (name "scotch32") (arguments (substitute-keyword-arguments (package-arguments scotch) - ((#:configure-flags flags ''()) - ''("-DBUILD_SHARED_LIBS=YES" "-DBUILD_PTSCOTCH=OFF" - "-DINTSIZE=32")))) + ((#:configure-flags flags #~'()) + #~'("-DBUILD_SHARED_LIBS=YES" "-DBUILD_PTSCOTCH=OFF" "-DINTSIZE=32")))) (synopsis "Programs and libraries for graph algorithms (32-bit integers)"))) @@ -5270,13 +5270,12 @@ (define-public pt-scotch (list openmpi)) ;headers include MPI headers (arguments (substitute-keyword-arguments (package-arguments scotch) - ((#:configure-flags flags ''()) - ''("-DBUILD_SHARED_LIBS=YES" "-DBUILD_PTSCOTCH=ON" - "-DINTSIZE=64")) - ((#:phases phases '%standard-phases) - `(modify-phases ,phases - (add-before 'check 'mpi-setup - ,%openmpi-setup))))) + ((#:configure-flags flags #~'()) + #~'("-DBUILD_SHARED_LIBS=YES" "-DBUILD_PTSCOTCH=ON" "-DINTSIZE=64")) + ((#:phases phases #~%standard-phases) + #~(modify-phases #$phases + (add-before 'check 'mpi-setup + #$%openmpi-setup))))) (synopsis "Programs and libraries for graph algorithms (with MPI)"))) (define-public pt-scotch32 @@ -5287,9 +5286,8 @@ (define-public pt-scotch32 (list openmpi)) ;headers include MPI headers (arguments (substitute-keyword-arguments (package-arguments pt-scotch) - ((#:configure-flags flags ''()) - ''("-DBUILD_SHARED_LIBS=YES" "-DBUILD_PTSCOTCH=ON" - "-DINTSIZE=32")))) + ((#:configure-flags flags #~'()) + #~'("-DBUILD_SHARED_LIBS=YES" "-DBUILD_PTSCOTCH=ON" "-DINTSIZE=32")))) (synopsis "Programs and libraries for graph algorithms (with MPI and 32-bit integers)"))) -- 2.49.0 From debbugs-submit-bounces@debbugs.gnu.org Thu Apr 24 10:37:41 2025 Received: (at 77991) by debbugs.gnu.org; 24 Apr 2025 14:37:41 +0000 Received: from localhost ([127.0.0.1]:39926 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1u7xhs-0002PV-MB for submit@debbugs.gnu.org; Thu, 24 Apr 2025 10:37:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39786) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1u7xhm-0002Nz-O0 for 77991@debbugs.gnu.org; Thu, 24 Apr 2025 10:37:37 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1u7xhh-0003lu-Dl; Thu, 24 Apr 2025 10:37:29 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=2s2sgqw6fSsT+wuNZEwBYpCE4fma/rG/YfrnI/7v4l0=; b=QgaNtI9SPnLwJtnudUoB BmMWBIhxkjyg9f12ksQ0BW7HeQJ7zLttSrbNIBTLvyOPpbMZYN1guqn/vgWReyd/LfvcN0ZEoYMlH HvIqAbn1hEUn3MP8QRpo5l7oqvKDOKS9tc9ZDqeZL9nXm6TEk9S0C9PCj/EAFRlzzeaOcE8PdSCbI wZl3m7Ax4UDPSI1QUBoEa0IgrOQX02GAfBMu5uVOrU6ylmMF7+e4sc6MF02XChR7QbDh7C9Z2+EAV e+dUt8JgV0VexF25jof7UguGM7N/uEl3ntuj+xxxUAnubmUzmiBWQ2U4bBi8zMSr3Z0mrU8lcADuu vZtBDcywDYoKjA==; From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= To: 77991@debbugs.gnu.org Subject: [PATCH v2 4/4] gnu: scotch: Update to 7.0.7. Date: Thu, 24 Apr 2025 16:36:57 +0200 Message-ID: <18bdde5cdf6b3b82a4cd637dd422c0b72e532d93.1745505295.git.ludo@gnu.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Andreas Enge , Eric Bavier , Sharlatan Hellseher Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 77991 Cc: =?UTF-8?q?Ludovic=20Court=C3=A8s?= X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) From: Ludovic Courtès * gnu/packages/maths.scm (scotch): Update to 7.0.7. Change-Id: Idef8e0956d9da1aef13fb423c53db60b6a61b04b --- gnu/packages/maths.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 47dc63bcec..ee6b64350c 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -5190,7 +5190,7 @@ (define-public superlu-dist (define-public scotch (package (name "scotch") - (version "7.0.4") + (version "7.0.7") (source (origin (method git-fetch) @@ -5199,7 +5199,7 @@ (define-public scotch (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0rbc51albpd2923dkirpkj8rfkic6rsvwqqnv1mmsk391zhk3amr")) + (base32 "0r46bmnz9xjlgcb3vvlx3sg2qh4gfgga89vs4vlbzz3s4lj48g46")) (patches (search-patches "scotch-cmake-remove-metis.patch")) (modules '((guix build utils))) (snippet -- 2.49.0 From debbugs-submit-bounces@debbugs.gnu.org Sun Apr 27 08:07:07 2025 Received: (at 77991) by debbugs.gnu.org; 27 Apr 2025 12:07:07 +0000 Received: from localhost ([127.0.0.1]:39967 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1u90mo-0008Dt-I7 for submit@debbugs.gnu.org; Sun, 27 Apr 2025 08:07:06 -0400 Received: from mira.cbaines.net ([2a01:7e00:e000:2f8:fd4d:b5c7:13fb:3d27]:54443) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1u90ml-0008Da-8D for 77991@debbugs.gnu.org; Sun, 27 Apr 2025 08:07:04 -0400 Received: from localhost (unknown [IPv6:2a02:6b67:e390:8b00::1ce5]) by mira.cbaines.net (Postfix) with ESMTPSA id 0E10F27BC49; Sun, 27 Apr 2025 13:07:02 +0100 (BST) Received: from fang (localhost [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id 9533c8a8; Sun, 27 Apr 2025 12:07:01 +0000 (UTC) From: Christopher Baines To: Ludovic =?utf-8?Q?Court=C3=A8s?= Subject: Re: [bug#77991] [PATCH v2 0/4] Upgrade Scotch to 7.0.7 In-Reply-To: ("Ludovic =?utf-8?Q?Court?= =?utf-8?Q?=C3=A8s=22's?= message of "Thu, 24 Apr 2025 16:36:53 +0200") References: User-Agent: mu4e 1.12.9; emacs 29.4 Date: Sun, 27 Apr 2025 13:07:01 +0100 Message-ID: <87msc1g656.fsf@cbaines.net> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 77991 Cc: 77991@debbugs.gnu.org, Sharlatan Hellseher , Andreas Enge , Eric Bavier X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Ludovic Court=C3=A8s writes: > As colleagues found out, the commit that was meant to fix 'SCOTCHConfig.c= make' > was ineffective: the *metisTargets.cmake file were indeed found, but then > lib*scotchmetis.so would not be found, causing 'cmake' to fail. > > This version fixes that. I tested again all the dependents. > > Ludo'. > > Ludovic Court=C3=A8s (4): > gnu: scotch: Remove =E2=80=9C-shared=E2=80=9D deprecated aliases. > gnu: scotch: Remove CMake machinery for the Metis compatibility layer. > gnu: scotch, scotch32, pt-scotch, pt-scotch32: Use gexps. > gnu: scotch: Update to 7.0.7. > > gnu/local.mk | 1 + > gnu/packages/maths.scm | 74 ++++++++----------- > .../patches/scotch-cmake-remove-metis.patch | 24 ++++++ > 3 files changed, 57 insertions(+), 42 deletions(-) > create mode 100644 gnu/packages/patches/scotch-cmake-remove-metis.patch > > > base-commit: 9f4bdb270e178eac636df3f4bbffbe4aa3b90a67 Apart from some patch file name lint warnings (which may be not actionable) QA hasn't found any issues and this all sounds good to me. --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQKlBAEBCgCPFiEEPonu50WOcg2XVOCyXiijOwuE9XcFAmgOHeVfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNF ODlFRUU3NDU4RTcyMEQ5NzU0RTBCMjVFMjhBMzNCMEI4NEY1NzcRHG1haWxAY2Jh aW5lcy5uZXQACgkQXiijOwuE9XceYw//TWg5CTAsntsI9/e85ww7EGBI0zr73izT FF2iEQ211Xsp9bfg8ZFdMutihrmKEzoQNxIHqYWA8PS49f+opDZYT71ALqpU91ro VVhoM3pHQsJz64TGW7z8iEIdwBbG9Pr3QUqoZ8lN7bdhmYWBfaceqCCC0U0Puvh6 hpZPuCERXuqwfTUwdvMYh5yVd+olO1ZLi1784Q0FNe7K+7kucwyF6RMvNqH3IOnK 89tGGxURKDNeA+NODVp/jGwurIkuT2iz6DY3q8jNb3asCmx+ozPYiebB+Fv1O7Uj ZphwlkhX+VuOA8ThLM4oCEttLmfbuqnPxrjprzWRg2EtsB44Ckzm09aHbqSFCYtr XTnHe79pIkBPulplUVG16yueZK80X/gN3eoqiBqr8xekKDZxJwahGC082lBG+V01 9qc+urR1XrwUXGIt3RnStbOo/BDACxAQO37N4fo8lCI31N0P0EXqkJbiFE+/Df0+ AX9Kgqj4xkt44LXZUh0UjGLeX5TaBEtshLrcE4brMdKUcmlg9Hyl5/coUa4p6d1y k+WxzPehm9BjySHe5DSddPfTyVfUgNfaWglWHSiKns5QeVUCpfsZ/xLrsRYXAPmP uePDXM4V50kOtLWD6i9aJvO549MzeTkvaw4aw2Kw0I43WZttH1DyFNVlLpeVN2za MgTl/LiYC78= =WxnV -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Tue Apr 29 13:17:24 2025 Received: (at 77991-done) by debbugs.gnu.org; 29 Apr 2025 17:17:25 +0000 Received: from localhost ([127.0.0.1]:60022 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1u9oaA-0005cy-Tz for submit@debbugs.gnu.org; Tue, 29 Apr 2025 13:17:24 -0400 Received: from hera.aquilenet.fr ([185.233.100.1]:43220) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1u9oZs-0005Zx-Lh for 77991-done@debbugs.gnu.org; Tue, 29 Apr 2025 13:17:05 -0400 Received: from localhost (localhost [127.0.0.1]) by hera.aquilenet.fr (Postfix) with ESMTP id AAD59308; Tue, 29 Apr 2025 19:16:58 +0200 (CEST) Authentication-Results: hera.aquilenet.fr; none X-Virus-Scanned: Debian amavis at hera.aquilenet.fr Received: from hera.aquilenet.fr ([127.0.0.1]) by localhost (hera.aquilenet.fr [127.0.0.1]) (amavis, port 10024) with ESMTP id iBk9CDp4WW3K; Tue, 29 Apr 2025 19:16:58 +0200 (CEST) Received: from jurong (176-179-191-150.abo.bbox.fr [176.179.191.150]) by hera.aquilenet.fr (Postfix) with ESMTPSA id 785241D0; Tue, 29 Apr 2025 19:16:56 +0200 (CEST) Date: Tue, 29 Apr 2025 19:16:54 +0200 From: Andreas Enge To: Christopher Baines Subject: Re: [bug#77991] [PATCH v2 0/4] Upgrade Scotch to 7.0.7 Message-ID: References: <87msc1g656.fsf@cbaines.net> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <87msc1g656.fsf@cbaines.net> X-Rspamd-Queue-Id: AAD59308 X-Spamd-Result: default: False [-5.57 / 15.00]; NEURAL_HAM(-3.00)[-1.000]; BAYES_HAM(-2.97)[99.85%]; MID_RHS_NOT_FQDN(0.50)[]; MIME_GOOD(-0.10)[text/plain]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; RCVD_TLS_ALL(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; ARC_NA(0.00)[]; RCPT_COUNT_FIVE(0.00)[5]; FREEMAIL_ENVRCPT(0.00)[gmail.com]; RCVD_VIA_SMTP_AUTH(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; FREEMAIL_CC(0.00)[gnu.org,debbugs.gnu.org,gmail.com,posteo.net] X-Rspamd-Action: no action X-Spamd-Bar: ----- X-Rspamd-Server: hera X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 77991-done Cc: Ludovic =?iso-8859-15?Q?Court=E8s?= , Sharlatan Hellseher , 77991-done@debbugs.gnu.org, Eric Bavier X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hello Ludovic, to get rid of this package from my inbox, I pushed the commits on your behalf. QA has forgotten about them, but interestingly, it must have built the packages, since they are simply downloaded as substitutes. Thanks, Andreas From unknown Fri Aug 15 04:02:42 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Wed, 28 May 2025 11:24:34 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator