Merge pull request #262 from t20100/fix-arm-build

Fixed blosc2 compile flags on ARM hosts; Prepare v4.1.1 release
silx-kit · Jan 23, 2023 · b53d70b · b53d70b
2 parents 2e48108 + 5cc6562
commit b53d70b
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 2 deletions.
diff --git 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
 -----------------
 

diff --git 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']

diff --git 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