rollback: check ZFP version number is greater than 0.5.3

cmake/DetectOptions.cmake

@@ -123,12 +123,11 @@ if(ZFP_FOUND)
   set(ADIOS2_HAVE_ZFP_CUDA ${ZFP_WITH_CUDA})
 
   # Older versions of ZFP
-  if(NOT ADIOS2_HAVE_ZFP_CUDA OR NOT ADIOS2_HAVE_ZFP_4D)
+  if(NOT ADIOS2_HAVE_ZFP_CUDA)
     get_target_property(ZFP_INCLUDE_DIRECTORIES zfp::zfp INTERFACE_INCLUDE_DIRECTORIES)
     set(CMAKE_REQUIRED_INCLUDES ${ZFP_INCLUDE_DIRECTORIES})
     set(CMAKE_REQUIRED_LIBRARIES zfp::zfp)
     include(CheckCSourceRuns)
-
     check_c_source_runs("
     #include <zfp.h>
 
@@ -138,32 +137,13 @@ if(ZFP_FOUND)
       return !zfp_stream_set_execution(stream, zfp_exec_cuda);
     }"
     ADIOS2_HAVE_ZFP_CUDA)
-
-    check_c_source_runs("
-    #include <zfp.h>
-
-    int main()
-    {
-      float *data = calloc(1024, sizeof(float));
-      zfp_field *field = zfp_field_4d((char *)(data), zfp_type_float,
-                                      4, 4, 4, 4);
-      zfp_field_free(field);
-      free(data);
-      return 0;
-    }"
-    ADIOS2_HAVE_ZFP_4D)
-
     unset(CMAKE_REQUIRED_INCLUDES)
     unset(CMAKE_REQUIRED_LIBRARIES)
   endif()
 
   if(ADIOS2_HAVE_ZFP_CUDA)
     add_compile_definitions(ADIOS2_HAVE_ZFP_CUDA)
   endif()
-
-  if(ADIOS2_HAVE_ZFP_4D)
-    add_compile_definitions(ADIOS2_HAVE_ZFP_4D)
-  endif()
 endif()
 
 # SZ

source/adios2/operator/compress/CompressZFP.cpp

@@ -20,6 +20,15 @@
 #define ZFP_DEFAULT_EXECUTION_POLICY zfp_exec_serial
 #endif
 
+/* CMake will make sure zfp >= 0.5.3
+   ZFP features 4D input data since version 0.5.4
+   https://zfp.readthedocs.io/en/release0.5.4/versions.html */
+#if  ZFP_VERSION_MAJOR > 0 \
+  || ZFP_VERSION_MINOR > 5 \
+  || (ZFP_VERSION_MINOR == 5 && ZFP_VERSION_PATCH > 3)
+#define ADIOS2_HAVE_ZFP_4D
+#endif
+
 namespace adios2
 {
 namespace core