* [bug#75284] [PATCH] gnu: Add netcdf-cxx4 and netcdf-cxx4-parallel-openmpi.
@ 2025-01-02 13:52 Lars Bilke
2025-01-03 7:21 ` [bug#75284] [PATCH v2] " Lars Bilke
0 siblings, 1 reply; 3+ messages in thread
From: Lars Bilke @ 2025-01-02 13:52 UTC (permalink / raw)
To: 75284; +Cc: Lars Bilke, Andreas Enge, Eric Bavier, Sharlatan Hellseher
* gnu/packages/maths.scm (netcdf-cxx4): New variable.
* gnu/packages/maths.scm (netcdf-cxx4-parallel-openmpi: New variable.
Change-Id: I9781aa31567b80e20c528abb5e9289bc625bb3eb
---
gnu/packages/maths.scm | 60 ++++++++++++++++++++++++++++++++++++++++++
1 file changed, 60 insertions(+)
diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index 22e2822c8c..71ea757e0e 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -2381,6 +2381,66 @@ (define-public netcdf-fortran
(home-page (package-home-page netcdf))
(license (package-license netcdf))))
+(define-public netcdf-cxx4
+ (package
+ (name "netcdf-cxx4")
+ (synopsis "NetCDF C++ interface")
+ (license license:bsd-3)
+ (description "C++ interface for NetCDF.")
+ (home-page "https://github.com/Unidata/netcdf-cxx4")
+ (version "4.3.1")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/Unidata/netcdf-cxx4")
+ (commit (string-append "v" version))))
+ (sha256
+ (base32 "05kydd5z9iil5iv4fp7l11cicda5n5lsg5sdmsmc55xpspnsg7hr"))))
+ (build-system cmake-build-system)
+ (inputs (list netcdf hdf5))
+ (arguments
+ `(#:phases (modify-phases %standard-phases
+ (add-before 'configure 'patch-configure
+ (lambda _
+ (substitute* "libnetcdf-cxx.settings.in"
+ ;; Don't record the build-time host, time and gcc path to make the
+ ;; settings file reproducible.
+ (("@CONFIG_DATE@")
+ "Not set (Guix build)")
+ (("@host_cpu@-@host_vendor@-@host_os@")
+ "Linux")
+ (("@CC_VERSION@")
+ "gcc"))
+ ;; The filter tests fail with 'Caught unexpected exception'.
+ (substitute* "cxx4/CMakeLists.txt"
+ (("add_bin_test\\(cxx4 test_filter\\)")
+ ""))
+ (substitute* "examples/CMakeLists.txt"
+ (("add_sh_test\\(examples tst_filter\\)")
+ ""))))
+ (add-after 'install 'clear-reference-to-compiler
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ ;; Do not retain a reference to GCC and other build only inputs.
+ (let ((out (assoc-ref outputs "out")))
+ (substitute* (string-append out "/bin/ncxx4-config")
+ (("cc=([[:graph:]]+)/bin/gcc")
+ "cc=\"gcc")
+ (("cxx=([[:graph:]]+)/bin/c\\+\\+")
+ "cxx=\"c++"))))))
+ #:configure-flags (list (string-append "-DHDF5_C_LIBRARY_hdf5="
+ (assoc-ref %build-inputs "hdf5")
+ "/lib/libhdf5.so"))))))
+
+(define-public netcdf-cxx4-parallel-openmpi
+ (package
+ (inherit netcdf-cxx4)
+ (name "netcdf-cxx4-parallel-openmpi")
+ (inputs (modify-inputs (package-inputs netcdf-cxx4)
+ (prepend openmpi)
+ (replace "hdf5" hdf5-parallel-openmpi)
+ (replace "netcdf" netcdf-parallel-openmpi)))))
+
(define-public n2p2
(package
(name "n2p2")
base-commit: ab43d883a0a88adbcfd3c3ab8d4c097cd9054b90
--
2.46.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [bug#75284] [PATCH v2] gnu: Add netcdf-cxx4 and netcdf-cxx4-parallel-openmpi.
2025-01-02 13:52 [bug#75284] [PATCH] gnu: Add netcdf-cxx4 and netcdf-cxx4-parallel-openmpi Lars Bilke
@ 2025-01-03 7:21 ` Lars Bilke
2025-01-19 23:11 ` bug#75284: " Ludovic Courtès
0 siblings, 1 reply; 3+ messages in thread
From: Lars Bilke @ 2025-01-03 7:21 UTC (permalink / raw)
To: 75284; +Cc: Lars Bilke, Andreas Enge, Eric Bavier, Sharlatan Hellseher
* gnu/packages/maths.scm (netcdf-cxx4): New variable.
* gnu/packages/maths.scm (netcdf-cxx4-parallel-openmpi: New variable.
Change-Id: I9781aa31567b80e20c528abb5e9289bc625bb3eb
---
gnu/packages/maths.scm | 60 ++++++++++++++++++++++++++++++++++++++++++
1 file changed, 60 insertions(+)
diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index 22e2822c8c..dee8c0636a 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -2381,6 +2381,66 @@ (define-public netcdf-fortran
(home-page (package-home-page netcdf))
(license (package-license netcdf))))
+(define-public netcdf-cxx4
+ (package
+ (name "netcdf-cxx4")
+ (version "4.3.1")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/Unidata/netcdf-cxx4")
+ (commit (string-append "v" version))))
+ (sha256
+ (base32 "05kydd5z9iil5iv4fp7l11cicda5n5lsg5sdmsmc55xpspnsg7hr"))))
+ (build-system cmake-build-system)
+ (arguments
+ `(#:phases (modify-phases %standard-phases
+ (add-before 'configure 'patch-configure
+ (lambda _
+ (substitute* "libnetcdf-cxx.settings.in"
+ ;; Don't record the build-time host, time and gcc path to make the
+ ;; settings file reproducible.
+ (("@CONFIG_DATE@")
+ "Not set (Guix build)")
+ (("@host_cpu@-@host_vendor@-@host_os@")
+ "Linux")
+ (("@CC_VERSION@")
+ "gcc"))
+ ;; The filter tests fail with 'Caught unexpected exception'.
+ (substitute* "cxx4/CMakeLists.txt"
+ (("add_bin_test\\(cxx4 test_filter\\)")
+ ""))
+ (substitute* "examples/CMakeLists.txt"
+ (("add_sh_test\\(examples tst_filter\\)")
+ ""))))
+ (add-after 'install 'clear-reference-to-compiler
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ ;; Do not retain a reference to GCC and other build only inputs.
+ (let ((out (assoc-ref outputs "out")))
+ (substitute* (string-append out "/bin/ncxx4-config")
+ (("cc=([[:graph:]]+)/bin/gcc")
+ "cc=\"gcc")
+ (("cxx=([[:graph:]]+)/bin/c\\+\\+")
+ "cxx=\"c++"))))))
+ #:configure-flags (list (string-append "-DHDF5_C_LIBRARY_hdf5="
+ (assoc-ref %build-inputs "hdf5")
+ "/lib/libhdf5.so"))))
+ (inputs (list netcdf hdf5))
+ (home-page "https://github.com/Unidata/netcdf-cxx4")
+ (synopsis "NetCDF C++ interface")
+ (description "C++ interface for NetCDF.")
+ (license license:bsd-3)))
+
+(define-public netcdf-cxx4-parallel-openmpi
+ (package
+ (inherit netcdf-cxx4)
+ (name "netcdf-cxx4-parallel-openmpi")
+ (inputs (modify-inputs (package-inputs netcdf-cxx4)
+ (prepend openmpi)
+ (replace "hdf5" hdf5-parallel-openmpi)
+ (replace "netcdf" netcdf-parallel-openmpi)))))
+
(define-public n2p2
(package
(name "n2p2")
base-commit: ab43d883a0a88adbcfd3c3ab8d4c097cd9054b90
--
2.46.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* bug#75284: [PATCH v2] gnu: Add netcdf-cxx4 and netcdf-cxx4-parallel-openmpi.
2025-01-03 7:21 ` [bug#75284] [PATCH v2] " Lars Bilke
@ 2025-01-19 23:11 ` Ludovic Courtès
0 siblings, 0 replies; 3+ messages in thread
From: Ludovic Courtès @ 2025-01-19 23:11 UTC (permalink / raw)
To: Lars Bilke; +Cc: Andreas Enge, 75284-done, Sharlatan Hellseher, Eric Bavier
[-- Attachment #1: Type: text/plain, Size: 449 bytes --]
Hi,
Lars Bilke <lars.bilke@ufz.de> skribis:
> * gnu/packages/maths.scm (netcdf-cxx4): New variable.
> * gnu/packages/maths.scm (netcdf-cxx4-parallel-openmpi: New variable.
>
> Change-Id: I9781aa31567b80e20c528abb5e9289bc625bb3eb
Applied with the changes below: addressing a ‘guix lint’ issue, and
following the conventions at
<https://guix.gnu.org/manual/devel/en/html_node/Synopses-and-Descriptions.html>.
Thanks,
Ludo’.
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: Type: text/x-patch, Size: 1762 bytes --]
diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index 5f40f751d3..4e3ea6df26 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -2391,6 +2391,7 @@ (define-public netcdf-cxx4
(uri (git-reference
(url "https://github.com/Unidata/netcdf-cxx4")
(commit (string-append "v" version))))
+ (file-name (git-file-name name version))
(sha256
(base32 "05kydd5z9iil5iv4fp7l11cicda5n5lsg5sdmsmc55xpspnsg7hr"))))
(build-system cmake-build-system)
@@ -2424,18 +2425,22 @@ (define-public netcdf-cxx4
(("cxx=([[:graph:]]+)/bin/c\\+\\+")
"cxx=\"c++"))))))
#:configure-flags (list (string-append "-DHDF5_C_LIBRARY_hdf5="
- (assoc-ref %build-inputs "hdf5")
- "/lib/libhdf5.so"))))
+ (search-input-file
+ %build-inputs
+ "/lib/libhdf5.so")))))
(inputs (list netcdf hdf5))
(home-page "https://github.com/Unidata/netcdf-cxx4")
(synopsis "NetCDF C++ interface")
- (description "C++ interface for NetCDF.")
+ (description
+ "This package provides a C++ interface to the NetCDF library for
+scientific data storage.")
(license license:bsd-3)))
(define-public netcdf-cxx4-parallel-openmpi
(package
(inherit netcdf-cxx4)
(name "netcdf-cxx4-parallel-openmpi")
+ (synopsis "NetCDF C++ interface (with MPI support)")
(inputs (modify-inputs (package-inputs netcdf-cxx4)
(prepend openmpi)
(replace "hdf5" hdf5-parallel-openmpi)
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2025-01-19 23:13 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-01-02 13:52 [bug#75284] [PATCH] gnu: Add netcdf-cxx4 and netcdf-cxx4-parallel-openmpi Lars Bilke
2025-01-03 7:21 ` [bug#75284] [PATCH v2] " Lars Bilke
2025-01-19 23:11 ` bug#75284: " Ludovic Courtès
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).