mirror of
https://github.com/Unidata/netcdf-c.git
synced 2024-11-21 03:13:42 +08:00
df3636b959
This PR started as an attempt to add unlimited dimensions to NCZarr. It did that, but this exposed significant problems with test interference. So this PR is mostly about fixing -- well mitigating anyway -- test interference. The problem of test interference is now documented in the document docs/internal.md. The solutions implemented here are also describe in that document. The solution is somewhat fragile but multiple cleanup mechanisms are provided. Note that this feature requires that the AWS command line utility must be installed. ## Unlimited Dimensions. The existing NCZarr extensions to Zarr are modified to support unlimited dimensions. NCzarr extends the Zarr meta-data for the ".zgroup" object to include netcdf-4 model extensions. This information is stored in ".zgroup" as dictionary named "_nczarr_group". Inside "_nczarr_group", there is a key named "dims" that stores information about netcdf-4 named dimensions. The value of "dims" is a dictionary whose keys are the named dimensions. The value associated with each dimension name has one of two forms Form 1 is a special case of form 2, and is kept for backward compatibility. Whenever a new file is written, it uses format 1 if possible, otherwise format 2. * Form 1: An integer representing the size of the dimension, which is used for simple named dimensions. * Form 2: A dictionary with the following keys and values" - "size" with an integer value representing the (current) size of the dimension. - "unlimited" with a value of either "1" or "0" to indicate if this dimension is an unlimited dimension. For Unlimited dimensions, the size is initially zero, and as variables extend the length of that dimension, the size value for the dimension increases. That dimension size is shared by all arrays referencing that dimension, so if one array extends an unlimited dimension, it is implicitly extended for all other arrays that reference that dimension. This is the standard semantics for unlimited dimensions. Adding unlimited dimensions required a number of other changes to the NCZarr code-base. These included the following. * Did a partial refactor of the slice handling code in zwalk.c to clean it up. * Added a number of tests for unlimited dimensions derived from the same test in nc_test4. * Added several NCZarr specific unlimited tests; more are needed. * Add test of endianness. ## Misc. Other Changes * Modify libdispatch/ncs3sdk_aws.cpp to optionally support use of the AWS Transfer Utility mechanism. This is controlled by the ```#define TRANSFER```` command in that file. It defaults to being disabled. * Parameterize both the standard Unidata S3 bucket (S3TESTBUCKET) and the netcdf-c test data prefix (S3TESTSUBTREE). * Fixed an obscure memory leak in ncdump. * Removed some obsolete unit testing code and test cases. * Uncovered a bug in the netcdf-c handling of big-endian floats and doubles. Have not fixed yet. See tst_h5_endians.c. * Renamed some nczarr_tests testcases to avoid name conflicts with nc_test4. * Modify the semantics of zmap\#ncsmap_write to only allow total rewrite of objects. * Modify the semantics of zodom to properly handle stride > 1. * Add a truncate operation to the libnczarr zmap code.
109 lines
2.8 KiB
Bash
Executable File
109 lines
2.8 KiB
Bash
Executable File
#!/bin/sh
|
|
|
|
if test "x$srcdir" = x ; then srcdir=`pwd`; fi
|
|
. ../test_common.sh
|
|
|
|
. ${srcdir}/test_nczarr.sh
|
|
|
|
set -e
|
|
|
|
s3isolate "testdir_unlim_io"
|
|
THISDIR=`pwd`
|
|
cd $ISOPATH
|
|
|
|
TC="${execdir}/test_unlim_io -4"
|
|
ZM="${execdir}/zmapio -t int"
|
|
|
|
remfile() {
|
|
case "$zext" in
|
|
nc4) rm -fr $1 ;;
|
|
file) rm -fr $1 ;;
|
|
zip) rm -fr $1 ;;
|
|
s3) ;;
|
|
*) echo "no such extension: $zext" ; exit 1;;
|
|
esac
|
|
}
|
|
|
|
remfile() {
|
|
case "$zext" in
|
|
nc4) rm -fr $1 ;;
|
|
file) rm -fr $1 ;;
|
|
zip) rm -fr $1 ;;
|
|
s3) ;;
|
|
*) echo "no such extension: $zext" ; exit 1;;
|
|
esac
|
|
}
|
|
|
|
buildfile() {
|
|
zext=$1
|
|
base=$2
|
|
if test "x$TESTNCZARR" = x1 ; then
|
|
fileargs "${base}_${zext}"
|
|
deletemap $zext $file
|
|
file="$fileurl"
|
|
else
|
|
file="${base}_${zext}.nc"
|
|
rm -f $file
|
|
fi
|
|
}
|
|
|
|
testcase1() {
|
|
zext=$1
|
|
buildfile $zext tmp_unlim_io1
|
|
echo ""; echo "*** Test simple use of unlimited"
|
|
rm -fr tmp_unlim_io1.nc tmp_unlim_io1.$zext tmp_unlim_io1.nc.txt tmp_unlim_io1.${zext}.txt
|
|
$TC -d 0 -c 2 -s 0 -e 1 -Ocw tmp_unlim_io1.nc
|
|
$TC -d 0 -c 2 -s 0 -e 1 -Ocw "$file"
|
|
${NCDUMP} -n tmp_unlim_io1 tmp_unlim_io1.nc >tmp_unlim_io1.nc.txt
|
|
${NCDUMP} -n tmp_unlim_io1 "$file" >tmp_unlim_io1.${zext}.txt
|
|
diff -b tmp_unlim_io1.nc.txt tmp_unlim_io1.${zext}.txt
|
|
}
|
|
|
|
testcase2() {
|
|
zext=$1
|
|
buildfile $zext tmp_unlim_io2
|
|
echo ""; echo "*** Test 2-d chunking"
|
|
rm -fr tmp_unlim_io2.nc tmp_unlim_io2.$zext tmp_unlim_io2.nc.txt tmp_unlim_io2.${zext}.txt
|
|
$TC -d 0,0 -c 2,2 -s 0,0 -e 2,2 -v 17 -Ocw tmp_unlim_io2.nc
|
|
$TC -d 0,0 -c 2,2 -s 0,0 -e 2,2 -v 17 -Ocw "$file"
|
|
${NCDUMP} -n tmp_unlim_io2 tmp_unlim_io2.nc >tmp_unlim_io2.nc.txt
|
|
${NCDUMP} -n tmp_unlim_io2 "$file" >tmp_unlim_io2.${zext}.txt
|
|
diff -b tmp_unlim_io2.nc.txt tmp_unlim_io2.${zext}.txt
|
|
${execdir}/ncdumpchunks -v v "$file"
|
|
}
|
|
|
|
testcase3() {
|
|
zext=$1
|
|
buildfile $zext tmp_unlim_io3
|
|
echo ""; echo "*** Test multi-chunk extension"
|
|
rm -fr tmp_unlim_io3.nc tmp_unlim_io3.$zext tmp_unlim_io3.nc.txt tmp_unlim_io3.${zext}.txt
|
|
$TC -d 0,0 -c 2,2 -s 6,6 -e 2,2 -v 17 -Ocw tmp_unlim_io3.nc
|
|
$TC -d 0,0 -c 2,2 -s 6,6 -e 2,2 -v 17 -Ocw "$file"
|
|
${NCDUMP} -n tmp_unlim_io3 tmp_unlim_io3.nc >tmp_unlim_io3.nc.txt
|
|
${NCDUMP} -n tmp_unlim_io3 "$file" >tmp_unlim_io3.${zext}.txt
|
|
diff -b tmp_unlim_io3.nc.txt tmp_unlim_io3.${zext}.txt
|
|
}
|
|
|
|
testcase4() {
|
|
zext=$1
|
|
buildfile $zext tmp_unlim_io4
|
|
echo ""; echo "*** Test unlimited as second dimension"
|
|
rm -fr tmp_unlim_io4.nc tmp_unlim_io4.$zext tmp_unlim_io4.nc.txt tmp_unlim_io4.${zext}.txt
|
|
$TC -d 8,0 -c 2,2 -s 6,6 -e 2,2 -v 17 -Ocw tmp_unlim_io4.nc
|
|
$TC -d 8,0 -c 2,2 -s 6,6 -e 2,2 -v 17 -Ocw "$file"
|
|
${NCDUMP} -n tmp_unlim_io3 tmp_unlim_io4.nc >tmp_unlim_io4.nc.txt
|
|
${NCDUMP} -n tmp_unlim_io3 "$file" >tmp_unlim_io4.${zext}.txt
|
|
diff -b tmp_unlim_io4.nc.txt tmp_unlim_io4.${zext}.txt
|
|
}
|
|
|
|
testcases() {
|
|
testcase1 $1
|
|
testcase2 $1
|
|
testcase3 $1
|
|
testcase4 $1
|
|
}
|
|
|
|
testcases file
|
|
if test "x$FEATURE_NCZARR_ZIP" = xyes ; then testcases zip; fi
|
|
if test "x$FEATURE_S3TESTS" = xyes ; then testcases s3; fi
|