ssciwr · lkeegan · Oct 31, 2023 · Oct 30, 2023 · Oct 30, 2023 · Oct 30, 2023
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -13,6 +13,7 @@ concurrency:
 
 env:
   BUILD_TYPE: Release
+  HAMMING_WITH_SSE2: OFF
   HAMMING_WITH_AVX2: OFF
   HAMMING_WITH_AVX512: OFF
   HAMMING_WITH_OPENMP: OFF
@@ -29,6 +30,8 @@ jobs:
             open-mp: "ON"
           - os: macos-latest
             open-mp: "OFF"
+          - os: macos-arm64-ssc
+            open-mp: "OFF"
           - os: windows-latest
             open-mp: "OFF"
 
@@ -48,7 +51,7 @@ jobs:
       - name: configure cmake
         shell: bash
         working-directory: ${{runner.workspace}}/build
-        run: cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DBUILD_TESTING=ON -DHAMMING_BUILD_BENCHMARKS=ON -DHAMMING_WITH_SSE2=ON -DHAMMING_WITH_AVX2=$HAMMING_WITH_AVX2 -DHAMMING_WITH_AVX512=$HAMMING_WITH_AVX512 -DHAMMING_BUILD_PYTHON=ON -DHAMMING_WITH_OPENMP=${{ matrix.open-mp }}
+        run: cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DBUILD_TESTING=ON -DHAMMING_BUILD_BENCHMARKS=ON -DHAMMING_WITH_SSE2=$HAMMING_WITH_SSE2 -DHAMMING_WITH_AVX2=$HAMMING_WITH_AVX2 -DHAMMING_WITH_AVX512=$HAMMING_WITH_AVX512 -DHAMMING_BUILD_PYTHON=ON -DHAMMING_WITH_OPENMP=${{ matrix.open-mp }}
 
       - name: build
         shell: bash

diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml
@@ -20,7 +20,7 @@ jobs:
 
     strategy:
       matrix:
-        os: [ubuntu-latest, macos-latest, windows-latest]
+        os: [ubuntu-latest, macos-latest, macos-arm64-ssc, windows-latest]
 
     steps:
       - uses: actions/checkout@v4

diff --git a/ext/cpu_features b/ext/cpu_features
diff --git a/include/hamming/hamming_impl.hh b/include/hamming/hamming_impl.hh
@@ -2,7 +2,11 @@
 #define _HAMMING_IMPL_HH
 
 #include <array>
+#if defined(__aarch64__) || defined(_M_ARM64)
+#include <cpuinfo_aarch64.h>
+#else
 #include <cpuinfo_x86.h>
+#endif
 #include <cstdint>
 #include <limits>
 #include <string>
@@ -93,9 +97,15 @@ std::vector<DistIntType> distances(std::vector<std::string> &data,
   if (clear_input_data) {
     data.clear();
   }
-  const auto features = cpu_features::GetX86Info().features;
   int (*distance_func)(const std::vector<GeneBlock> &a,
                        const std::vector<GeneBlock> &b) = distance_cpp;
+
+#if defined(__aarch64__) || defined(_M_ARM64)
+  const auto features = cpu_features::GetAarch64Info().features;
+#else
+  const auto features = cpu_features::GetX86Info().features;
+#endif
+
 #ifdef HAMMING_WITH_SSE2
   if (features.sse2) {
     distance_func = distance_sse2;

diff --git a/pyproject.toml b/pyproject.toml
@@ -43,7 +43,7 @@ HAMMING_BUILD_BENCHMARKS = "OFF"
 HAMMING_BUILD_PYTHON = "ON"
 
 [tool.cibuildwheel]
-skip = "*-manylinux_i686"
+skip = "*-manylinux_i686 cp38-macosx_arm64"
 test-skip = "pp* *-musllinux*"
 test-extras = "test"
 test-command = "pytest {project}/python/tests -v"
@@ -52,3 +52,7 @@ build-verbosity = 3
 
 [tool.cibuildwheel.linux]
 environment = { CMAKE_ARGS="-DHAMMING_WITH_OPENMP=ON" }
+
+[[tool.cibuildwheel.overrides]]
+select = "*-macosx_arm64*"
+environment = { CMAKE_ARGS="-DHAMMING_WITH_SSE2=OFF -DHAMMING_WITH_AVX2=OFF -DHAMMING_WITH_AVX512=OFF" }
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -1,7 +1,7 @@
 # Build hamming library
 add_library(hamming STATIC hamming.cc hamming_impl.cc)
 target_include_directories(hamming PUBLIC ../include)
-target_link_libraries(hamming PUBLIC CpuFeature::cpu_features)
+target_link_libraries(hamming PUBLIC CpuFeatures::cpu_features)
 if(HAMMING_WITH_OPENMP)
   find_package(OpenMP REQUIRED)
   target_compile_definitions(hamming PUBLIC HAMMING_WITH_OPENMP)
@@ -50,7 +50,7 @@ if(HAMMING_BUILD_BENCHMARKS)
     target_link_libraries(bench PRIVATE distance_avx512)
   endif()
   target_link_libraries(bench PRIVATE hamming benchmark::benchmark
-                                      CpuFeature::cpu_features)
+                                      CpuFeatures::cpu_features)
 endif()
 
 # Build tests
@@ -70,6 +70,6 @@ if(BUILD_TESTING)
     target_link_libraries(tests PRIVATE distance_avx512)
   endif()
   target_link_libraries(tests PRIVATE hamming Catch2::Catch2
-                                      CpuFeature::cpu_features)
+                                      CpuFeatures::cpu_features)
   catch_discover_tests(tests)
 endif()
+9 −4		.dockerignore
+1 −0		.github/workflows/Dockerfile
+26 −0		.github/workflows/aarch64_linux_bazel.yml
+1 −1		.github/workflows/amd64_freebsd_cmake.yml
+9 −9		.github/workflows/amd64_linux_bazel.yml
+35 −0		.github/workflows/amd64_macos_bazel.yml
+1 −1		.github/workflows/clang_format.yml
+57 −8		BUILD.bazel
+84 −43		CMakeLists.txt
+39 −29		README.md
+122 −0		bazel/ci/Makefile
+37 −0		bazel/ci/docker/Dockerfile
+7 −0		bazel/platforms.bzl
+1 −1		cmake/README.md
+4 −0		include/cpu_features_macros.h
+42 −0		include/cpuinfo_aarch64.h
+77 −0		include/cpuinfo_loongarch.h
+7 −0		include/cpuinfo_x86.h
+37 −0		include/internal/hwcaps.h
+61 −46		scripts/generate_badges.d
+118 −0		src/impl_aarch64__base_implementation.inl
+1 −75		src/impl_aarch64_linux_or_android.c
+88 −0		src/impl_aarch64_macos_or_iphone.c
+89 −0		src/impl_loongarch_linux.c
+15 −1		src/impl_x86__base_implementation.inl
+9 −0		src/utils/list_cpu_features.c
+17 −2		test/CMakeLists.txt
+129 −17		test/cpuinfo_aarch64_test.cc
+179 −0		test/cpuinfo_loongarch_test.cc
+61 −0		test/cpuinfo_x86_test.cc