Improve wheel build (#88)

* Try it

* Fix knn's argsort

* Fix argsort in util.hpp

* Let's see what happens for cp > 38

* Use manylinux2010

* Skil i686 build for cp36

* aarch wheels requires too much time.

* It seems to work

* Fix Readme

Co-authored-by: tohtsky <you@example.com>

Author: tohtsky

.github/workflows/wheels.yml

@@ -6,6 +6,8 @@ on:
   release:
     types:
       - created
+env:
+  cibuildwheel_version: "2.2.2"
 jobs:
   build_sdist:
     name: Build source distribution
@@ -26,26 +28,109 @@ jobs:
   build_wheels:
     name: Build wheels on ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
+    env:
+      MACOSX_DEPLOYMENT_TARGET: "10.9"
+      CIBW_BUILD_VERBOSITY: "1"
+      CIBW_BUILD: "${{ matrix.cibw.build || '*' }}"
+      CIBW_SKIP: "${{ matrix.cibw.skip || '' }}"
+      CIBW_ENVIRONMENT: "${{ matrix.cibw.env || '' }}"
+      CIBW_TEST_COMMAND: pytest {project}/tests
+      CIBW_TEST_REQUIRES: pytest
+      CIBW_MANYLINUX_X86_64_IMAGE: "${{ matrix.cibw.manylinux_image }}"
+      CIBW_MANYLINUX_I686_IMAGE: "${{ matrix.cibw.manylinux_image }}"
+      CIBW_MANYLINUX_AARCH64_IMAGE: "${{ matrix.cibw.manylinux_image }}"
+      CIBW_ARCHS_LINUX: "${{ matrix.cibw.arch || 'auto' }}"
+      CIBW_ARCHS_MACOS: "${{ matrix.cibw.arch || 'auto' }}"
     strategy:
       matrix:
-        os: [ubuntu-20.04, macOS-10.15, windows-2019]
+        include:
+          - os: macos-10.15
+            name: mac
+            cibw:
+              arch: x86_64
+              env: CFLAGS='-march=core-avx-i'
+              build: "cp37* cp38*"
+
+          - os: macos-10.15
+            name: mac-arm
+            cibw:
+              arch: universal2
+              build: "cp39* cp310*"
+              env: ''
+
+          - os: ubuntu-20.04
+            name: manylinux1
+            cibw:
+# include python 3.6 because I want to run it on sagemaker notebook instance.
+              build: "cp36* cp37*"
+              skip: "*musllinux*"
+              manylinux_image: manylinux2010
+              env: CFLAGS='-march=core-avx-i'
+              arch: auto64
+
+          - os: ubuntu-20.04
+            name: manylinux2014
+            cibw:
+              build: "cp38* cp39* cp310"
+              skip: "*musllinux*"
+              manylinux_image: manylinux2014
+              env: CFLAGS='-march=core-avx-i'
+              arch: auto64
+
+          - os: ubuntu-20.04
+            name: manylinux_aarch64_cp37
+            cibw:
+              build: "cp37*"
+              skip: "*musllinux*"
+              manylinux_image: manylinux2014
+              arch: aarch64
+
+          - os: ubuntu-20.04
+            name: manylinux_aarch64_cp38
+            cibw:
+              build: "cp38*"
+              skip: "*musllinux*"
+              manylinux_image: manylinux2014
+              arch: aarch64
+
+          - os: ubuntu-20.04
+            name: manylinux_aarch64_cp39
+            cibw:
+              build: "cp39*"
+              skip: "*musllinux*"
+              manylinux_image: manylinux2014
+              arch: aarch64
+
+          - os: ubuntu-20.04
+            name: manylinux_aarch64_cp310
+            cibw:
+              build: "cp310*"
+              skip: "*musllinux*"
+              manylinux_image: manylinux2014
+              arch: aarch64
+
+          - os: windows-2019
+            name: win_amd64
+            architecture: x64
+            cibw:
+              build: "cp*win_amd64"
+              env: "CL='/arch:AVX'"
 
     steps:
       - uses: actions/checkout@v2
         with:
           fetch-depth: 0
       - uses: actions/setup-python@v2
         name: Install Python
+      - name: register qemu
+        if: contains(matrix.cibw.arch, 'aarch64')
+        run: |
+          docker run --rm --privileged hypriot/qemu-register:v4.2.0
       - name: Install cibuildwheel
-        run: python -m pip install cibuildwheel==1.7.4
-
+        run: python -m pip install cibuildwheel=="${{env.cibuildwheel_version}}"
       - name: Build wheels
         run: python -m cibuildwheel --output-dir wheelhouse
-        env:
-          CIBW_BUILD: "cp36-* cp37-* cp38-* cp39-*"
-          CIBW_ENVIRONMENT: "CFLAGS='-march=core-avx-i' CXXFLAGS='-march=core-avx-i' CL='/arch:AVX'"
-          CIBW_TEST_COMMAND: pytest {project}/tests
-          CIBW_TEST_REQUIRES: pytest
+
 
       - uses: actions/upload-artifact@v2
         with:

Readme.md

@@ -1,6 +1,6 @@
 # irspack
 
-[![Python](https://img.shields.io/badge/python-3.6%20%7C%203.7%20%7C%203.8%20%7C%203.9-blue)](https://www.python.org)
+[![Python](https://img.shields.io/badge/python-3.7%20%7C%203.8%20%7C%203.9%20%7C%203.10-blue)](https://www.python.org)
 [![pypi](https://img.shields.io/pypi/v/irspack.svg)](https://pypi.python.org/pypi/irspack)
 [![GitHub license](https://img.shields.io/badge/license-MIT-blue.svg)](https://github.com/tohtsky/irspack)
 [![Build](https://github.com/tohtsky/irspack/workflows/Build/badge.svg?branch=main)](https://github.com/tohtsky/irspack)

cpp_source/knn/knn.hpp

@@ -116,7 +116,7 @@ template <typename Real, class SimilarityType> struct KNNComputer {
           buffer[i] = i;
         }
         std::sort(buffer.begin(), buffer.begin() + nz_size,
-                  [&data_start](IndexType &col1, IndexType &col2) {
+                  [&data_start](IndexType col1, IndexType col2) {
                     return data_start[col1] > data_start[col2];
                   });
         std::sort(buffer.begin(), buffer.begin() + col_size);

cpp_source/util.hpp

@@ -393,7 +393,7 @@ inline CSCMatrix<Real> SLIM(const CSRMatrix<Real> &X, size_t n_threads,
             int64_t n_taken_coeffs = nnz;
             if (nnz > top_k) {
               std::sort(argsort_buffer.begin(), argsort_buffer.end(),
-                        [](RealAndIndex &val1, RealAndIndex &val2) {
+                        [](RealAndIndex val1, RealAndIndex val2) {
                           return val1.first > val2.first;
                         });
               n_taken_coeffs = top_k;