[arch-commits] Commit in pnetcdf-openmpi/trunk (PKGBUILD fix-parallel-tests.patch)
Bruno Pagani
archange at archlinux.org
Tue May 14 10:23:55 UTC 2019
Date: Tuesday, May 14, 2019 @ 10:23:54
Author: archange
Revision: 467206
upgpkg: pnetcdf-openmpi 1.11.2-1
Modified:
pnetcdf-openmpi/trunk/PKGBUILD
Deleted:
pnetcdf-openmpi/trunk/fix-parallel-tests.patch
--------------------------+
PKGBUILD | 40 +---
fix-parallel-tests.patch | 388 ---------------------------------------------
2 files changed, 15 insertions(+), 413 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2019-05-14 07:34:25 UTC (rev 467205)
+++ PKGBUILD 2019-05-14 10:23:54 UTC (rev 467206)
@@ -3,41 +3,32 @@
_pkg=pnetcdf
_mpi=openmpi
pkgname=${_pkg}-${_mpi}
-pkgver=1.11.0
-pkgrel=2
+pkgver=1.11.2
+pkgrel=1
pkgdesc="Parallel I/O Library for NetCDF File Access (${_mpi} version)"
-arch=('x86_64')
+arch=(x86_64)
url="https://parallel-netcdf.github.io/"
-license=('custom')
+license=(custom)
depends=("${_mpi}" "netcdf-${_mpi}")
-makedepends=('gcc-fortran')
-checkdepends=('inetutils')
-provides=('parallel-netcdf' 'parallel-netcdf-openmpi')
-conflicts=('parallel-netcdf' 'parallel-netcdf-openmpi')
-replaces=('parallel-netcdf' 'parallel-netcdf-openmpi')
-options=('staticlibs')
-source=("${url}/Release/${_pkg}-${pkgver}.tar.gz"
- fix-parallel-tests.patch)
-sha1sums=('a13fd24953abce1f3fd7aa94fd66f1b9895182de'
- '0d7ea16dddb89153aacad83e954b66ba01fb2c38')
+makedepends=(gcc-fortran)
+checkdepends=(inetutils)
+provides=(parallel-netcdf parallel-netcdf-openmpi)
+conflicts=(parallel-netcdf parallel-netcdf-openmpi)
+replaces=(parallel-netcdf parallel-netcdf-openmpi)
+options=(staticlibs)
+source=("${url}/Release/${_pkg}-${pkgver}.tar.gz")
+sha1sums=(cf310a037846a5722c05525b0a77273bea8059a0)
-prepare() {
- cd ${_pkg}-${pkgver}
- patch -p1 -i ../fix-parallel-tests.patch
-}
-
build() {
cd ${_pkg}-${pkgver}
-
- export CPPFLAGS="${CPPFLAGS} -fPIC"
+ autoreconf -vfi
./configure --prefix=/usr --enable-shared --enable-netcdf4
- make
+ make LIBTOOLFLAGS=--verbose
}
check() {
cd ${_pkg}-${pkgver}
- # One failure to investigate
- make check || warning "Tests failed"
+ make check
make ptest
}
@@ -44,6 +35,5 @@
package() {
cd ${_pkg}-${pkgver}
make DESTDIR="${pkgdir}" install
-
install -Dm644 COPYRIGHT -t "${pkgdir}"/usr/share/licenses/${_pkg}
}
Deleted: fix-parallel-tests.patch
===================================================================
--- fix-parallel-tests.patch 2019-05-14 07:34:25 UTC (rev 467205)
+++ fix-parallel-tests.patch 2019-05-14 10:23:54 UTC (rev 467206)
@@ -1,388 +0,0 @@
-From bbd79e2fae98603f69ad45862d6758336c880ecb Mon Sep 17 00:00:00 2001
-From: Wei-keng Liao <wkliao at users.noreply.github.com>
-Date: Wed, 26 Dec 2018 11:44:45 -0600
-Subject: [PATCH] Bug fix to ignore NC_ENOTENABLED if PnetCDF was not built
- with --enable-profiling.
-
----
- examples/C/block_cyclic.c | 2 +-
- examples/C/bput_varn_int64.c | 2 +-
- examples/C/bput_varn_uint.c | 2 +-
- examples/C/collective_write.c | 2 +-
- examples/C/column_wise.c | 2 +-
- examples/C/create_open.c | 2 +-
- examples/C/fill_mode.c | 2 +-
- examples/C/flexible_api.c | 2 +-
- examples/C/get_info.c | 2 +-
- examples/C/get_vara.c | 2 +-
- examples/C/ghost_cell.c | 2 +-
- examples/C/global_attributes.c | 2 +-
- examples/C/hints.c | 2 +-
- examples/C/i_varn_int64.c | 2 +-
- examples/C/mput.c | 2 +-
- examples/C/nonblocking_write.c | 2 +-
- examples/C/nonblocking_write_in_def.c | 2 +-
- examples/C/pthread.c | 2 +-
- examples/C/put_vara.c | 2 +-
- examples/C/put_varn_float.c | 2 +-
- examples/C/put_varn_int.c | 2 +-
- examples/C/req_all.c | 2 +-
- examples/C/time_var.c | 2 +-
- examples/C/transpose.c | 2 +-
- examples/C/transpose2D.c | 2 +-
- examples/C/vard_int.c | 2 +-
- examples/C/vard_mvars.c | 2 +-
- sneak_peek.md | 6 ++++--
- 28 files changed, 31 insertions(+), 29 deletions(-)
-
-diff --git a/examples/C/block_cyclic.c b/examples/C/block_cyclic.c
-index 90bf029e..0b47608e 100644
---- a/examples/C/block_cyclic.c
-+++ b/examples/C/block_cyclic.c
-@@ -121,7 +121,7 @@ pnetcdf_check_mem_usage(MPI_Comm comm)
- printf("heap memory allocated by PnetCDF internally has %lld bytes yet to be freed\n",
- sum_size);
- }
-- else {
-+ else if (err != NC_ENOTENABLED) {
- printf("Error at %s:%d: %s\n", __FILE__,__LINE__,ncmpi_strerror(err));
- nerrs++;
- }
-diff --git a/examples/C/bput_varn_int64.c b/examples/C/bput_varn_int64.c
-index d57c8f86..3f8c643b 100644
---- a/examples/C/bput_varn_int64.c
-+++ b/examples/C/bput_varn_int64.c
-@@ -142,7 +142,7 @@ pnetcdf_check_mem_usage(MPI_Comm comm)
- printf("heap memory allocated by PnetCDF internally has %lld bytes yet to be freed\n",
- sum_size);
- }
-- else {
-+ else if (err != NC_ENOTENABLED) {
- printf("Error at %s:%d: %s\n", __FILE__,__LINE__,ncmpi_strerror(err));
- nerrs++;
- }
-diff --git a/examples/C/bput_varn_uint.c b/examples/C/bput_varn_uint.c
-index 26cb3c70..693c2af3 100644
---- a/examples/C/bput_varn_uint.c
-+++ b/examples/C/bput_varn_uint.c
-@@ -118,7 +118,7 @@ pnetcdf_check_mem_usage(MPI_Comm comm)
- printf("heap memory allocated by PnetCDF internally has %lld bytes yet to be freed\n",
- sum_size);
- }
-- else {
-+ else if (err != NC_ENOTENABLED) {
- printf("Error at %s:%d: %s\n", __FILE__,__LINE__,ncmpi_strerror(err));
- nerrs++;
- }
-diff --git a/examples/C/collective_write.c b/examples/C/collective_write.c
-index 8e3fa830..7d834a2a 100644
---- a/examples/C/collective_write.c
-+++ b/examples/C/collective_write.c
-@@ -110,7 +110,7 @@ pnetcdf_check_mem_usage(MPI_Comm comm)
- printf("heap memory allocated by PnetCDF internally has %lld bytes yet to be freed\n",
- sum_size);
- }
-- else {
-+ else if (err != NC_ENOTENABLED) {
- printf("Error at %s:%d: %s\n", __FILE__,__LINE__,ncmpi_strerror(err));
- nerrs++;
- }
-diff --git a/examples/C/column_wise.c b/examples/C/column_wise.c
-index f03085a5..675dd54a 100644
---- a/examples/C/column_wise.c
-+++ b/examples/C/column_wise.c
-@@ -108,7 +108,7 @@ pnetcdf_check_mem_usage(MPI_Comm comm)
- printf("heap memory allocated by PnetCDF internally has %lld bytes yet to be freed\n",
- sum_size);
- }
-- else {
-+ else if (err != NC_ENOTENABLED) {
- printf("Error at %s:%d: %s\n", __FILE__,__LINE__,ncmpi_strerror(err));
- nerrs++;
- }
-diff --git a/examples/C/create_open.c b/examples/C/create_open.c
-index d6a66b21..44b00c31 100644
---- a/examples/C/create_open.c
-+++ b/examples/C/create_open.c
-@@ -72,7 +72,7 @@ pnetcdf_check_mem_usage(MPI_Comm comm)
- printf("heap memory allocated by PnetCDF internally has %lld bytes yet to be freed\n",
- sum_size);
- }
-- else {
-+ else if (err != NC_ENOTENABLED) {
- printf("Error at %s:%d: %s\n", __FILE__,__LINE__,ncmpi_strerror(err));
- nerrs++;
- }
-diff --git a/examples/C/fill_mode.c b/examples/C/fill_mode.c
-index 3bb9fd1b..462f2f16 100644
---- a/examples/C/fill_mode.c
-+++ b/examples/C/fill_mode.c
-@@ -105,7 +105,7 @@ pnetcdf_check_mem_usage(MPI_Comm comm)
- printf("heap memory allocated by PnetCDF internally has %lld bytes yet to be freed\n",
- sum_size);
- }
-- else {
-+ else if (err != NC_ENOTENABLED) {
- printf("Error at %s:%d: %s\n", __FILE__,__LINE__,ncmpi_strerror(err));
- nerrs++;
- }
-diff --git a/examples/C/flexible_api.c b/examples/C/flexible_api.c
-index 3d0ade60..020d4687 100644
---- a/examples/C/flexible_api.c
-+++ b/examples/C/flexible_api.c
-@@ -122,7 +122,7 @@ pnetcdf_check_mem_usage(MPI_Comm comm)
- printf("heap memory allocated by PnetCDF internally has %lld bytes yet to be freed\n",
- sum_size);
- }
-- else {
-+ else if (err != NC_ENOTENABLED) {
- printf("Error at %s:%d: %s\n", __FILE__,__LINE__,ncmpi_strerror(err));
- nerrs++;
- }
-diff --git a/examples/C/get_info.c b/examples/C/get_info.c
-index ddb49463..578a8d73 100644
---- a/examples/C/get_info.c
-+++ b/examples/C/get_info.c
-@@ -83,7 +83,7 @@ pnetcdf_check_mem_usage(MPI_Comm comm)
- printf("heap memory allocated by PnetCDF internally has %lld bytes yet to be freed\n",
- sum_size);
- }
-- else {
-+ else if (err != NC_ENOTENABLED) {
- printf("Error at %s:%d: %s\n", __FILE__,__LINE__,ncmpi_strerror(err));
- nerrs++;
- }
-diff --git a/examples/C/get_vara.c b/examples/C/get_vara.c
-index 709109cb..4c859b2c 100644
---- a/examples/C/get_vara.c
-+++ b/examples/C/get_vara.c
-@@ -101,7 +101,7 @@ pnetcdf_check_mem_usage(MPI_Comm comm)
- printf("heap memory allocated by PnetCDF internally has %lld bytes yet to be freed\n",
- sum_size);
- }
-- else {
-+ else if (err != NC_ENOTENABLED) {
- printf("Error at %s:%d: %s\n", __FILE__,__LINE__,ncmpi_strerror(err));
- nerrs++;
- }
-diff --git a/examples/C/ghost_cell.c b/examples/C/ghost_cell.c
-index b84b1420..221c92fd 100644
---- a/examples/C/ghost_cell.c
-+++ b/examples/C/ghost_cell.c
-@@ -117,7 +117,7 @@ pnetcdf_check_mem_usage(MPI_Comm comm)
- printf("heap memory allocated by PnetCDF internally has %lld bytes yet to be freed\n",
- sum_size);
- }
-- else {
-+ else if (err != NC_ENOTENABLED) {
- printf("Error at %s:%d: %s\n", __FILE__,__LINE__,ncmpi_strerror(err));
- nerrs++;
- }
-diff --git a/examples/C/global_attributes.c b/examples/C/global_attributes.c
-index 10256b5e..f25b56af 100644
---- a/examples/C/global_attributes.c
-+++ b/examples/C/global_attributes.c
-@@ -79,7 +79,7 @@ pnetcdf_check_mem_usage(MPI_Comm comm)
- printf("heap memory allocated by PnetCDF internally has %lld bytes yet to be freed\n",
- sum_size);
- }
-- else {
-+ else if (err != NC_ENOTENABLED) {
- printf("Error at %s:%d: %s\n", __FILE__,__LINE__,ncmpi_strerror(err));
- nerrs++;
- }
-diff --git a/examples/C/hints.c b/examples/C/hints.c
-index 4e7f1c6e..e969377e 100644
---- a/examples/C/hints.c
-+++ b/examples/C/hints.c
-@@ -79,7 +79,7 @@ pnetcdf_check_mem_usage(MPI_Comm comm)
- printf("heap memory allocated by PnetCDF internally has %lld bytes yet to be freed\n",
- sum_size);
- }
-- else {
-+ else if (err != NC_ENOTENABLED) {
- printf("Error at %s:%d: %s\n", __FILE__,__LINE__,ncmpi_strerror(err));
- nerrs++;
- }
-diff --git a/examples/C/i_varn_int64.c b/examples/C/i_varn_int64.c
-index fd4b37d2..6e37bf7e 100644
---- a/examples/C/i_varn_int64.c
-+++ b/examples/C/i_varn_int64.c
-@@ -119,7 +119,7 @@ pnetcdf_check_mem_usage(MPI_Comm comm)
- printf("heap memory allocated by PnetCDF internally has %lld bytes yet to be freed\n",
- sum_size);
- }
-- else {
-+ else if (err != NC_ENOTENABLED) {
- printf("Error at %s:%d: %s\n", __FILE__,__LINE__,ncmpi_strerror(err));
- nerrs++;
- }
-diff --git a/examples/C/mput.c b/examples/C/mput.c
-index 37c039fb..14c3b59c 100644
---- a/examples/C/mput.c
-+++ b/examples/C/mput.c
-@@ -92,7 +92,7 @@ pnetcdf_check_mem_usage(MPI_Comm comm)
- printf("heap memory allocated by PnetCDF internally has %lld bytes yet to be freed\n",
- sum_size);
- }
-- else {
-+ else if (err != NC_ENOTENABLED) {
- printf("Error at %s:%d: %s\n", __FILE__,__LINE__,ncmpi_strerror(err));
- nerrs++;
- }
-diff --git a/examples/C/nonblocking_write.c b/examples/C/nonblocking_write.c
-index fab8557d..0bfe721b 100644
---- a/examples/C/nonblocking_write.c
-+++ b/examples/C/nonblocking_write.c
-@@ -83,7 +83,7 @@ pnetcdf_check_mem_usage(MPI_Comm comm)
- printf("heap memory allocated by PnetCDF internally has %lld bytes yet to be freed\n",
- sum_size);
- }
-- else {
-+ else if (err != NC_ENOTENABLED) {
- printf("Error at %s:%d: %s\n", __FILE__,__LINE__,ncmpi_strerror(err));
- nerrs++;
- }
-diff --git a/examples/C/nonblocking_write_in_def.c b/examples/C/nonblocking_write_in_def.c
-index 7502a2d4..85bceec8 100644
---- a/examples/C/nonblocking_write_in_def.c
-+++ b/examples/C/nonblocking_write_in_def.c
-@@ -85,7 +85,7 @@ pnetcdf_check_mem_usage(MPI_Comm comm)
- printf("heap memory allocated by PnetCDF internally has %lld bytes yet to be freed\n",
- sum_size);
- }
-- else {
-+ else if (err != NC_ENOTENABLED) {
- printf("Error at %s:%d: %s\n", __FILE__,__LINE__,ncmpi_strerror(err));
- nerrs++;
- }
-diff --git a/examples/C/pthread.c b/examples/C/pthread.c
-index 97843440..a4cf5196 100644
---- a/examples/C/pthread.c
-+++ b/examples/C/pthread.c
-@@ -114,7 +114,7 @@ pnetcdf_check_mem_usage(MPI_Comm comm)
- printf("heap memory allocated by PnetCDF internally has %lld bytes yet to be freed\n",
- sum_size);
- }
-- else {
-+ else if (err != NC_ENOTENABLED) {
- printf("Error at %s:%d: %s\n", __FILE__,__LINE__,ncmpi_strerror(err));
- nerrs++;
- }
-diff --git a/examples/C/put_vara.c b/examples/C/put_vara.c
-index 32e71ef6..8efed57d 100644
---- a/examples/C/put_vara.c
-+++ b/examples/C/put_vara.c
-@@ -106,7 +106,7 @@ pnetcdf_check_mem_usage(MPI_Comm comm)
- printf("heap memory allocated by PnetCDF internally has %lld bytes yet to be freed\n",
- sum_size);
- }
-- else {
-+ else if (err != NC_ENOTENABLED) {
- printf("Error at %s:%d: %s\n", __FILE__,__LINE__,ncmpi_strerror(err));
- nerrs++;
- }
-diff --git a/examples/C/put_varn_float.c b/examples/C/put_varn_float.c
-index 8d96312c..34577093 100644
---- a/examples/C/put_varn_float.c
-+++ b/examples/C/put_varn_float.c
-@@ -84,7 +84,7 @@ pnetcdf_check_mem_usage(MPI_Comm comm)
- printf("heap memory allocated by PnetCDF internally has %lld bytes yet to be freed\n",
- sum_size);
- }
-- else {
-+ else if (err != NC_ENOTENABLED) {
- printf("Error at %s:%d: %s\n", __FILE__,__LINE__,ncmpi_strerror(err));
- nerrs++;
- }
-diff --git a/examples/C/put_varn_int.c b/examples/C/put_varn_int.c
-index c3862c55..7889b875 100644
---- a/examples/C/put_varn_int.c
-+++ b/examples/C/put_varn_int.c
-@@ -92,7 +92,7 @@ pnetcdf_check_mem_usage(MPI_Comm comm)
- printf("heap memory allocated by PnetCDF internally has %lld bytes yet to be freed\n",
- sum_size);
- }
-- else {
-+ else if (err != NC_ENOTENABLED) {
- printf("Error at %s:%d: %s\n", __FILE__,__LINE__,ncmpi_strerror(err));
- nerrs++;
- }
-diff --git a/examples/C/req_all.c b/examples/C/req_all.c
-index 998bcbc3..0031691e 100644
---- a/examples/C/req_all.c
-+++ b/examples/C/req_all.c
-@@ -100,7 +100,7 @@ pnetcdf_check_mem_usage(MPI_Comm comm)
- printf("heap memory allocated by PnetCDF internally has %lld bytes yet to be freed\n",
- sum_size);
- }
-- else {
-+ else if (err != NC_ENOTENABLED) {
- printf("Error at %s:%d: %s\n", __FILE__,__LINE__,ncmpi_strerror(err));
- nerrs++;
- }
-diff --git a/examples/C/time_var.c b/examples/C/time_var.c
-index a8ebde72..a378c140 100644
---- a/examples/C/time_var.c
-+++ b/examples/C/time_var.c
-@@ -107,7 +107,7 @@ pnetcdf_check_mem_usage(MPI_Comm comm)
- printf("heap memory allocated by PnetCDF internally has %lld bytes yet to be freed\n",
- sum_size);
- }
-- else {
-+ else if (err != NC_ENOTENABLED) {
- printf("Error at %s:%d: %s\n", __FILE__,__LINE__,ncmpi_strerror(err));
- nerrs++;
- }
-diff --git a/examples/C/transpose.c b/examples/C/transpose.c
-index 202096fc..72d11791 100644
---- a/examples/C/transpose.c
-+++ b/examples/C/transpose.c
-@@ -81,7 +81,7 @@ pnetcdf_check_mem_usage(MPI_Comm comm)
- printf("heap memory allocated by PnetCDF internally has %lld bytes yet to be freed\n",
- sum_size);
- }
-- else {
-+ else if (err != NC_ENOTENABLED) {
- printf("Error at %s:%d: %s\n", __FILE__,__LINE__,ncmpi_strerror(err));
- nerrs++;
- }
-diff --git a/examples/C/transpose2D.c b/examples/C/transpose2D.c
-index 5d3f326a..b62d11b5 100644
---- a/examples/C/transpose2D.c
-+++ b/examples/C/transpose2D.c
-@@ -102,7 +102,7 @@ pnetcdf_check_mem_usage(MPI_Comm comm)
- printf("heap memory allocated by PnetCDF internally has %lld bytes yet to be freed\n",
- sum_size);
- }
-- else {
-+ else if (err != NC_ENOTENABLED) {
- printf("Error at %s:%d: %s\n", __FILE__,__LINE__,ncmpi_strerror(err));
- nerrs++;
- }
-diff --git a/examples/C/vard_int.c b/examples/C/vard_int.c
-index 5bad1e2f..7b13f47f 100644
---- a/examples/C/vard_int.c
-+++ b/examples/C/vard_int.c
-@@ -92,7 +92,7 @@ pnetcdf_check_mem_usage(MPI_Comm comm)
- printf("heap memory allocated by PnetCDF internally has %lld bytes yet to be freed\n",
- sum_size);
- }
-- else {
-+ else if (err != NC_ENOTENABLED) {
- printf("Error at %s:%d: %s\n", __FILE__,__LINE__,ncmpi_strerror(err));
- nerrs++;
- }
-diff --git a/examples/C/vard_mvars.c b/examples/C/vard_mvars.c
-index 63eb9651..a2623524 100644
---- a/examples/C/vard_mvars.c
-+++ b/examples/C/vard_mvars.c
-@@ -130,7 +130,7 @@ pnetcdf_check_mem_usage(MPI_Comm comm)
- printf("heap memory allocated by PnetCDF internally has %lld bytes yet to be freed\n",
- sum_size);
- }
-- else {
-+ else if (err != NC_ENOTENABLED) {
- printf("Error at %s:%d: %s\n", __FILE__,__LINE__,ncmpi_strerror(err));
- nerrs++;
- }
More information about the arch-commits
mailing list