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.
89 lines
2.8 KiB
CMake
89 lines
2.8 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.
|
|
add_definitions(-D"TOPSRCDIR=${CMAKE_CURRENT_SOURCE_DIR}/../")
|
|
add_definitions(-D"TOPBINDIR=${CMAKE_CURRENT_BINARY_DIR}/../")
|
|
|
|
remove_definitions(-DDLL_EXPORT)
|
|
# add_definitions(-D"TOPSRCDIR=${CMAKE_CURRENT_SOURCE_DIR}")
|
|
|
|
FILE(GLOB COPY_FILES ${CMAKE_CURRENT_SOURCE_DIR}/*.sh)
|
|
FILE(COPY ${COPY_FILES} DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/ FILE_PERMISSIONS OWNER_WRITE OWNER_READ OWNER_EXECUTE)
|
|
|
|
IF(ENABLE_TESTS)
|
|
|
|
IF(ENABLE_DAP_REMOTE_TESTS)
|
|
BUILD_BIN_TEST(findtestserver)
|
|
BUILD_BIN_TEST(pingurl)
|
|
ENDIF()
|
|
|
|
# Base tests
|
|
# The tests are set up as a combination of shell scripts and executables that
|
|
# must be run in a particular order. It is painful but will use macros to help
|
|
# keep it from being too bad.
|
|
# Binary Test Macro
|
|
|
|
IF(BUILD_UTILITIES)
|
|
add_sh_test(ncdap tst_ncdap3)
|
|
IF(HAVE_BASH)
|
|
SET_TESTS_PROPERTIES(ncdap_tst_ncdap3 PROPERTIES RUN_SERIAL TRUE)
|
|
ENDIF(HAVE_BASH)
|
|
ENDIF()
|
|
|
|
IF(NOT MSVC)
|
|
add_bin_env_test(ncdap t_dap3a)
|
|
add_bin_env_test(ncdap test_cvt)
|
|
add_bin_env_test(ncdap test_vara)
|
|
ENDIF()
|
|
|
|
IF(ENABLE_DAP_REMOTE_TESTS)
|
|
|
|
IF(BUILD_UTILITIES)
|
|
add_sh_test(ncdap tst_ber)
|
|
add_sh_test(ncdap tst_remote3)
|
|
IF(HAVE_BASH)
|
|
SET_TESTS_PROPERTIES(ncdap_tst_remote3 PROPERTIES RUN_SERIAL TRUE)
|
|
ENDIF(HAVE_BASH)
|
|
add_sh_test(ncdap tst_zero_len_var)
|
|
add_sh_test(ncdap tst_encode)
|
|
# not yet add_sh_test(ncdap tst_hyrax)
|
|
add_sh_test(ncdap tst_fillmismatch)
|
|
IF(ENABLE_DAP_LONG_TESTS)
|
|
add_sh_test(ncdap tst_longremote3)
|
|
SET_TESTS_PROPERTIES(ncdap_tst_longremote3 PROPERTIES RUN_SERIAL TRUE)
|
|
ENDIF(ENABLE_DAP_LONG_TESTS)
|
|
ENDIF(BUILD_UTILITIES)
|
|
IF(ENABLE_EXTERNAL_SERVER_TESTS)
|
|
add_bin_test(ncdap test_manyurls)
|
|
SET_TESTS_PROPERTIES(ncdap_test_manyurls PROPERTIES RUN_SERIAL TRUE)
|
|
ENDIF()
|
|
|
|
IF(ENABLE_DAP_AUTH_TESTS)
|
|
##obsolete add_bin_test(ncdap t_auth)
|
|
add_sh_test(ncdap testauth)
|
|
ENDIF()
|
|
|
|
add_bin_test(ncdap test_varm3)
|
|
add_bin_test(ncdap test_nstride_cached)
|
|
|
|
###
|
|
# This test relates to NCF-330 in
|
|
# the Unidata JIRA system.
|
|
###
|
|
#add_bin_test(ncdap t_ncf330)
|
|
|
|
ENDIF()
|
|
ENDIF()
|
|
|
|
ADD_SUBDIRECTORY(testdata3)
|
|
ADD_SUBDIRECTORY(expected3)
|
|
ADD_SUBDIRECTORY(expectremote3)
|
|
|
|
## 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} findtestserver.c.in CMakeLists.txt Makefile.am)
|
|
ADD_EXTRA_DIST("${CUR_EXTRA_DIST}")
|