mirror of
https://github.com/Unidata/netcdf-c.git
synced 2024-12-21 08:39:46 +08:00
231ae96c4b
* re: https://github.com/Unidata/netcdf-c/pull/2278 * re: https://github.com/Unidata/netcdf-c/issues/2485 * re: https://github.com/Unidata/netcdf-c/issues/2474 This PR subsumes PR https://github.com/Unidata/netcdf-c/pull/2278. Actually is a bit an omnibus covering several issues. ## PR https://github.com/Unidata/netcdf-c/pull/2278 Add support for the Zarr string type. Zarr strings are restricted currently to be of fixed size. The primary issue to be addressed is to provide a way for user to specify the size of the fixed length strings. This is handled by providing the following new attributes special: 1. **_nczarr_default_maxstrlen** — This is an attribute of the root group. It specifies the default maximum string length for string types. If not specified, then it has the value of 64 characters. 2. **_nczarr_maxstrlen** — This is a per-variable attribute. It specifies the maximum string length for the string type associated with the variable. If not specified, then it is assigned the value of **_nczarr_default_maxstrlen**. This PR also requires some hacking to handle the existing netcdf-c NC_CHAR type, which does not exist in zarr. The goal was to choose numpy types for both the netcdf-c NC_STRING type and the netcdf-c NC_CHAR type such that if a pure zarr implementation read them, it would still work and an NC_CHAR type would be handled by zarr as a string of length 1. For writing variables and NCZarr attributes, the type mapping is as follows: * "|S1" for NC_CHAR. * ">S1" for NC_STRING && MAXSTRLEN==1 * ">Sn" for NC_STRING && MAXSTRLEN==n Note that it is a bit of a hack to use endianness, but it should be ok since for string/char, the endianness has no meaning. For reading attributes with pure zarr (i.e. with no nczarr atribute types defined), they will always be interpreted as of type NC_CHAR. ## Issue: https://github.com/Unidata/netcdf-c/issues/2474 This PR partly fixes this issue because it provided more comprehensive support for Zarr attributes that are JSON valued expressions. This PR still does not address the problem in that issue where the _ARRAY_DIMENSION attribute is incorrectly set. Than can only be fixed by the creator of the datasets. ## Issue: https://github.com/Unidata/netcdf-c/issues/2485 This PR also fixes the scalar failure shown in this issue. It generally cleans up scalar handling. It also adds a note to the documentation describing that NCZarr supports scalars while Zarr does not and also how scalar interoperability is achieved. ## Misc. Other Changes 1. Convert the nczarr special attributes and keys to be all lower case. So "_NCZARR_ATTR" now used "_nczarr_attr. Support back compatibility for the upper case names. 2. Cleanup my too-clever-by-half handling of scalars in libnczarr.
140 lines
4.4 KiB
CMake
140 lines
4.4 KiB
CMake
# Copyright 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
|
|
# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014,
|
|
# 2015, 2016, 2017, 2018
|
|
# University Corporation for Atmospheric Research/Unidata.
|
|
|
|
# See netcdf-c/COPYRIGHT file for more info.
|
|
|
|
message(STATUS "CMAKE_SOURCE_DIR=${CMAKE_SOURCE_DIR}")
|
|
message(STATUS "CMAKE_BINARY_DIR=${CMAKE_BINARY_DIR}")
|
|
message(STATUS "CMAKE_CURRENT_SOURCE_DIR=${CMAKE_CURRENT_SOURCE_DIR}")
|
|
message(STATUS "CMAKE_CURRENT_BINARY_DIR=${CMAKE_CURRENT_BINARY_DIR}")
|
|
|
|
add_definitions(-D"TOPSRCDIR=${CMAKE_SOURCE_DIR}")
|
|
add_definitions(-D"TOPBINDIR=${CMAKE_BINARY_DIR}")
|
|
|
|
INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR}/include)
|
|
|
|
SET (nc_test_SRC
|
|
nc_test.c
|
|
error.c
|
|
util.c
|
|
)
|
|
|
|
|
|
SET (nc_test_m4_SOURCES test_get test_put test_read test_write)
|
|
FOREACH (F ${nc_test_m4_SOURCES})
|
|
GEN_m4(${F} dest)
|
|
LIST(APPEND nc_test_SRC ${dest})
|
|
ENDFOREACH()
|
|
|
|
ADD_EXECUTABLE(nc_test ${nc_test_SRC})
|
|
TARGET_INCLUDE_DIRECTORIES(nc_test PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
|
|
TARGET_LINK_LIBRARIES(nc_test
|
|
netcdf
|
|
${HAVE_LIBM}
|
|
)
|
|
|
|
# Some extra stand-alone tests
|
|
SET(TESTS t_nc tst_small tst_misc tst_norm tst_names tst_nofill tst_nofill2 tst_nofill3 tst_meta tst_inq_type tst_utf8_phrases tst_global_fillval tst_max_var_dims tst_formats tst_def_var_fill tst_err_enddef tst_default_format)
|
|
|
|
IF(NOT MSVC)
|
|
SET(TESTS ${TESTS} tst_utf8_validate)
|
|
ENDIF()
|
|
|
|
IF(NOT HAVE_BASH)
|
|
SET(TESTS ${TESTS} tst_atts3)
|
|
ENDIF()
|
|
|
|
IF(USE_PNETCDF)
|
|
build_bin_test_no_prefix(tst_pnetcdf)
|
|
build_bin_test_no_prefix(tst_parallel2)
|
|
build_bin_test_no_prefix(tst_addvar)
|
|
build_bin_test_no_prefix(t_nc)
|
|
build_bin_test_no_prefix(tst_atts3)
|
|
build_bin_test_no_prefix(tst_default_format_pnetcdf)
|
|
build_bin_test_no_prefix(tst_small)
|
|
build_bin_test_no_prefix(tst_formatx_pnetcdf)
|
|
build_bin_test_no_prefix(tst_cdf5format)
|
|
build_bin_test_no_prefix(tst_nofill)
|
|
add_bin_test(nc_test tst_formatx_pnetcdf)
|
|
add_bin_test(nc_test tst_default_format_pnetcdf)
|
|
add_sh_test(nc_test run_pnetcdf_tests)
|
|
SET_TESTS_PROPERTIES(nc_test_run_pnetcdf_tests PROPERTIES RUN_SERIAL TRUE)
|
|
ENDIF()
|
|
|
|
IF(LARGE_FILE_TESTS)
|
|
SET(TESTS ${TESTS} quick_large_files tst_big_var6 tst_big_var2 tst_big_rvar tst_big_var tst_large tst_large_cdf5)
|
|
IF(NOT MSVC)
|
|
SET(TESTS ${TESTS} large_files)
|
|
ENDIF()
|
|
|
|
ENDIF()
|
|
|
|
SET(TESTFILES ${TESTFILES} tst_diskless tst_diskless3 tst_diskless4 tst_diskless5 tst_inmemory tst_open_mem)
|
|
IF(USE_HDF5)
|
|
SET(TESTFILES ${TESTFILES} tst_diskless2)
|
|
SET(TESTS ${TESTS} tst_diskless6)
|
|
ENDIF()
|
|
|
|
# Build executables required for the shell scripts.
|
|
FOREACH(BINFILE ${TESTFILES})
|
|
build_bin_test(${BINFILE})
|
|
ENDFOREACH()
|
|
|
|
# Process single-file test files.
|
|
FOREACH(CTEST ${TESTS})
|
|
add_bin_test(nc_test ${CTEST})
|
|
ENDFOREACH()
|
|
|
|
ADD_TEST(nc_test ${EXECUTABLE_OUTPUT_PATH}/nc_test)
|
|
|
|
IF(BUILD_UTILITIES)
|
|
|
|
add_sh_test(nc_test run_diskless)
|
|
IF(BUILD_MMAP)
|
|
add_sh_test(nc_test run_mmap)
|
|
IF(HAVE_BASH)
|
|
SET_TESTS_PROPERTIES(nc_test_run_mmap PROPERTIES RUN_SERIAL TRUE)
|
|
ENDIF(HAVE_BASH)
|
|
ENDIF(BUILD_MMAP)
|
|
add_sh_test(nc_test run_diskless5)
|
|
add_sh_test(nc_test run_inmemory)
|
|
IF(LARGE_FILE_TESTS)
|
|
IF(NOT USE_PARALLEL)
|
|
add_sh_test(nc_test run_diskless2)
|
|
ENDIF()
|
|
ENDIF()
|
|
|
|
IF(ENABLE_BYTERANGE)
|
|
IF(ENABLE_EXTERNAL_SERVER_TESTS)
|
|
build_bin_test_no_prefix(tst_byterange)
|
|
add_sh_test(nc_test test_byterange)
|
|
ENDIF()
|
|
ENDIF()
|
|
|
|
IF(BUILD_MMAP)
|
|
add_sh_test(nc_test run_mmap)
|
|
ENDIF()
|
|
|
|
ENDIF(BUILD_UTILITIES)
|
|
|
|
# Copy some test files from current source dir to out-of-tree build dir.
|
|
FILE(GLOB COPY_FILES ${CMAKE_CURRENT_SOURCE_DIR}/*.nc ${CMAKE_CURRENT_SOURCE_DIR}/*.sh)
|
|
FILE(COPY ${COPY_FILES} DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/)
|
|
IF(MSVC)
|
|
#MESSAGE(STATUS "XXX")
|
|
#MESSAGE(STATUS "${COPY_FILES}")
|
|
#MESSAGE(STATUS "${RUNTIME_OUTPUT_DIRECTORY}")
|
|
FILE(COPY ${COPY_FILES} DESTINATION ${RUNTIME_OUTPUT_DIRECTORY}/)
|
|
ENDIF()
|
|
|
|
|
|
## Specify files to be distributed by 'make dist'
|
|
FILE(GLOB CUR_EXTRA_DIST RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/*.c ${CMAKE_CURRENT_SOURCE_DIR}/*.h ${CMAKE_CURRENT_SOURCE_DIR}/*.sh)
|
|
SET(CUR_EXTRA_DIST ${CUR_EXTRA_DIST} CMakeLists.txt Makefile.am)
|
|
SET(CUR_EXTRA_DIST ${CUR_EXTRA_DIST} test_get.m4 test_put.m4 test_read.m4 test_write.m4 ref_tst_diskless2.cdl tst_diskless5.cdl
|
|
ref_tst_diskless3_create.cdl ref_tst_diskless3_open.cdl
|
|
ref_tst_http_nc3.cdl ref_tst_http_nc4a.cdl ref_tst_http_nc4b.cdl ref_tst_http_nc4c.cdl)
|
|
ADD_EXTRA_DIST("${CUR_EXTRA_DIST}")
|