From patchwork Tue Mar 14 11:06:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Ludovic_Court=C3=A8s?= X-Patchwork-Id: 47963 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 7BD8C1695F; Tue, 14 Mar 2023 11:07:09 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 00A0416606 for ; Tue, 14 Mar 2023 11:07:08 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pc2Ui-0004zX-AG; Tue, 14 Mar 2023 07:07:04 -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 1pc2Uh-0004x1-0x for guix-patches@gnu.org; Tue, 14 Mar 2023 07:07:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pc2Ug-0005qh-Nt for guix-patches@gnu.org; Tue, 14 Mar 2023 07:07:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pc2Ug-0006Zq-HT for guix-patches@gnu.org; Tue, 14 Mar 2023 07:07:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62183] [PATCH 1/2] gnu: vtk: Enable OpenMP, TBB, and =?utf-8?b?T3BlbsKgTVBJ?= support. References: <20230314110422.8667-1-ludo@gnu.org> In-Reply-To: <20230314110422.8667-1-ludo@gnu.org> Resent-From: Ludovic =?utf-8?q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 14 Mar 2023 11:07:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 62183 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 62183@debbugs.gnu.org Cc: Ludovic =?utf-8?q?Court=C3=A8s?= Received: via spool by 62183-submit@debbugs.gnu.org id=B62183.167879201625263 (code B ref 62183); Tue, 14 Mar 2023 11:07:02 +0000 Received: (at 62183) by debbugs.gnu.org; 14 Mar 2023 11:06:56 +0000 Received: from localhost ([127.0.0.1]:36464 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pc2UZ-0006ZP-UP for submit@debbugs.gnu.org; Tue, 14 Mar 2023 07:06:56 -0400 Received: from eggs.gnu.org ([209.51.188.92]:49530) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pc2UX-0006Z6-Q6 for 62183@debbugs.gnu.org; Tue, 14 Mar 2023 07:06:54 -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 1pc2UR-0005j2-IC; Tue, 14 Mar 2023 07:06:47 -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=F5zDVfAUXKNlx5rNJJe4QwEMCiIJYP4LL54yyNENvPM=; b=QkD2rPAhctowbt DC9HmT7iYueeSMc0cho/q7jOZBtAmCXoGkiDT57FbVRRPgEBF7h5u3TNiNvgHENOlxsCjeygdVCIt nNcG+G+hfKAfanLv12jBUFwFkA4vHH3EIi0fDTvTkZGyT9V5aItZ8z8ikL8xfVmnIwA2MTDSH49hE 7BgNTcGQ3+9H6T4SDnkvb77Mi4mBOlZTWypAYJLSUATQSVHNYQ/jTJN/sMSHAoPDPQA3TXruviwj/ 4F1l9LH8QX5bYIvagViikWbjF/7GB+6knLYYUivAgrAUZRQSeu6m2xI+QuGDlAf5EWQNtd0A1aZQS /+R3s1M/Mrt+K7ddi5PQ==; Received: from [2001:660:6102:320:e120:2c8f:8909:cdfe] (helo=gnu.org) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pc2UQ-0003xH-Sv; Tue, 14 Mar 2023 07:06:47 -0400 From: Ludovic =?utf-8?q?Court=C3=A8s?= Date: Tue, 14 Mar 2023 12:06:32 +0100 Message-Id: <20230314110633.8729-1-ludo@gnu.org> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches From: Ludovic Courtès * gnu/packages/image-processing.scm (vtk)[arguments]: Pass options to enable OpenMP, TBB, and MPI. [inputs]: Add TBB and OPENMPI. --- gnu/packages/image-processing.scm | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/gnu/packages/image-processing.scm b/gnu/packages/image-processing.scm index 6f51499142..a612544232 100644 --- a/gnu/packages/image-processing.scm +++ b/gnu/packages/image-processing.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2017 John Darrington ;;; Copyright © 2017, 2019, 2022 Ricardo Wurmus -;;; Copyright © 2014, 2021-2022 Ludovic Courtès +;;; Copyright © 2014, 2021-2023 Ludovic Courtès ;;; Copyright © 2014 Mark H Weaver ;;; Copyright © 2016 Eric Bavier ;;; Copyright © 2018–2021 Tobias Geerinckx-Rice @@ -380,6 +380,10 @@ (define-public vtk "-DVTK_MODULE_ENABLE_VTK_RenderingExternal=YES" ; For F3D "-DVTK_WRAP_PYTHON=ON" "-DVTK_PYTHON_VERSION:STRING=3" + + "-DVTK_SMP_ENABLE_OPENNMP=ON" + "-DVTK_SMP_ENABLE_TBB=ON" + "-DVTK_USE_MPI=ON" ) #:tests? #f)) ;XXX: test data not included (inputs @@ -402,11 +406,13 @@ (define-public vtk mesa netcdf libpng + libtiff + openmpi proj-7 python ;("pugixml" ,pugixml) sqlite - libtiff + tbb xorgproto zlib)) (propagated-inputs From patchwork Tue Mar 14 11:06:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Ludovic_Court=C3=A8s?= X-Patchwork-Id: 47964 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id F0E6316961; Tue, 14 Mar 2023 11:07:27 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 864911693E for ; Tue, 14 Mar 2023 11:07:26 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pc2Ui-0004zg-NO; Tue, 14 Mar 2023 07:07:04 -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 1pc2Uh-0004xv-9v for guix-patches@gnu.org; Tue, 14 Mar 2023 07:07:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pc2Uh-0005qr-1B for guix-patches@gnu.org; Tue, 14 Mar 2023 07:07:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pc2Ug-0006Zx-So for guix-patches@gnu.org; Tue, 14 Mar 2023 07:07:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62183] [PATCH 2/2] gnu: vtk: Remove reference to GCC. Resent-From: Ludovic =?utf-8?q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 14 Mar 2023 11:07:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 62183 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 62183@debbugs.gnu.org Cc: Ludovic =?utf-8?q?Court=C3=A8s?= Received: via spool by 62183-submit@debbugs.gnu.org id=B62183.167879201725271 (code B ref 62183); Tue, 14 Mar 2023 11:07:02 +0000 Received: (at 62183) by debbugs.gnu.org; 14 Mar 2023 11:06:57 +0000 Received: from localhost ([127.0.0.1]:36466 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pc2Ua-0006ZV-CP for submit@debbugs.gnu.org; Tue, 14 Mar 2023 07:06:56 -0400 Received: from eggs.gnu.org ([209.51.188.92]:49538) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pc2UY-0006Z7-2h for 62183@debbugs.gnu.org; Tue, 14 Mar 2023 07:06:54 -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 1pc2US-0005kK-8G; Tue, 14 Mar 2023 07:06:48 -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=DNZUG+O3bSErmOIQjO3j/lzJfw9VNPDzVHqDOA4U35A=; b=m38HUrsRKdGh5EK2W7jP cDi7gbZCpBE4+W6BoY3tNMJW1+fgQKfXnB+4UMIsPzM8kB3vS031yUEwD19q+Skhc8bU9tdB2WXXW hfG63MyC7VPvkxXb2PjpA7VtyyvGJUBkv5Svf7SY1+4O8rzXJMJ/eXIcnn8IEzrkqYLblWlbeNmol Av2RgLBT2uF85XMWhELy1jPe34cGXvnM5EmkSxPpZTRMa18si6HyATXmKHWI9XoBjKFFq/54k+i7P C+3VYgMnQIVke+S5XTcukB7dI/vrtuqgUtWBNuC/Q0XxoDzl7xAsYaW2DRQl7ONyRqzV0ml/Bu12a wOTJX9UAELtM6w==; Received: from [2001:660:6102:320:e120:2c8f:8909:cdfe] (helo=gnu.org) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pc2UR-0003xH-OR; Tue, 14 Mar 2023 07:06:47 -0400 From: Ludovic =?utf-8?q?Court=C3=A8s?= Date: Tue, 14 Mar 2023 12:06:33 +0100 Message-Id: <20230314110633.8729-2-ludo@gnu.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230314110633.8729-1-ludo@gnu.org> References: <20230314110633.8729-1-ludo@gnu.org> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches From: Ludovic Courtès This removes GCC from the closure of VTK, reducing its size by 200 MiB (17%). * gnu/packages/image-processing.scm (vtk)[arguments]: Change to gexps. Add #:phases. (vtk-7)[arguments]: Turn #:configure-flags into a gexp. --- gnu/packages/image-processing.scm | 87 +++++++++++++++++++------------ 1 file changed, 53 insertions(+), 34 deletions(-) diff --git a/gnu/packages/image-processing.scm b/gnu/packages/image-processing.scm index a612544232..5c3560174c 100644 --- a/gnu/packages/image-processing.scm +++ b/gnu/packages/image-processing.scm @@ -352,40 +352,59 @@ (define-public vtk (properties `((release-monitoring-url . "https://vtk.org/download/"))) (build-system cmake-build-system) (arguments - '(#:build-type "Release" ;Build without '-g' to save space. - #:configure-flags '(;"-DBUILD_TESTING:BOOL=TRUE" - ; ; not honored - "-DVTK_USE_EXTERNAL=OFF" ;; default - "-DVTK_MODULE_USE_EXTERNAL_VTK_doubleconversion=ON" - "-DVTK_MODULE_USE_EXTERNAL_VTK_eigen=ON" - "-DVTK_MODULE_USE_EXTERNAL_VTK_expat=ON" - "-DVTK_MODULE_USE_EXTERNAL_VTK_freetype=ON" - "-DVTK_MODULE_USE_EXTERNAL_VTK_gl2ps=ON" - "-DVTK_MODULE_USE_EXTERNAL_VTK_glew=ON" - "-DVTK_MODULE_USE_EXTERNAL_VTK_hdf5=ON" - "-DVTK_MODULE_USE_EXTERNAL_VTK_jpeg=ON" - "-DVTK_MODULE_USE_EXTERNAL_VTK_jsoncpp=ON" - "-DVTK_MODULE_USE_EXTERNAL_VTK_libharu=ON" - "-DVTK_MODULE_USE_EXTERNAL_VTK_libproj=ON" - "-DVTK_MODULE_USE_EXTERNAL_VTK_libxml2=ON" - "-DVTK_MODULE_USE_EXTERNAL_VTK_lz4=ON" - "-DVTK_MODULE_USE_EXTERNAL_VTK_netcdf=ON" - "-DVTK_MODULE_USE_EXTERNAL_VTK_ogg=ON" - "-DVTK_MODULE_USE_EXTERNAL_VTK_png=ON" - ;"-DVTK_MODULE_USE_EXTERNAL_VTK_pugixml=ON" ; breaks IO/CityGML - "-DVTK_MODULE_USE_EXTERNAL_VTK_sqlite=ON" - "-DVTK_MODULE_USE_EXTERNAL_VTK_theora=ON" - "-DVTK_MODULE_USE_EXTERNAL_VTK_tiff=ON" - "-DVTK_MODULE_USE_EXTERNAL_VTK_zlib=ON" - "-DVTK_MODULE_ENABLE_VTK_RenderingExternal=YES" ; For F3D - "-DVTK_WRAP_PYTHON=ON" - "-DVTK_PYTHON_VERSION:STRING=3" + (list #:build-type "Release" ;Build without '-g' to save space. + #:configure-flags + #~'( ;;"-DBUILD_TESTING:BOOL=TRUE" ;not honored + "-DVTK_USE_EXTERNAL=OFF" ;default + "-DVTK_MODULE_USE_EXTERNAL_VTK_doubleconversion=ON" + "-DVTK_MODULE_USE_EXTERNAL_VTK_eigen=ON" + "-DVTK_MODULE_USE_EXTERNAL_VTK_expat=ON" + "-DVTK_MODULE_USE_EXTERNAL_VTK_freetype=ON" + "-DVTK_MODULE_USE_EXTERNAL_VTK_gl2ps=ON" + "-DVTK_MODULE_USE_EXTERNAL_VTK_glew=ON" + "-DVTK_MODULE_USE_EXTERNAL_VTK_hdf5=ON" + "-DVTK_MODULE_USE_EXTERNAL_VTK_jpeg=ON" + "-DVTK_MODULE_USE_EXTERNAL_VTK_jsoncpp=ON" + "-DVTK_MODULE_USE_EXTERNAL_VTK_libharu=ON" + "-DVTK_MODULE_USE_EXTERNAL_VTK_libproj=ON" + "-DVTK_MODULE_USE_EXTERNAL_VTK_libxml2=ON" + "-DVTK_MODULE_USE_EXTERNAL_VTK_lz4=ON" + "-DVTK_MODULE_USE_EXTERNAL_VTK_netcdf=ON" + "-DVTK_MODULE_USE_EXTERNAL_VTK_ogg=ON" + "-DVTK_MODULE_USE_EXTERNAL_VTK_png=ON" + ;;"-DVTK_MODULE_USE_EXTERNAL_VTK_pugixml=ON" ;breaks IO/CityGML + "-DVTK_MODULE_USE_EXTERNAL_VTK_sqlite=ON" + "-DVTK_MODULE_USE_EXTERNAL_VTK_theora=ON" + "-DVTK_MODULE_USE_EXTERNAL_VTK_tiff=ON" + "-DVTK_MODULE_USE_EXTERNAL_VTK_zlib=ON" + "-DVTK_MODULE_ENABLE_VTK_RenderingExternal=YES" ;for F3D + "-DVTK_WRAP_PYTHON=ON" + "-DVTK_PYTHON_VERSION:STRING=3" - "-DVTK_SMP_ENABLE_OPENNMP=ON" - "-DVTK_SMP_ENABLE_TBB=ON" - "-DVTK_USE_MPI=ON" - ) - #:tests? #f)) ;XXX: test data not included + "-DVTK_SMP_ENABLE_OPENNMP=ON" + "-DVTK_SMP_ENABLE_TBB=ON" + "-DVTK_USE_MPI=ON" + ) + + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'clear-reference-to-compiler + (lambda _ + (define (choose . files) + (let loop ((files files)) + (if (null? files) + #f + (if (file-exists? (car files)) + (car files) + (loop (cdr files)))))) + + ;; Do not retain a reference to GCC. + (substitute* (choose + "Common/Core/vtkConfigureDeprecated.h.in" ;v9.x + "Common/Core/vtkConfigure.h.in") ;v7.x + (("@CMAKE_CXX_COMPILER@") "c++"))))) + + #:tests? #f)) ;XXX: test data not included (inputs (list double-conversion eigen @@ -452,7 +471,7 @@ (define-public vtk-7 ((#:configure-flags flags) ;; Otherwise, the build would fail with: "error: invalid conversion ;; from ‘const char*’ to ‘char*’ [-fpermissive]". - `(cons "-DCMAKE_CXX_FLAGS=-fpermissive" ,flags)) + #~(cons "-DCMAKE_CXX_FLAGS=-fpermissive" #$flags)) ((#:phases phases) #~(modify-phases #$phases (add-after 'unpack 'remove-kernel-version