blosc2 2.2.5__tar.gz → 2.2.6__tar.gz

{blosc2-2.2.5 → blosc2-2.2.6}/ANNOUNCE.rst

@@ -1,10 +1,9 @@
-Announcing Python-Blosc2 2.2.5
+Announcing Python-Blosc2 2.2.6
 ==============================
 
-This is a maintenance release, where we have upgraded to latest C-Blosc2 2.10.0.
-This provides fixes for a bytedelta filter (see
-https://github.com/Blosc/c-blosc2/pull/532).  Hence, an upgrade is recommended
-for everybody, most especially, if you are using bytedelta.
+This is a maintenance release, where we have upgraded to latest C-Blosc2 2.10.1.
+This provides fixes for dynamic plugins and the possibility to run them
+in multithreading mode (see PR #127).
 
 For more info, you can have a look at the release notes in:
 

{blosc2-2.2.5 → blosc2-2.2.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: blosc2
-Version: 2.2.5
+Version: 2.2.6
 Summary: Python wrapper for the C-Blosc2 library
 Author-email: Blosc Development Team <blosc@blosc.org>
 Maintainer-email: Blosc Development Team <blosc@blosc.org>

{blosc2-2.2.5 → blosc2-2.2.6}/RELEASE_NOTES.md

@@ -1,5 +1,21 @@
 # Release notes
 
+## Changes from 2.2.5 to 2.2.6
+
+* Multithreading checks only apply to Python defined codecs and filters.
+  Now it is possible to use multithreading with C codecs and filters plugins.
+  See PR #127.
+
+* New support for dynamic filters registry for Python.
+
+* Now params for codec and filter plugins are correctly initialized
+  when using `register_codec` and `register_filter` functions.
+
+* Some fixes for Cython 3.0.0.  However,compatibility with Cython 3.0.0
+  is not here yet, so build and install scripts are still requiring Cython<3.
+
+* Updated to latest C-Blosc2 2.10.1.
+
 ## Changes from 2.2.4 to 2.2.5
 
 * Updated to latest C-Blosc2 2.10.0.

blosc2-2.2.6/VERSION

@@ -0,0 +1 @@
+2.2.6

{blosc2-2.2.5 → blosc2-2.2.6}/blosc2/blosc2_ext.pyx

@@ -230,6 +230,8 @@ cdef extern from "blosc2.h":
         int tuner_id
         void* tuner_params
         c_bool instr_codec
+        void* codec_params
+        void* filter_params[BLOSC2_MAX_FILTERS]
 
     cdef const blosc2_cparams BLOSC2_CPARAMS_DEFAULTS
 
@@ -407,6 +409,7 @@ cdef extern from "blosc2.h":
 
     ctypedef struct blosc2_filter:
         uint8_t id
+        char* name
         blosc2_filter_forward_cb forward
         blosc2_filter_backward_cb backward
 
@@ -643,24 +646,34 @@ def get_blocksize():
 
 cdef _check_cparams(blosc2_cparams *cparams):
     if cparams.nthreads > 1:
-        if BLOSC2_USER_REGISTERED_CODECS_START <= cparams.compcode <= BLOSC2_USER_REGISTERED_CODECS_STOP:
-            raise ValueError("Cannot use multi-threading with user defined codecs")
-        elif any([BLOSC2_USER_REGISTERED_FILTERS_START <= filter <= BLOSC2_USER_REGISTERED_FILTERS_STOP
-                  for filter in cparams.filters]):
-            raise ValueError("Cannot use multi-threading with user defined filters")
-        elif cparams.prefilter != NULL:
+        if BLOSC2_USER_REGISTERED_CODECS_START <= cparams.compcode <= BLOSC2_USER_REGISTERED_CODECS_STOP\
+                and cparams.compcode in blosc2.ucodecs_registry.keys():
+            raise ValueError("Cannot use multi-threading with user defined Python codecs")
+
+        ufilters = [BLOSC2_USER_REGISTERED_FILTERS_START <= filter <= BLOSC2_USER_REGISTERED_FILTERS_STOP
+                  for filter in cparams.filters]
+        for i in range(len(ufilters)):
+            if ufilters[i] and cparams.filters[i] in blosc2.ufilters_registry.keys():
+                raise ValueError("Cannot use multi-threading with user defined Python filters")
+
+        if cparams.prefilter != NULL:
             raise ValueError("`nthreads` must be 1 when a prefilter is set")
 
 cdef _check_dparams(blosc2_dparams* dparams, blosc2_cparams* cparams=NULL):
     if cparams == NULL:
         return
     if dparams.nthreads > 1:
-        if BLOSC2_USER_REGISTERED_CODECS_START <= cparams.compcode <= BLOSC2_USER_REGISTERED_CODECS_STOP:
-            raise ValueError("Cannot use multi-threading with user defined codecs")
-        elif any([BLOSC2_USER_REGISTERED_FILTERS_START <= filter <= BLOSC2_USER_REGISTERED_FILTERS_STOP
-                  for filter in cparams.filters]):
-            raise ValueError("Cannot use multi-threading with user defined filters")
-        elif dparams.postfilter != NULL:
+        if BLOSC2_USER_REGISTERED_CODECS_START <= cparams.compcode <= BLOSC2_USER_REGISTERED_CODECS_STOP\
+                and cparams.compcode in blosc2.ucodecs_registry.keys():
+            raise ValueError("Cannot use multi-threading with user defined Python codecs")
+
+        ufilters = [BLOSC2_USER_REGISTERED_FILTERS_START <= filter <= BLOSC2_USER_REGISTERED_FILTERS_STOP
+                    for filter in cparams.filters]
+        for i in range(len(ufilters)):
+            if ufilters[i] and cparams.filters[i] in blosc2.ufilters_registry.keys():
+                raise ValueError("Cannot use multi-threading with user defined Python filters")
+
+        if dparams.postfilter != NULL:
             raise ValueError("`nthreads` must be 1 when a postfilter is set")
 
 
@@ -713,9 +726,13 @@ cdef create_cparams_from_kwargs(blosc2_cparams *cparams, kwargs):
 
     cparams.prefilter = NULL
     cparams.preparams = NULL
-    cparams.tuner_params = NULL
     cparams.tuner_id = 0
+    cparams.tuner_params = NULL
     cparams.instr_codec = False
+    cparams.codec_params = NULL
+    for i in range(len(filters)):
+        cparams.filter_params[i] = NULL
+
     _check_cparams(cparams)
 
 
@@ -1780,11 +1797,11 @@ def register_codec(codec_name, id, encoder=None, decoder=None, version=1):
     if encoder is None:
         codec.encoder = NULL
     else:
-        codec.encoder = general_encoder
+        codec.encoder = <blosc2_codec_encoder_cb> general_encoder
     if decoder is None:
         codec.decoder = NULL
     else:
-        codec.decoder = general_decoder
+        codec.decoder = <blosc2_codec_decoder_cb> general_decoder
 
     rc = blosc2_register_codec(&codec)
     if rc < 0:
@@ -1829,20 +1846,35 @@ cdef int general_backward(const uint8_t* input_buffer, uint8_t* output_buffer, i
     return BLOSC2_ERROR_SUCCESS
 
 
-def register_filter(id, forward, backward):
+def register_filter(id, forward, backward, filter_name):
     if id < BLOSC2_USER_REGISTERED_FILTERS_START or id > BLOSC2_USER_REGISTERED_FILTERS_STOP:
         raise ValueError("`id` must be between ", BLOSC2_USER_REGISTERED_FILTERS_START,
                          " and ", BLOSC2_USER_REGISTERED_FILTERS_STOP)
+    if (forward is None and backward is not None) or (forward is not None and backward is None):
+        raise ValueError("both encoder and decoder must be given, or none")
 
     cdef blosc2_filter filter
     filter.id = id
-    filter.forward = general_forward
-    filter.backward = general_backward
+    if forward is None:
+        filter.forward = NULL
+    else:
+        filter.forward = <blosc2_filter_forward_cb> general_forward
+    if backward is None:
+        filter.backward = NULL
+    else:
+        filter.backward = <blosc2_filter_backward_cb> general_backward
+    if filter_name is None and not forward and not backward:
+        raise ValueError("You need to pass the filter name or the forward and backward functions")
+    if filter_name:
+        filter_name_ = filter_name.encode() if isinstance(filter_name, str) else filter_name
+        filter.name = <char *> malloc(strlen(filter_name_) + 1)
+        strcpy(filter.name, filter_name_)
+
     rc = blosc2_register_filter(&filter)
     if rc < 0:
         raise RuntimeError("Error while registering filter")
-
-    blosc2.ufilters_registry[id] = (forward, backward)
+    if forward and backward:
+        blosc2.ufilters_registry[id] = (forward, backward)
 
 def _check_rc(rc, message):
     if rc < 0:

{blosc2-2.2.5 → blosc2-2.2.6}/blosc2/c-blosc2/ANNOUNCE.md

@@ -1,16 +1,12 @@
-# Announcing C-Blosc2 2.10.0
+# Announcing C-Blosc2 2.10.1
 A fast, compressed and persistent binary data store library for C.
 
 ## What is new?
 
-This is a maintenance release with a couple of important fixes.  The first
-is bytedelta, which receives a new ID (35), whereas the previous one (34)
-is still available for backward compatibility.  The second is a fix for
-the filter pipeline, which e.g. allows to use several shuffle filters in a row
-(thanks to Tom Birch). There are also several fixes for helping integration
-of C-Blosc2 in other projects (thanks to Alex Huebel).
-
-Due to the important fixes, an upgrade is recommended for all users.
+This is a maintenance release with also several improvements for helping
+integration of C-Blosc2 in other projects (thanks to Alex Huebel).  Also,
+`blosc2_remove_urlpath(const char *urlpath)` does not return an error
+when path does not exist.
 
 For more info, please see the release notes in:
 

blosc2-2.2.6/blosc2/c-blosc2/Blosc2Config.cmake.in

@@ -0,0 +1,84 @@
+# only add PUBLIC dependencies as well
+#   https://cmake.org/cmake/help/latest/manual/cmake-packages.7.html#creating-a-package-configuration-file
+include(CMakeFindDependencyMacro)
+
+# Search in <PackageName>_ROOT:
+#   https://cmake.org/cmake/help/v3.12/policy/CMP0074.html
+if(POLICY CMP0074)
+    cmake_policy(SET CMP0074 NEW)
+endif()
+
+# locate the installed FindABC.cmake modules
+list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake")
+
+# this section stores which configuration options were set
+set(HAVE_THREADS @Threads_FOUND@)
+set(HAVE_IPP @HAVE_IPP@)
+set(HAVE_ZLIB_NG @HAVE_ZLIB_NG@)
+set(DEACTIVATE_IPP @DEACTIVATE_IPP@)
+set(DEACTIVATE_ZLIB @DEACTIVATE_ZLIB@)
+set(DEACTIVATE_ZSTD @DEACTIVATE_ZSTD@)
+set(PREFER_EXTERNAL_LZ4 @PREFER_EXTERNAL_LZ4@)
+set(PREFER_EXTERNAL_ZLIB @PREFER_EXTERNAL_ZLIB@)
+set(PREFER_EXTERNAL_ZSTD @PREFER_EXTERNAL_ZSTD@)
+
+# find dependencies and their targets, which are used in our Blosc2Targets.cmake
+#   additionally, the Blosc2_..._FOUND variables are used to support
+#   find_package(Blosc2 ... COMPONENTS ... ...)
+#   this enables downstream projects to express the need for specific features.
+if(WIN32)
+    if(HAVE_THREADS)
+        find_dependency(Threads)
+        set(Blosc2_THREADS_FOUND TRUE)
+    else()
+        set(Blosc2_THREADS_FOUND FALSE)
+    endif()
+else()
+    find_dependency(Threads)
+    set(Blosc2_THREADS_FOUND TRUE)
+endif()
+
+if(NOT DEACTIVATE_IPP AND HAVE_IPP)
+    find_dependency(IPP)
+    set(Blosc2_IPP_FOUND FALSE)
+else()
+    set(Blosc2_IPP_FOUND TRUE)
+endif()
+
+if(PREFER_EXTERNAL_LZ4)
+    find_dependency(LZ4)
+endif()
+set(Blosc2_LZ4_FOUND TRUE)
+
+if(DEACTIVATE_ZLIB)
+    set(Blosc2_ZLIB_FOUND FALSE)
+elseif(NOT DEACTIVATE_ZLIB AND PREFER_EXTERNAL_ZLIB)
+    if(HAVE_ZLIB_NG)
+        find_dependency(ZLIB_NG)
+    else()
+        find_dependency(ZLIB)
+    endif()
+    set(Blosc2_ZLIB_FOUND TRUE)
+endif()
+
+if(DEACTIVATE_ZSTD)
+    set(Blosc2_ZSTD_FOUND FALSE)
+elseif(NOT PREFER_EXTERNAL_ZSTD AND PREFER_EXTERNAL_ZSTD)
+    find_dependency(ZSTD)
+    set(Blosc2_ZSTD_FOUND TRUE)
+endif()
+
+# define central Blosc2::blosc2_shared/static targets
+include("${CMAKE_CURRENT_LIST_DIR}/Blosc2Targets.cmake")
+
+# check if components are fulfilled and set Blosc2_<COMPONENT>_FOUND vars
+#   Blosc2_FIND_COMPONENTS is a list set by find_package(... COMPONENTS ... ...)
+#   likewise Blosc2_FIND_REQUIRED_... per component specified
+foreach(comp ${Blosc2_FIND_COMPONENTS})
+    if(NOT Blosc2_${comp}_FOUND)
+        if(Blosc2_FIND_REQUIRED_${comp})
+            set(Blosc2_FOUND FALSE)
+        endif()
+    endif()
+endforeach()
+

{blosc2-2.2.5 → blosc2-2.2.6}/blosc2/c-blosc2/CMakeLists.txt

@@ -385,23 +385,6 @@ if(NOT DEFINED BLOSC_INSTALL)
     endif()
 endif()
 
-# uninstall target
-if(BLOSC_INSTALL)
-    include(GNUInstallDirs)
-    configure_file(
-         "${CMAKE_CURRENT_SOURCE_DIR}/blosc2.pc.in"
-         "${CMAKE_CURRENT_BINARY_DIR}/blosc2.pc"
-         @ONLY)
-    install(FILES "${CMAKE_CURRENT_BINARY_DIR}/blosc2.pc"
-            DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig" COMPONENT DEV)
-    configure_file(
-        "${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake.in"
-        "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake"
-        @ONLY)
-    add_custom_target(uninstall
-        COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake)
-endif()
-
 # include directories
 include_directories(include)
 if(BUILD_PLUGINS)
@@ -440,6 +423,120 @@ if(BUILD_EXAMPLES)
     add_subdirectory(examples)
 endif()
 
+# collecting SOURCES is now complete
+if(BUILD_SHARED)
+    target_sources(blosc2_shared PRIVATE ${SOURCES})
+endif()
+if(BUILD_STATIC)
+    target_sources(blosc2_static PRIVATE ${SOURCES})
+endif()
+if(BUILD_TESTS)
+    target_sources(blosc_testing PRIVATE ${SOURCES})
+endif()
+
+# install targets
+if(BLOSC_INSTALL)
+    include(GNUInstallDirs)
+
+    # C++ files
+    install(FILES ${PROJECT_SOURCE_DIR}/include/blosc2.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} COMPONENT DEV)
+    install(FILES ${PROJECT_SOURCE_DIR}/include/b2nd.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} COMPONENT DEV)
+    install(FILES
+            ${PROJECT_SOURCE_DIR}/include/blosc2/blosc2-export.h
+            ${PROJECT_SOURCE_DIR}/include/blosc2/blosc2-common.h
+            ${PROJECT_SOURCE_DIR}/include/blosc2/blosc2-stdio.h
+            DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/blosc2 COMPONENT DEV)
+    if(BUILD_PLUGINS)
+        install(FILES
+                ${PROJECT_SOURCE_DIR}/include/blosc2/filters-registry.h
+                ${PROJECT_SOURCE_DIR}/include/blosc2/codecs-registry.h
+                ${PROJECT_SOURCE_DIR}/include/blosc2/tuners-registry.h
+                DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/blosc2 COMPONENT DEV)
+    endif()
+
+    if(BUILD_SHARED)
+        install(TARGETS blosc2_shared
+                LIBRARY COMPONENT LIB
+                ARCHIVE COMPONENT DEV
+                RUNTIME COMPONENT LIB)
+    endif()
+    if(BUILD_STATIC)
+        install(TARGETS blosc2_static COMPONENT DEV)
+    endif()
+
+    # config files
+    include(CMakePackageConfigHelpers)
+
+    # we need a general location for Unix and Windows to install our
+    # Blosc2Config.cmake files to. This is defined in CMake:
+    # https://cmake.org/cmake/help/latest/command/find_package.html#config-mode-search-procedure
+    if(NOT Blosc2_INSTALL_CMAKEDIR)
+        if(CMAKE_INSTALL_CMAKEDIR)
+            set(Blosc2_INSTALL_CMAKEDIR "${CMAKE_INSTALL_CMAKEDIR}/Blosc2")
+        else()
+            if(WIN32)
+                set(Blosc2_INSTALL_CMAKEDIR "cmake")
+            else()
+                set(Blosc2_INSTALL_CMAKEDIR "${CMAKE_INSTALL_LIBDIR}/cmake/Blosc2")
+            endif()
+        endif()
+    endif()
+
+    # CMake config file
+    # This stores our targets and find and populates the targets we depend on,
+    # including third party interface libraries that we added.
+    set(Blosc2_INSTALL_TARGET_NAMES)
+    if(BUILD_SHARED)
+        list(APPEND Blosc2_INSTALL_TARGET_NAMES blosc2_shared)
+    endif()
+    if(BUILD_STATIC)
+        list(APPEND Blosc2_INSTALL_TARGET_NAMES blosc2_static)
+    endif()
+    configure_file(
+        ${PROJECT_SOURCE_DIR}/Blosc2Config.cmake.in
+        ${CMAKE_CURRENT_BINARY_DIR}/Blosc2Config.cmake
+        @ONLY
+    )
+    install(TARGETS ${Blosc2_INSTALL_TARGET_NAMES}
+        EXPORT Blosc2Targets
+        LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+        ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+        RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+        INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
+    )
+    install(EXPORT Blosc2Targets
+        FILE Blosc2Targets.cmake
+        NAMESPACE Blosc2::
+        DESTINATION ${Blosc2_INSTALL_CMAKEDIR}
+    )
+    write_basic_package_version_file("Blosc2ConfigVersion.cmake"
+        VERSION ${BLOSC2_VERSION_STRING}
+        COMPATIBILITY SameMajorVersion
+    )
+    install(
+        FILES
+            ${CMAKE_CURRENT_BINARY_DIR}/Blosc2Config.cmake
+            ${CMAKE_CURRENT_BINARY_DIR}/Blosc2ConfigVersion.cmake
+        DESTINATION ${Blosc2_INSTALL_CMAKEDIR}
+    )
+
+    # pkg-config .pc file
+    configure_file(
+         "${CMAKE_CURRENT_SOURCE_DIR}/blosc2.pc.in"
+         "${CMAKE_CURRENT_BINARY_DIR}/blosc2.pc"
+         @ONLY)
+    install(FILES "${CMAKE_CURRENT_BINARY_DIR}/blosc2.pc"
+            DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig" COMPONENT DEV)
+
+    # uninstaller
+    configure_file(
+        "${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake.in"
+        "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake"
+        @ONLY)
+    add_custom_target(uninstall
+        COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake)
+endif()
+
 
 # packaging
 if(NOT BLOSC_IS_SUBPROJECT)

{blosc2-2.2.5 → blosc2-2.2.6}/blosc2/c-blosc2/RELEASE_NOTES.md

@@ -1,9 +1,23 @@
 Release notes for C-Blosc2
 ==========================
 
+Changes from 2.10.0 to 2.10.1
+=============================
+
+* `blosc2_remove_urlpath(const char *urlpath)` does not return an error
+  when path does not exist.
+
+* Changes in CMake installer to conserve targets and properties
+  on install, so CMake users do not need to write `FindBlosc2.cmake`
+  files anymore.  This also helps to preserve transitive dependencies on
+  CMake targets, especially useful for fully static builds, e.g., for
+  Python wheels.  Thanks to @ax3l (Axel Huebel). See PR #537.
+
+* Fix new typos.  Thanks to @DimitriPapadopoulos. See PR #538.
+
 
 Changes from 2.9.3 to 2.10.0
-===========================
+============================
 
 * bytedelta filter has been fixed. For backward compatibility, the old
   bytedelta filter is still available as `BLOSC_FILTER_BYTEDELTA_BUGGY`
@@ -22,7 +36,7 @@ Changes from 2.9.3 to 2.10.0
 
 * Minor fixes in the documentation.  Thanks to @ivilata (Ivan Vilata).
   See #523.
-* 
+
 
 Changes from 2.9.2 to 2.9.3
 ===========================

{blosc2-2.2.5 → blosc2-2.2.6}/blosc2/c-blosc2/THANKS.rst

@@ -30,4 +30,6 @@ Thanks
 
 * Nathan Moinvaziri for his outstanding work on the security side of the things via `fuzzer testing <https://google.github.io/oss-fuzz/>`_.
 
-* Marta Iborra for her implementation of sparse storage for persistent super-chunks.
+* Marta Iborra for her implementation of sparse storage for persistent super-chunks and her attention to detail in many other aspects of the library.
+
+* Dimitri Papadopoulos for an extensive set of improvements in documentation and code.

{blosc2-2.2.5 → blosc2-2.2.6}/blosc2/c-blosc2/bench/b2nd/CMakeLists.txt

@@ -12,5 +12,5 @@ foreach (source ${SOURCES})
     get_filename_component(target_name ${source} NAME_WE)
     set(target b2nd_${target_name})
     add_executable(${target} ${target_name}.c)
-    target_link_libraries(${target} blosc_testing ${LIBS})
+    target_link_libraries(${target} PUBLIC blosc_testing ${LIBS})
 endforeach (source)