From 7c54662df37cdb2cf457cfd5484b9d75a04f7b29 Mon Sep 17 00:00:00 2001 From: Thomas VINCENT Date: Mon, 23 Jan 2023 11:13:18 +0100 Subject: [PATCH 1/3] Add blosc2 compile flags on ARM hosts --- setup.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 105ef8a7..d2c17549 100644 --- a/setup.py +++ b/setup.py @@ -868,12 +868,17 @@ def get_blosc2_plugin(): sources = glob(f'{blosc2_dir}/blosc/*.c') include_dirs = [blosc2_dir, f'{blosc2_dir}/blosc', f'{blosc2_dir}/include'] define_macros = [('SHUFFLE_NEON_ENABLED', 1)] + extra_compile_args = [] extra_link_args = [] libraries = [] if platform.machine() == 'ppc64le': define_macros.append(('SHUFFLE_ALTIVEC_ENABLED', 1)) define_macros.append(('NO_WARN_X86_INTRINSICS', None)) + if HostConfig.ARCH == 'ARM_8': + extra_compile_args += ['-flax-vector-conversions'] + if HostConfig.ARCH == 'ARM_7': + extra_compile_args += ['-mfpu=neon', '-flax-vector-conversions'] # compression libs # lz4 @@ -895,7 +900,7 @@ def get_blosc2_plugin(): include_dirs += get_zstd_clib('include_dirs') define_macros.append(('HAVE_ZSTD', 1)) - extra_compile_args = ['-std=gnu99'] # Needed to build manylinux1 wheels + extra_compile_args += ['-std=gnu99'] # Needed to build manylinux1 wheels extra_compile_args += ['-O3', '-ffast-math'] extra_compile_args += ['/Ox', '/fp:fast'] extra_compile_args += ['-pthread'] From 85d9a97d8ec1240b8b2c53a3992a3b409c8fa35c Mon Sep 17 00:00:00 2001 From: Thomas VINCENT Date: Mon, 23 Jan 2023 12:32:19 +0100 Subject: [PATCH 2/3] Update changelog --- CHANGELOG.rst | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index e54e4918..bab042f3 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -1,3 +1,11 @@ +4.1.1: 23/01/2023 +----------------- + +This is a bug fix release: + +- Fixed **c-blosc2** compilation on ARM architecture (PR #262) +- Updated continuous integration tests (PR #261) + 4.1.0: 17/01/2023 ----------------- From 5cc65629dfb2ea0ac5fe800dab67ffe89bb906d0 Mon Sep 17 00:00:00 2001 From: Thomas VINCENT Date: Mon, 23 Jan 2023 12:32:32 +0100 Subject: [PATCH 3/3] Bump to 4.1.1 --- src/hdf5plugin/_version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/hdf5plugin/_version.py b/src/hdf5plugin/_version.py index c0b16f8c..9abc56e7 100644 --- a/src/hdf5plugin/_version.py +++ b/src/hdf5plugin/_version.py @@ -72,7 +72,7 @@ MAJOR = 4 MINOR = 1 -MICRO = 0 +MICRO = 1 RELEV = "final" # <16 SERIAL = 0 # <16