Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade c-blosc to v1.21.4 #24

Merged
merged 4 commits into from
May 26, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/3rdParty/cblosc/inc/blosc-export.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

Author: Francesc Alted <[email protected]>

See LICENSES/BLOSC.txt for details about copyright and rights to use.
See LICENSE.txt for details about copyright and rights to use.
**********************************************************************/
#ifndef BLOSC_EXPORT_H
#define BLOSC_EXPORT_H
Expand Down
18 changes: 8 additions & 10 deletions src/3rdParty/cblosc/inc/blosc.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

Author: Francesc Alted <[email protected]>

See LICENSES/BLOSC.txt for details about copyright and rights to use.
See LICENSE.txt for details about copyright and rights to use.
**********************************************************************/
#ifndef BLOSC_H
#define BLOSC_H
Expand All @@ -20,13 +20,11 @@ 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 4 /* for tweaks, bug-fixes, or development */

#define BLOSC_VERSION_STRING "1.21.0" /* string version. Sync with above! */
#define BLOSC_VERSION_STRING "1.21.4" /* string version. Sync with above! */
#define BLOSC_VERSION_REVISION "$Rev$" /* revision version */
#define BLOSC_VERSION_DATE "$Date:: 2020-12-22 #$" /* date version */

#define BLOSCLZ_VERSION_STRING "2.3.0" /* the internal compressor version */
#define BLOSC_VERSION_DATE "$Date:: 2023-05-16 #$" /* date version */

/* The *_FORMAT symbols should be just 1-byte long */
#define BLOSC_VERSION_FORMAT 2 /* Blosc format version, starting at 1 */
Expand Down Expand Up @@ -171,13 +169,13 @@ extern "C"

A negative return value means that an internal error happened. This
should never happen. If you see this, please report it back
together with the buffer data causing this and compression properties.
together with the buffer data causing this and compression settings.

Environment variables
---------------------

blosc_compress() honors different environment variables to control
internal parameters without the need of doing that programatically.
internal parameters without the need of doing that programmatically.
Here are the ones supported:

BLOSC_CLEVEL=(INTEGER): This will overwrite the `clevel` parameter
Expand Down Expand Up @@ -244,7 +242,7 @@ extern "C"

A negative return value means that an internal error happened. This
should never happen. If you see this, please report it back
together with the buffer data causing this and compression properties.
together with the buffer data causing this and compression settings.
*/
BLOSC_EXPORT int blosc_compress_ctx(int clevel,
int doshuffle,
Expand Down Expand Up @@ -277,7 +275,7 @@ extern "C"
---------------------

blosc_decompress() honors different environment variables to control
internal parameters without the need of doing that programatically.
internal parameters without the need of doing that programmatically.
Here are the ones supported:

BLOSC_NTHREADS=(INTEGER): This will call
Expand Down
Binary file modified src/3rdParty/cblosc/lib/linux-amd64/libblosc.a
Binary file not shown.
8 changes: 4 additions & 4 deletions src/3rdParty/cblosc/lib/osx/README.md
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
The library here was built as follows.

Against v1.21.3 (98aad98) of the c-blosc source hosted at:
Against v1.21.4 (2c2f9bd) of the c-blosc source hosted at:
https://github.com/Blosc/c-blosc

It's a universal binary compiled for `arm64` and `x86_64`.

If you're rebuilding this later, configure with:

```
CMAKE_OSX_ARCHITECTURE="arm64;x86_64"
CMAKE_OSX_ARCHITECTURES="arm64;x86_64"
```

The compiler used was:

```
Apple clang version 14.0.0 (clang-1400.0.29.202)
Target: arm64-apple-darwin22.3.0
Apple clang version 14.0.3 (clang-1403.0.22.14.1)
Target: arm64-apple-darwin22.5.0
Thread model: posix
```
Binary file modified src/3rdParty/cblosc/lib/osx/libblosc.a
Binary file not shown.
Binary file modified src/3rdParty/cblosc/lib/win64/libblosc-debug.lib
Binary file not shown.
Binary file modified src/3rdParty/cblosc/lib/win64/libblosc.lib
Binary file not shown.
Binary file modified src/3rdParty/cblosc/lib/win64/libblosc.pdb
Binary file not shown.