diff mbox series

[bug#62183,v2,1/2] gnu: vtk: Enable OpenMP, TBB, and Open MPI support.

Message ID 20230320220956.13920-1-ludo@gnu.org
State New
Headers show
Series [bug#62183,v2,1/2] gnu: vtk: Enable OpenMP, TBB, and Open MPI support. | expand

Commit Message

Ludovic Courtès March 20, 2023, 10:09 p.m. UTC 
From: Ludovic Courtès <ludovic.courtes@inria.fr>

* 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 mbox series

Patch

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 <jmd@gnu.org>
 ;;; Copyright © 2017, 2019, 2022 Ricardo Wurmus <rekado@elephly.net>
-;;; Copyright © 2014, 2021-2022 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2014, 2021-2023 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2014 Mark H Weaver <mhw@netris.org>
 ;;; Copyright © 2016 Eric Bavier <bavier@member.fsf.org>
 ;;; Copyright © 2018–2021 Tobias Geerinckx-Rice <me@tobias.gr>
@@ -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