Refactor Blosc operator to use c-blosc2

CMakeLists.txt

@@ -139,7 +139,6 @@ endif()
 
 include(CTest)
 
-adios_option(Blosc      "Enable support for Blosc transforms" AUTO)
 adios_option(Blosc2     "Enable support for c-blosc-2 transforms" AUTO)
 adios_option(BZip2      "Enable support for BZip2 transforms" AUTO)
 adios_option(ZFP        "Enable support for ZFP transforms" AUTO)
@@ -225,7 +224,9 @@ endif()
 
 
 set(ADIOS2_CONFIG_OPTS
-    BP5 DataMan DataSpaces HDF5 HDF5_VOL MHS SST CUDA Fortran MPI Python Blosc Blosc2 BZip2 LIBPRESSIO MGARD PNG SZ ZFP DAOS IME O_DIRECT Sodium Catalyst SysVShMem ZeroMQ Profiling Endian_Reverse GPU_Support
+    BP5 DataMan DataSpaces HDF5 HDF5_VOL MHS SST CUDA Fortran MPI Python Blosc2 
+    BZip2 LIBPRESSIO MGARD PNG SZ ZFP DAOS IME O_DIRECT Sodium Catalyst SysVShMem UCX ZeroMQ 
+    Profiling Endian_Reverse GPU_Support AWSSDK
 )
 
 GenerateADIOSHeaderConfig(${ADIOS2_CONFIG_OPTS})

cmake/DetectOptions.cmake

@@ -67,16 +67,6 @@ function(lists_get_prefix listVars outVar)
   set(${outVar} "${prefix}" PARENT_SCOPE)
 endfunction()
 
-# Blosc
-if(ADIOS2_USE_Blosc STREQUAL AUTO)
-  find_package(Blosc 1.7)
-elseif(ADIOS2_USE_Blosc)
-  find_package(Blosc 1.7 REQUIRED)
-endif()
-if(BLOSC_FOUND)
-  set(ADIOS2_HAVE_Blosc TRUE)
-endif()
-
 # Blosc2
 if(ADIOS2_USE_Blosc2 STREQUAL AUTO)
   find_package(Blosc2 2.4)

cmake/adios2-config-common.cmake.in

@@ -76,11 +76,6 @@ else()
 endif()
 
 if(NOT @BUILD_SHARED_LIBS@)
-  set(ADIOS2_HAVE_Blosc @ADIOS2_HAVE_Blosc@)
-  if(ADIOS2_HAVE_Blosc)
-    find_dependency(Blosc)
-  endif()
-
   set(ADIOS2_HAVE_Blosc2 @ADIOS2_HAVE_Blosc2@)
   if(ADIOS2_HAVE_Blosc2)
     find_dependency(Blosc2)

source/adios2/CMakeLists.txt

@@ -239,13 +239,8 @@ if(ADIOS2_HAVE_DataSpaces)
   target_link_libraries(adios2_core_mpi PRIVATE DataSpaces::DataSpaces)
 endif()
 
-if(ADIOS2_HAVE_Blosc)
-  target_sources(adios2_core PRIVATE operator/compress/CompressBlosc.cpp)
-  target_link_libraries(adios2_core PRIVATE Blosc::Blosc)
-endif()
-
 if(ADIOS2_HAVE_Blosc2)
-  target_sources(adios2_core PRIVATE operator/compress/CompressBlosc2.cpp)
+  target_sources(adios2_core PRIVATE operator/compress/CompressBlosc.cpp)
   target_link_libraries(adios2_core PRIVATE Blosc2::Blosc2)
 endif()
 

source/adios2/common/ADIOSTypes.h

@@ -480,8 +480,8 @@ constexpr char blockSize100k_9[] = "9";
 } // end namespace bzip2
 #endif
 
-// BBlosc PARAMETERS
-#ifdef ADIOS2_HAVE_BLOSC
+// Blosc PARAMETERS
+#ifdef ADIOS2_HAVE_BLOSC2
 
 constexpr char LosslessBlosc[] = "blosc";
 namespace blosc
@@ -528,54 +528,6 @@ constexpr char doshuffle_bitshuffle[] = "BLOSC_BITSHUFFLE";
 
 #endif
 
-// Blosc2 PARAMETERS
-#ifdef ADIOS2_HAVE_BLOSC2
-
-constexpr char LosslessBlosc2[] = "blosc2";
-namespace blosc2
-{
-
-namespace key
-{
-constexpr char nthreads[] = "nthreads";
-constexpr char compressor[] = "compressor";
-constexpr char clevel[] = "clevel";
-constexpr char doshuffle[] = "doshuffle";
-constexpr char blocksize[] = "blocksize";
-constexpr char threshold[] = "threshold";
-}
-
-namespace value
-{
-
-constexpr char compressor_blosclz[] = "blosclz";
-constexpr char compressor_lz4[] = "lz4";
-constexpr char compressor_lz4hc[] = "lz4hc";
-constexpr char compressor_snappy[] = "snappy";
-constexpr char compressor_zlib[] = "zlib";
-constexpr char compressor_zstd[] = "zstd";
-
-constexpr char clevel_0[] = "0";
-constexpr char clevel_1[] = "1";
-constexpr char clevel_2[] = "2";
-constexpr char clevel_3[] = "3";
-constexpr char clevel_4[] = "4";
-constexpr char clevel_5[] = "5";
-constexpr char clevel_6[] = "6";
-constexpr char clevel_7[] = "7";
-constexpr char clevel_8[] = "8";
-constexpr char clevel_9[] = "9";
-
-constexpr char doshuffle_shuffle[] = "BLOSC_SHUFFLE";
-constexpr char doshuffle_noshuffle[] = "BLOSC_NOSHUFFLE";
-constexpr char doshuffle_bitshuffle[] = "BLOSC_BITSHUFFLE";
-
-} // end namespace value
-
-} // end namespace blosc2
-
-#endif
-
 } // end namespace ops
 
 } // end namespace adios2

source/adios2/core/Operator.h

@@ -37,7 +37,6 @@ class Operator
         COMPRESS_SZ = 6,
         COMPRESS_ZFP = 7,
         COMPRESS_MGARDPLUS = 8,
-        COMPRESS_BLOSC2 = 9,
         CALLBACK_SIGNATURE1 = 51,
         CALLBACK_SIGNATURE2 = 52,
         PLUGIN_INTERFACE = 53,

source/adios2/operator/OperatorFactory.cpp

@@ -14,12 +14,8 @@
 #include "adios2/operator/plugin/PluginOperator.h"
 #include <numeric>
 
-#ifdef ADIOS2_HAVE_BLOSC
-#include "adios2/operator/compress/CompressBlosc.h"
-#endif
-
 #ifdef ADIOS2_HAVE_BLOSC2
-#include "adios2/operator/compress/CompressBlosc2.h"
+#include "adios2/operator/compress/CompressBlosc.h"
 #endif
 
 #ifdef ADIOS2_HAVE_BZIP2
@@ -80,8 +76,6 @@ std::string OperatorTypeToString(const Operator::OperatorType type)
         return "zfp";
     case Operator::PLUGIN_INTERFACE:
         return "plugin";
-    case Operator::COMPRESS_BLOSC2:
-        return "blosc2";
     default:
         return "null";
     }
@@ -96,7 +90,7 @@ std::shared_ptr<Operator> MakeOperator(const std::string &type,
 
     if (typeLowerCase == "blosc")
     {
-#ifdef ADIOS2_HAVE_BLOSC
+#ifdef ADIOS2_HAVE_BLOSC2
         ret = std::make_shared<compress::CompressBlosc>(parameters);
 #endif
     }
@@ -152,12 +146,6 @@ std::shared_ptr<Operator> MakeOperator(const std::string &type,
     {
         ret = std::make_shared<plugin::PluginOperator>(parameters);
     }
-    else if (typeLowerCase == "blosc2")
-    {
-#ifdef ADIOS2_HAVE_BLOSC2
-        ret = std::make_shared<compress::CompressBlosc2>(parameters);
-#endif
-    }
     else if (typeLowerCase == "null")
     {
         ret = std::make_shared<compress::CompressNull>(parameters);