[bug#28673] [PATCH 6/6] gnu: Add scorep-openmpi.

[Ludovic Courtès]

Dave Love <address@hidden> skribis:

> * gnu/packages/profiling.scm (make-scorep): New function.
> (scorep-openmpi): New variable.

Applied with these changes, thanks!

Ludo’.

diff --git a/gnu/packages/profiling.scm b/gnu/packages/profiling.scm
index ab5381d75..4fdf260c6 100644
--- a/gnu/packages/profiling.scm
+++ b/gnu/packages/profiling.scm
@@ -339,16 +339,19 @@ different kinds of performance behavior.")
   (package
     (name (string-append "scorep-" (package-name mpi)))
     (version "3.1")
-    (source
-     (origin
-      (method url-fetch)
-      (uri (let* ((parts (string-split version #\.) )
-                  (major (car parts))
-                  (minor (cadr parts)))
-             (string-append
-              "http://www.vi-hps.org/upload/packages/scorep/scorep-";
-              version ".tar.gz")))
-      (sha256 (base32 
"0h45357djna4dn9jyxx0n36fhhms3jrf22988m9agz1aw2jfivs9"))))
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                    "http://www.vi-hps.org/upload/packages/scorep/scorep-";
+                    version ".tar.gz"))
+              (sha256
+               (base32
+                "0h45357djna4dn9jyxx0n36fhhms3jrf22988m9agz1aw2jfivs9"))
+              (modules '((guix build utils)))
+              (snippet
+               ;; Remove bundled software.
+               '(for-each delete-file-recursively
+                          '("vendor/opari2" "vendor/cube")))))
     (build-system gnu-build-system)
     (inputs
      `(("mpi" ,mpi)
@@ -356,44 +359,41 @@ different kinds of performance behavior.")
        ("opari2" ,opari2)
        ("libunwind" ,libunwind)
        ("otf2" ,otf2)
-       ("cube" ,cube)                   ;for cube-config, as above
-       ("cubelib" ,cube "lib")          ;for lib, include
+       ("cubelib" ,cube "lib")                    ;for lib, include
        ("openmpi" ,openmpi)
+       ("zlib" ,zlib)))
+    (native-inputs
+     `(("gfortran" ,gfortran)
+       ("flex" ,flex)
+       ("cube" ,cube)                             ;for cube-config
+       ("bison" ,bison)
+       ("python" ,python)
        ("doxygen" ,doxygen)
-       ("zlib" ,zlib)
        ("which" ,which)))
-    (native-inputs `(("gfortran" ,gfortran)
-                     ("flex" ,flex)
-                     ("bison" ,bison)
-                     ("python" ,python)))
     (arguments
      `(#:configure-flags
        (list "--enable-shared" "--disable-static"
-             (string-append "--with-opari2=" (assoc-ref %build-inputs 
"opari2"))
-             (string-append "--with-cube=" (assoc-ref %build-inputs "cube")))
+             (string-append "--with-opari2="
+                            (assoc-ref %build-inputs "opari2"))
+             (string-append "--with-cube="
+                            (assoc-ref %build-inputs "cube")))
        #:parallel-tests? #f
        #:make-flags '("V=1")
        #:phases
        (modify-phases %standard-phases
-         (add-after 'unpack 'clean-source
-           (lambda _
-             (map delete-file-recursively '("vendor/opari2" "vendor/cube"))))
          (add-after 'install 'licence
-           (lambda _
-             (let ((doc (string-append (assoc-ref %outputs "out") 
"/share/doc")))
-               (mkdir-p doc)
+           (lambda* (#:key outputs #:allow-other-keys)
+             (let ((doc (string-append (assoc-ref outputs "out")
+                                       "/share/doc/scorep")))
                (install-file "COPYING" doc)
                #t))))))
     (home-page "http://www.vi-hps.org/projects/score-p/";)
-    (synopsis
-     (format #f "\
-Scalable Performance Measurement Infrastructure for Parallel Codes, ~a version"
-             (package-name mpi)))
-    (description (format #f "The Score-P (Scalable Performance Measurement 
Infrastructure for Parallel
-Codes) measurement infrastructure is a highly scalable and easy-to-use tool
-suite for profiling, event trace recording, and online analysis of HPC
-applications.
-This is the ~a version." (package-name mpi)))
+    (synopsis "Performance measurement infrastructure for parallel code")
+    (description
+     "The Score-P (Scalable Performance Measurement Infrastructure for
+Parallel Codes) measurement infrastructure is a scalable and easy-to-use tool
+suite for profiling, event trace recording, and online analysis of
+high-performance computing (HPC) applications.")
     (license license:cpl1.0)))
 
 (define-public scorep-openmpi (make-scorep openmpi))