Remove macOS builds, say thanks to M1's arm64 + x86-64 hybrid compilation

Signed-off-by: Vadim Markovtsev <[email protected]>

Author: vmarkovtsev

.github/workflows/push.yml

@@ -16,16 +16,16 @@ jobs:
   flake8:
     name: flake8
     if: "!contains(github.event.head_commit.message, 'Bump version')"
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
     - name: actions/checkout
       uses: actions/checkout@v2
     - name: actions/cache
       uses: actions/cache@v2
       with:
         path: ${{ env.PIP_CACHE }}
-        key: ubuntu-20.04-pip-lint-${{ hashFiles('lint-requirements.txt') }}
-        restore-keys: ubuntu-20.04-pip-lint-
+        key: ubuntu-22.04-pip-lint-${{ hashFiles('lint-requirements.txt') }}
+        restore-keys: ubuntu-22.04-pip-lint-
     - name: pip lint-requirements.txt
       run: |
         set -x
@@ -42,7 +42,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ ubuntu-latest, macos-latest, windows-latest ]
+        os: [ ubuntu-latest, windows-latest ]
         cibw_python: [ "cp38-*", "cp39-*", "cp310-*" ]
         cibw_arch: [ "auto64" ]
 
@@ -57,8 +57,8 @@ jobs:
       uses: actions/cache@v2
       with:
         path: ${{ env.PIP_CACHE }}
-        key: ubuntu-20.04-pip-main-${{ hashFiles('requirements.txt', 'test-requirements.txt') }}
-        restore-keys: ubuntu-20.04-pip-main-
+        key: ubuntu-22.04-pip-main-${{ hashFiles('requirements.txt', 'test-requirements.txt') }}
+        restore-keys: ubuntu-22.04-pip-main-
     - name: pip requirements.txt
       run: |
         set -x
@@ -69,16 +69,12 @@ jobs:
     - name: test
       run: |
         set -x
-        if [ "${{ matrix.os }}" == "macos-latest" ]; then
-          sysctl -a
-          (sysctl -a | grep machdep.cpu.leaf7_features | grep AVX2) || exit 0
-        fi
         python3 -m unittest discover .
   bump_version:
     name: Bump the version
     needs: [ flake8, test ]
     if: "!contains(github.event.head_commit.message, 'Bump version') && github.ref == 'refs/heads/master'"
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
     - name: actions/checkout
       uses: actions/checkout@v2

README.md

@@ -36,7 +36,8 @@ Installing
 ```
 pip3 install lapjv
 ```
-Tested on Linux and macOS.
+Tested on Linux and Windows. *macOS is not supported, please do not report macOS build errors in the issues.*
+Feel free to PR macOS support, but I warn that it will be a rough ride.
 
 Usage
 -----

setup.py

@@ -3,8 +3,11 @@
 
 from setuptools import Extension, setup
 
-# GCP N2
-GCC_OPT = [
+UNIX_CXXFLAGS = [
+    "-std=c++17",
+    "-mavx2",
+    "-ftree-vectorize",
+    # GCP N2
     "-march=haswell",
     "-maes",
     "-mno-pku",
@@ -15,8 +18,8 @@
 ]
 
 CXX_ARGS = {
-    "Darwin": ["-std=c++17", *GCC_OPT, "-mavx2", "-ftree-vectorize"],
-    "Linux": ["-fopenmp", "-std=c++17", *GCC_OPT, "-mabm", "-mavx2", "-ftree-vectorize"],
+    # "Darwin": [*UNIX_CXXFLAGS],  not supported anymore due to M1, PRs welcome
+    "Linux": ["-fopenmp", *UNIX_CXXFLAGS, "-mabm"],
     "Windows": ["/openmp", "/std:c++latest", "/arch:AVX2"],
 }
 

test-requirements.txt

@@ -1 +1 @@
-scipy==1.8.0
+scipy==1.9.3