[adios2] Update to 2.9.2 (#37750)

ports/adios2/portfile.cmake

@@ -1,11 +1,9 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO ornladios/ADIOS2
-    REF 473fe8c7d1a13c0746910361aa45ee1b96f57bfb
+    REF "v${VERSION}"
-    SHA512 ef8af30419cf57183b52ce9cb29613a381b06e16848a6d22d83c751c43b8485e504be90cead1381adcc92bb8d4912611083cd6d0b73d161b33f779231a041e6c
+    SHA512 05decc3ff14e7458df9ec16ca6230a9770ca992e7d0ce3a18b3c9295a19dad94d8a9367102e50347a9487c6a3f35a8d52fbaa6a6fd98807aaec9636e607541ee
     HEAD_REF master
-    PATCHES
-        zfp-version.patch # Backport zfp 1.0 support to v2.8.3 (https://github.com/ornladios/ADIOS2/pull/3312), included upstream in v2.9.0 when released.
 )
 
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
@@ -21,7 +19,7 @@ list(APPEND disabled_options SZ LIBPRESSIO MGARD DAOS DataMan DataSpaces MHS SST
 list(TRANSFORM disabled_options PREPEND "-DADIOS2_USE_")
 list(TRANSFORM disabled_options APPEND  ":BOOL=OFF")
 set(enabled_options "")
-list(APPEND enabled_options BZip2 Blosc PNG ZeroMQ HDF5 Endian_Reverse Sodium)
+list(APPEND enabled_options BZip2 Blosc2 PNG ZeroMQ HDF5 Endian_Reverse Sodium)
 list(TRANSFORM enabled_options PREPEND "-DADIOS2_USE_")
 list(TRANSFORM enabled_options APPEND  ":BOOL=OFF")
 

ports/adios2/vcpkg.json

@@ -1,7 +1,6 @@
 {
   "name": "adios2",
-  "version": "2.8.3",
+  "version": "2.9.2",
-  "port-version": 1,
   "description": "Next generation of ADIOS developed in the Exascale Computing Program",
   "homepage": "https://github.com/ornladios/ADIOS2",
   "license": "Apache-2.0",

ports/adios2/zfp-version.patch

@@ -1,65 +0,0 @@
-diff --git a/cmake/DetectOptions.cmake b/cmake/DetectOptions.cmake
-index d4e2e5dbf..80f231c16 100644
---- a/cmake/DetectOptions.cmake
-+++ b/cmake/DetectOptions.cmake
-@@ -89,9 +89,9 @@ endif()
- 
- # ZFP
- if(ADIOS2_USE_ZFP STREQUAL AUTO)
--  find_package(ZFP 0.5.1 CONFIG)
-+  find_package(ZFP CONFIG)
- elseif(ADIOS2_USE_ZFP)
--  find_package(ZFP 0.5.1 REQUIRED CONFIG)
-+  find_package(ZFP REQUIRED CONFIG)
- endif()
- if(ZFP_FOUND)
-   set(ADIOS2_HAVE_ZFP TRUE)
-diff --git a/source/adios2/operator/compress/CompressZFP.cpp b/source/adios2/operator/compress/CompressZFP.cpp
-index 77aaa6f08..e8162f97a 100644
---- a/source/adios2/operator/compress/CompressZFP.cpp
-+++ b/source/adios2/operator/compress/CompressZFP.cpp
-@@ -13,7 +13,7 @@
- #include <zfp.h>
- 
- /* CMake will make sure zfp >= 5.0.1 */
--#if ZFP_VERSION_RELEASE > 1 && !defined(ZFP_DEFAULT_EXECUTION_POLICY)
-+//#if ZFP_VERSION_RELEASE > 1 && !defined(ZFP_DEFAULT_EXECUTION_POLICY)
- 
- /* ZFP will default to SERIAL if CUDA is not available */
- #ifdef ADIOS2_HAVE_ZFP_CUDA
-@@ -22,7 +22,7 @@
- #define ZFP_DEFAULT_EXECUTION_POLICY zfp_exec_serial
- #endif
- 
--#endif
-+//#endif
- 
- namespace adios2
- {
-@@ -80,7 +80,7 @@ size_t CompressZFP::Operate(const char *dataIn, const Dims &blockStart,
-     PutParameter(bufferOut, bufferOutOffset,
-                  static_cast<uint8_t>(ZFP_VERSION_MINOR));
-     PutParameter(bufferOut, bufferOutOffset,
--                 static_cast<uint8_t>(ZFP_VERSION_RELEASE));
-+                 static_cast<uint8_t>(ZFP_VERSION_PATCH));
-     PutParameters(bufferOut, bufferOutOffset, m_Parameters);
-     // zfp V1 metadata end
- 
-@@ -302,7 +302,7 @@ zfp_stream *GetZFPStream(const Dims &dimensions, DataType type,
-     auto itPrecision = parameters.find("precision");
-     const bool hasPrecision = itPrecision != parameters.end();
- 
--#if ZFP_VERSION_RELEASE > 1
-+//#if ZFP_VERSION_RELEASE > 1
-     auto itBackend = parameters.find("backend");
-     const bool hasBackend = itBackend != parameters.end();
- 
-@@ -332,7 +332,7 @@ zfp_stream *GetZFPStream(const Dims &dimensions, DataType type,
- 
-         zfp_stream_set_execution(stream, policy);
-     }
--#endif
-+//#endif
- 
-     if ((hasAccuracy && hasPrecision) || (hasAccuracy && hasRate) ||
-         (hasPrecision && hasRate) ||

versions/a-/adios2.json

@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "0735c00783c947889dca9782995411e5be690213",
+      "version": "2.9.2",
+      "port-version": 0
+    },
     {
       "git-tree": "fac4ec886b3d46f0a48ee44988fc8224bce59ad7",
       "version": "2.8.3",

versions/baseline.json

@@ -45,8 +45,8 @@
       "port-version": 0
     },
     "adios2": {
-      "baseline": "2.8.3",
+      "baseline": "2.9.2",
-      "port-version": 1
+      "port-version": 0
     },
     "advobfuscator": {
       "baseline": "2020-06-26",