From patchwork Mon Mar 20 22:09:55 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: 48455 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 7D71616F2D; Mon, 20 Mar 2023 22:11:45 +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 4715A16F13 for ; Mon, 20 Mar 2023 22:11:41 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1peNia-00030s-Jo; Mon, 20 Mar 2023 18:11: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 1peNiY-00030Z-Vr for guix-patches@gnu.org; Mon, 20 Mar 2023 18:11: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 1peNiY-0002Y2-BJ for guix-patches@gnu.org; Mon, 20 Mar 2023 18:11:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1peNiY-0007Hq-4W for guix-patches@gnu.org; Mon, 20 Mar 2023 18:11:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62183] [PATCH v2 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: Mon, 20 Mar 2023 22:11: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.167935023827967 (code B ref 62183); Mon, 20 Mar 2023 22:11:02 +0000 Received: (at 62183) by debbugs.gnu.org; 20 Mar 2023 22:10:38 +0000 Received: from localhost ([127.0.0.1]:56969 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1peNiA-0007H1-1g for submit@debbugs.gnu.org; Mon, 20 Mar 2023 18:10:38 -0400 Received: from eggs.gnu.org ([209.51.188.92]:39906) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1peNi8-0007Gh-33 for 62183@debbugs.gnu.org; Mon, 20 Mar 2023 18:10:36 -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 1peNi2-0002Tu-05; Mon, 20 Mar 2023 18:10:30 -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=J4x6YnOd+9CM5KWF6uyfsTLH3mRZM8P/bIEdsOwMaPM=; b=JEjhbjetr+WbVz JG/0Swd/k8wvf2y66/zoYMOzf87wUDKSLeKXtDa/+JNf+EDfhA9/vVhyDQCWYRCBKcGJEp/CjwgvI 9EmZmGIbHcdWubpTjeS8rCsDhoJv6L/g41Mt3+GJq9KrmieUIts5A17Xjbu+1NnilzbBXEYm9fwLn Glp7+MMjOujVriDgm+q8m4OiPlN/Gpa7gzGHqX3RRxML0mnl0MyyQ0767Dpk7OvB4Atu8buYInJQU YJ8gIsIY0cax/Hv2vOUUSljpLZK+NfqOWBoCOnEPHbOY2K4j6+n8KLSte6QAYMpKso3qAsnpPEXgi n1UIurWOLa/2bv7t/+xA==; Received: from 91-160-117-201.subs.proxad.net ([91.160.117.201] 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 1peNhz-0005Rn-2I; Mon, 20 Mar 2023 18:10:29 -0400 From: Ludovic =?utf-8?q?Court=C3=A8s?= Date: Mon, 20 Mar 2023 23:09:55 +0100 Message-Id: <20230320220956.13920-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 OPENMPI. [propagated-inputs]: Add TBB. --- gnu/packages/image-processing.scm | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) Change since v1: TBB is now propagated, fixing builds of mia and f3d. Ludo'. base-commit: 99114eb63895712d2d3e62c5a83e3a1540438f15 diff --git a/gnu/packages/image-processing.scm b/gnu/packages/image-processing.scm index 0562376291..c8786d8edd 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,17 +406,20 @@ (define-public vtk mesa netcdf libpng + libtiff + openmpi proj-7 python ;("pugixml" ,pugixml) sqlite - libtiff xorgproto zlib)) (propagated-inputs ;; VTK's 'VTK-vtk-module-find-packages.cmake' calls - ;; 'find_package(THEORA)', which in turns looks for libogg. - (list libogg)) + ;; 'find_package(THEORA)', which in turns looks for libogg. Likewise for + ;; TBB. + (list libogg + tbb)) (home-page "https://vtk.org/") (synopsis "Libraries for 3D computer graphics") (description