Internal C-Blosc updated to 1.21.1

blosc/c-blosc/ANNOUNCE.rst

@@ -1,17 +1,15 @@
 ===============================================================
- Announcing C-Blosc 1.21.0
+ Announcing C-Blosc 1.21.1
  A blocking, shuffling and lossless compression library for C
 ===============================================================
 
 What is new?
 ============
 
-This is a maintenance release.  Vendored lz4 and zstd codecs have been
-updated to 1.9.3 and 1.4.8 respectively.
-
-Also, this should be the first release that is officially providing
-binary libraries via the Python wheels in its sibling project python-blosc.
-Thanks to Jeff Hammerbacher for his generous donation to make this happen.
+This is a maintenance release.  Fix pthread flag when linking on ppc64le.
+Vendored BloscLZ, Zlib and Zstd codecs have been updated to their latest
+versions too; this can bring important performance improvements, so if
+speed is a priority to you, an upgrade is recommended.
 
 For more info, please see the release notes in:
 

blosc/c-blosc/RELEASE_NOTES.rst

@@ -2,6 +2,17 @@
  Release notes for C-Blosc
 ===========================
 
+Changes from 1.21.0 to 1.21.1
+=============================
+
+* Fix pthread flag when linking on ppc64le.  See #318.  Thanks to Axel Huebl.
+
+* Updates in codecs (some bring important performance improvements):
+  * BloscLZ updated to 2.5.1.
+  * Zlib updated to 1.2.11
+  * Zstd updated to 1.5.0
+
+
 Changes from 1.20.1 to 1.21.0
 =============================
 

blosc/c-blosc/blosc/CMakeLists.txt

@@ -32,7 +32,7 @@ if(NOT DEACTIVATE_ZLIB)
     if (ZLIB_FOUND)
         set(BLOSC_INCLUDE_DIRS ${BLOSC_INCLUDE_DIRS} ${ZLIB_INCLUDE_DIR})
     else(ZLIB_FOUND)
-        set(ZLIB_LOCAL_DIR ${INTERNAL_LIBS}/zlib-1.2.8)
+        set(ZLIB_LOCAL_DIR ${INTERNAL_LIBS}/zlib-1.2.11)
         set(BLOSC_INCLUDE_DIRS ${BLOSC_INCLUDE_DIRS} ${ZLIB_LOCAL_DIR})
     endif(ZLIB_FOUND)
 endif(NOT DEACTIVATE_ZLIB)
@@ -41,7 +41,7 @@ if (NOT DEACTIVATE_ZSTD)
     if (ZSTD_FOUND)
         set(BLOSC_INCLUDE_DIRS ${BLOSC_INCLUDE_DIRS} ${ZSTD_INCLUDE_DIR})
     else (ZSTD_FOUND)
-        set(ZSTD_LOCAL_DIR ${INTERNAL_LIBS}/zstd-1.4.8)
+        set(ZSTD_LOCAL_DIR ${INTERNAL_LIBS}/zstd-1.5.0)
         set(BLOSC_INCLUDE_DIRS ${BLOSC_INCLUDE_DIRS} ${ZSTD_LOCAL_DIR} ${ZSTD_LOCAL_DIR}/common)
     endif (ZSTD_FOUND)
 endif (NOT DEACTIVATE_ZSTD)
@@ -65,19 +65,28 @@ set(SOURCES ${SOURCES} shuffle.c)
 set(lib_dir lib${LIB_SUFFIX})
 set(version_string ${BLOSC_VERSION_MAJOR}.${BLOSC_VERSION_MINOR}.${BLOSC_VERSION_PATCH})
 
-set(CMAKE_THREAD_PREFER_PTHREAD TRUE)
+set(CMAKE_THREAD_PREFER_PTHREAD TRUE) # pre 3.1
+set(THREADS_PREFER_PTHREAD_FLAG TRUE) # CMake 3.1+
 if(WIN32)
     # try to use the system library
     find_package(Threads)
     if(NOT Threads_FOUND)
         message(STATUS "using the internal pthread library for win32 systems.")
         set(SOURCES ${SOURCES} win32/pthread.c)
     else(NOT Threads_FOUND)
-        set(LIBS ${LIBS} ${CMAKE_THREAD_LIBS_INIT})
+        if(CMAKE_VERSION VERSION_LESS 3.1)
+            set(LIBS ${LIBS} ${CMAKE_THREAD_LIBS_INIT})
+        else()
+            set(LIBS ${LIBS} Threads::Threads)
+        endif()
     endif(NOT Threads_FOUND)
 else(WIN32)
     find_package(Threads REQUIRED)
-    set(LIBS ${LIBS} ${CMAKE_THREAD_LIBS_INIT})
+    if(CMAKE_VERSION VERSION_LESS 3.1)
+        set(LIBS ${LIBS} ${CMAKE_THREAD_LIBS_INIT})
+    else()
+        set(LIBS ${LIBS} Threads::Threads)
+    endif()
 endif(WIN32)
 
 if(NOT DEACTIVATE_LZ4)
@@ -186,13 +195,6 @@ if (BUILD_TESTS)
     set_property(
         TARGET blosc_shared_testing
         APPEND PROPERTY COMPILE_DEFINITIONS BLOSC_TESTING)
-    # TEMP : CMake doesn't automatically add -lpthread here like it does
-    # for the blosc_shared target. Force it for now.
-    if(UNIX)
-        set_property(
-            TARGET blosc_shared_testing
-            APPEND PROPERTY LINK_FLAGS "-lpthread")
-    endif()
 endif()
 
 if (BUILD_SHARED)

blosc/c-blosc/blosc/blosc.c

@@ -651,7 +651,7 @@ static int blosc_c(const struct blosc_context* context, int32_t blocksize,
     }
     if (context->compcode == BLOSC_BLOSCLZ) {
       cbytes = blosclz_compress(context->clevel, _tmp+j*neblock, neblock,
-                                dest, maxout);
+                                dest, maxout, !dont_split);
     }
     #if defined(HAVE_LZ4)
     else if (context->compcode == BLOSC_LZ4) {

blosc/c-blosc/blosc/blosc.h

@@ -19,13 +19,13 @@ extern "C" {
 /* Version numbers */
 #define BLOSC_VERSION_MAJOR    1    /* for major interface/format changes  */
 #define BLOSC_VERSION_MINOR    21   /* for minor interface/format changes  */
-#define BLOSC_VERSION_RELEASE  0    /* for tweaks, bug-fixes, or development */
+#define BLOSC_VERSION_RELEASE  1    /* for tweaks, bug-fixes, or development */
 
-#define BLOSC_VERSION_STRING   "1.21.0"  /* string version.  Sync with above! */
+#define BLOSC_VERSION_STRING   "1.21.1"  /* string version.  Sync with above! */
 #define BLOSC_VERSION_REVISION "$Rev$"   /* revision version */
-#define BLOSC_VERSION_DATE     "$Date:: 2020-12-22 #$"    /* date version */
+#define BLOSC_VERSION_DATE     "$Date:: 2021-10-06 #$"    /* date version */
 
-#define BLOSCLZ_VERSION_STRING "2.3.0"   /* the internal compressor version */
+#define BLOSCLZ_VERSION_STRING "2.5.1"   /* the internal compressor version */
 
 /* The *_FORMAT symbols should be just 1-byte long */
 #define BLOSC_VERSION_FORMAT    2   /* Blosc format version, starting at 1 */