From dd4fbbb19400b9902efcfedcb093357a07c5fb9d Mon Sep 17 00:00:00 2001 From: Ed Hartnett Date: Wed, 15 May 2019 07:16:14 -0600 Subject: [PATCH 1/3] perf program changes --- tests/cunit/test_async_perf.c | 6 +++--- tests/cunit/test_perf2.c | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/tests/cunit/test_async_perf.c b/tests/cunit/test_async_perf.c index af66c4e95bc..e5f5759b4e3 100644 --- a/tests/cunit/test_async_perf.c +++ b/tests/cunit/test_async_perf.c @@ -36,9 +36,9 @@ #define LON_LEN 3 /* The length of our sample data along each dimension. */ -#define X_DIM_LEN 4 -#define Y_DIM_LEN 4 -#define Z_DIM_LEN 4 +#define X_DIM_LEN 1024 +#define Y_DIM_LEN 1024 +#define Z_DIM_LEN 256 /* The number of timesteps of data to write. */ #define NUM_TIMESTEPS 3 diff --git a/tests/cunit/test_perf2.c b/tests/cunit/test_perf2.c index 4335a167c5f..db6972717e9 100644 --- a/tests/cunit/test_perf2.c +++ b/tests/cunit/test_perf2.c @@ -30,9 +30,9 @@ #define NDIM3 3 /* The length of our sample data along each dimension. */ -#define X_DIM_LEN 128 -#define Y_DIM_LEN 128 -#define Z_DIM_LEN 16 +#define X_DIM_LEN 1024 +#define Y_DIM_LEN 1024 +#define Z_DIM_LEN 256 /* The number of timesteps of data to write. */ #define NUM_TIMESTEPS 10 @@ -429,6 +429,6 @@ int main(int argc, char **argv) if ((ret = pio_test_finalize(&test_comm))) return ret; - printf("%d %s SUCCESS!!\n", my_rank, TEST_NAME); + /* printf("%d %s SUCCESS!!\n", my_rank, TEST_NAME); */ return 0; } From 514988d8cfbb3c0580122b5708857c0b7f3388e0 Mon Sep 17 00:00:00 2001 From: Ed Hartnett Date: Thu, 16 May 2019 04:49:12 -0600 Subject: [PATCH 2/3] make writes really async? --- src/clib/pio_getput_int.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/clib/pio_getput_int.c b/src/clib/pio_getput_int.c index dcf36168dd9..d8b6f111ca3 100644 --- a/src/clib/pio_getput_int.c +++ b/src/clib/pio_getput_int.c @@ -1254,13 +1254,16 @@ int PIOc_put_vars_tc(int ncid, int varid, const PIO_Offset *start, const PIO_Off /* Free malloced resources. */ if (ndims && !stride_present) free(fake_stride); + + if (ierr) + return check_netcdf(file, ierr, __FILE__, __LINE__); } /* Broadcast and check the return code. */ - if ((mpierr = MPI_Bcast(&ierr, 1, MPI_INT, ios->ioroot, ios->my_comm))) - return check_mpi(NULL, file, mpierr, __FILE__, __LINE__); - if (ierr) - return check_netcdf(file, ierr, __FILE__, __LINE__); + /* if ((mpierr = MPI_Bcast(&ierr, 1, MPI_INT, ios->ioroot, ios->my_comm))) */ + /* return check_mpi(NULL, file, mpierr, __FILE__, __LINE__); */ + /* if (ierr) */ + /* return check_netcdf(file, ierr, __FILE__, __LINE__); */ LOG((2, "PIOc_put_vars_tc bcast netcdf return code %d complete", ierr)); return PIO_NOERR; From 70bff1d3aaaea83d3181e6f253c4855cbf48bb29 Mon Sep 17 00:00:00 2001 From: Ed Hartnett Date: Thu, 16 May 2019 04:50:10 -0600 Subject: [PATCH 3/3] changed size of data to fit memory --- tests/cunit/test_perf2.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/cunit/test_perf2.c b/tests/cunit/test_perf2.c index db6972717e9..2079b3c81dc 100644 --- a/tests/cunit/test_perf2.c +++ b/tests/cunit/test_perf2.c @@ -32,7 +32,7 @@ /* The length of our sample data along each dimension. */ #define X_DIM_LEN 1024 #define Y_DIM_LEN 1024 -#define Z_DIM_LEN 256 +#define Z_DIM_LEN 128 /* The number of timesteps of data to write. */ #define NUM_TIMESTEPS 10