mirror of
https://github.com/Unidata/netcdf-c.git
synced 2025-01-12 15:45:21 +08:00
74b40fd788
Re: https://github.com/zarr-developers/zarr-python/pull/716 The Zarr version 2 spec has been extended to include the ability to choose the dimension separator in chunk name keys. The legal separators has been extended from {'.'} to {'.' '/'}. So now it is possible to use a key like "0/1/2/0" for chunk names. This PR implements this for NCZarr. The V2 spec now says that this separator can be set on a per-variable basis. For now, I have chosen to allow this be set only globally by adding a key named "ZARR.DIMENSION_SEPARATOR=<char>" in the .daprc/.dodsrc/ncrc file. Currently, the only legal separator characters are '.' (the default) and '/'. On writing, this key will only be written if its value is different than the default. This change caused problems because supporting a separator of '/' is difficult to parse when keys/paths use '/' as the path separator. A test case was added for this. Additionally, make nczarr be enabled default by default. This required some additional changes so that if zip and/or AWS S3 sdk are unavailable, then they are disabled for NCZarr. In addition the following unrelated changes were made. 1. Tested that pure-zarr mode could read an nczarr formatted store. 1. The .rc file handling now merges all known .rc files (.ncrc,.daprc, and .dodsrc) in that order and using those in HOME first, then in current directory. For duplicate entries, the later ones override the earlier ones. This change is to remove some of the conflicts inherent in the current .rc file load process. A set of test cases was also added. 1. Re-order tests in configure.ac and CMakeLists.txt so that if libcurl is not found then the other options that depend upon it properly are disabled. 1. I decided that xarray support should be enabled by default for pure zarr. In order to allow disabling, I added a new mode flag "noxarray". 1. Certain test in nczarr_test depend on use of .dodsrc. In order for these to work when testing in parallel, some inter-test dependencies needed to be added. 1. Improved authorization testing to use changes in thredds.ucar.edu
108 lines
4.0 KiB
CMake
108 lines
4.0 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.
|
|
|
|
SET(abs_top_srcdir ${CMAKE_CURRENT_SOURCE_DIR})
|
|
|
|
remove_definitions(-DDLL_EXPORT)
|
|
|
|
FILE(GLOB COPY_FILES ${CMAKE_CURRENT_SOURCE_DIR}/*.sh
|
|
${CMAKE_CURRENT_SOURCE_DIR}/ref*.cdl
|
|
${CMAKE_CURRENT_SOURCE_DIR}/ref*.txt)
|
|
|
|
FILE(COPY ${COPY_FILES} DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/ FILE_PERMISSIONS OWNER_WRITE OWNER_READ OWNER_EXECUTE)
|
|
|
|
IF(ENABLE_TESTS)
|
|
|
|
SET(COMMONSRC ut_util.c ut_test.c)
|
|
IF(USE_X_GETOPT)
|
|
SET(COMMONSRC ${COMMONSRC} XGetopt.c)
|
|
ENDIF()
|
|
|
|
SET(TSTCOMMONSRC tst_utils.c)
|
|
IF(USE_X_GETOPT)
|
|
SET(TSTCOMMONSRC ${TSTCOMMONSRC} XGetopt.c)
|
|
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.
|
|
|
|
BUILD_BIN_TEST(ut_map ${COMMONSRC})
|
|
BUILD_BIN_TEST(ut_mapapi ${COMMONSRC})
|
|
BUILD_BIN_TEST(ut_json ${COMMONSRC})
|
|
BUILD_BIN_TEST(ut_projections ${COMMONSRC})
|
|
BUILD_BIN_TEST(ut_chunking ${COMMONSRC})
|
|
BUILD_BIN_TEST(tst_zchunks ${COMMONSRC})
|
|
BUILD_BIN_TEST(tst_zchunks2 ${COMMONSRC})
|
|
BUILD_BIN_TEST(tst_zchunks3 ${COMMONSRC})
|
|
BUILD_BIN_TEST(tst_fillonlyz ${TSTCOMMONSRC})
|
|
|
|
TARGET_INCLUDE_DIRECTORIES(ut_map PUBLIC ../libnczarr)
|
|
TARGET_INCLUDE_DIRECTORIES(ut_mapapi PUBLIC ../libnczarr)
|
|
TARGET_INCLUDE_DIRECTORIES(ut_json PUBLIC ../libnczarr)
|
|
TARGET_INCLUDE_DIRECTORIES(ut_projections PUBLIC ../libnczarr)
|
|
TARGET_INCLUDE_DIRECTORIES(ut_chunking PUBLIC ../libnczarr)
|
|
TARGET_INCLUDE_DIRECTORIES(tst_zchunks PUBLIC ../libnczarr)
|
|
TARGET_INCLUDE_DIRECTORIES(tst_zchunks2 PUBLIC ../libnczarr)
|
|
TARGET_INCLUDE_DIRECTORIES(tst_zchunks3 PUBLIC ../libnczarr)
|
|
TARGET_INCLUDE_DIRECTORIES(tst_fillonlyz PUBLIC ../libnczarr)
|
|
|
|
# Helper programs for testing
|
|
BUILD_BIN_TEST(zmapio ${COMMONSRC})
|
|
TARGET_INCLUDE_DIRECTORIES(zmapio PUBLIC ../libnczarr)
|
|
BUILD_BIN_TEST(zhex)
|
|
BUILD_BIN_TEST(zisjson)
|
|
TARGET_INCLUDE_DIRECTORIES(zisjson PUBLIC ../libnczarr)
|
|
BUILD_BIN_TEST(zs3parse ${COMMONSRC})
|
|
TARGET_INCLUDE_DIRECTORIES(zs3parse PUBLIC ../libnczarr)
|
|
if(ENABLE_NCZARR_S3)
|
|
BUILD_BIN_TEST(s3util ${COMMONSRC})
|
|
TARGET_INCLUDE_DIRECTORIES(s3util PUBLIC ../libnczarr)
|
|
endif()
|
|
|
|
SET(ncdumpchunks_SOURCE ncdumpchunks.c)
|
|
IF(USE_X_GETOPT)
|
|
SET(ncdumpchunks_SOURCE ${ncdumpchunks_SOURCE} XGetopt.c)
|
|
ENDIF()
|
|
BUILD_BIN_TEST(ncdumpchunks ${ncdumpchunks_SOURCE})
|
|
TARGET_INCLUDE_DIRECTORIES(ncdumpchunks PUBLIC ../libnczarr)
|
|
|
|
IF(BUILD_UTILITIES)
|
|
add_sh_test(nczarr_test run_ut_map)
|
|
add_sh_test(nczarr_test run_ut_mapapi)
|
|
add_sh_test(nczarr_test run_ut_misc)
|
|
add_sh_test(nczarr_test run_ut_chunk)
|
|
IF(USE_HDF5)
|
|
add_sh_test(nczarr_test run_nccopyz)
|
|
add_sh_test(nczarr_test run_fillonlyz)
|
|
ENDIF()
|
|
add_sh_test(nczarr_test run_ncgen4)
|
|
add_sh_test(nczarr_test run_purezarr)
|
|
add_sh_test(nczarr_test run_interop)
|
|
add_sh_test(nczarr_test run_misc)
|
|
|
|
BUILD_BIN_TEST(tst_chunkcases ${TSTCOMMONSRC})
|
|
TARGET_INCLUDE_DIRECTORIES(tst_chunkcases PUBLIC ../libnczarr)
|
|
add_sh_test(nczarr_test run_chunkcases)
|
|
|
|
if(ENABLE_NCZARR_S3)
|
|
add_sh_test(nczarr_test run_s3_cleanup)
|
|
ENDIF()
|
|
SET_TESTS_PROPERTIES(nczarr_test_run_chunkcases PROPERTIES DEPENDS "nczarr_test_run_misc")
|
|
SET_TESTS_PROPERTIES(nczarr_test_run_misc PROPERTIES DEPENDS "nczarr_test_run_interop")
|
|
SET_TESTS_PROPERTIES(nczarr_test_run_interop PROPERTIES DEPENDS "nczarr_test_run_purezarr")
|
|
|
|
ENDIF(BUILD_UTILITIES)
|
|
|
|
ENDIF(ENABLE_TESTS)
|
|
|
|
## 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 ${CMAKE_CURRENT_SOURCE_DIR}/*.cdl)
|
|
SET(CUR_EXTRA_DIST ${CUR_EXTRA_DIST} CMakeLists.txt Makefile.am zmapio.c zhex.c ncdumpchunks.c)
|
|
ADD_EXTRA_DIST("${CUR_EXTRA_DIST}")
|