Merge pull request #1821 from ERGO-Code/master

update latest
ERGO-Code · Jul 1, 2024 · c2c4bb0 · c2c4bb0
2 parents d630089 + aadf029
commit c2c4bb0
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 3 deletions.
diff --git a/.github/workflows/build-wheels-push.yml b/.github/workflows/build-wheels-push.yml
@@ -26,8 +26,10 @@ jobs:
         buildplat:
           - [ubuntu-20.04, manylinux_x86_64]
           - [ubuntu-20.04, manylinux_i686]
+          - [ubuntu-20.04, manylinux_aarch64]
           - [ubuntu-20.04, musllinux_x86_64] # No OpenBlas, no test
           - [ubuntu-20.04, musllinux_i686]
+          - [ubuntu-20.04, musllinux_aarch64]
           - [macos-12, macosx_x86_64]
           - [macos-14, macosx_arm64]
           - [windows-2019, win_amd64]
@@ -36,7 +38,19 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
-      - name: Build wheels
+      - name: Set up QEMU # Required for aarch64 builds
+        if: ${{ contains(matrix.buildplat[1], 'aarch64') }}
+        uses: docker/setup-qemu-action@v3
+        with:
+          platforms: all
+      - name: Build wheels (aarch64)
+        if: ${{ contains(matrix.buildplat[1], 'aarch64') }}
+        uses: pypa/cibuildwheel@v2.19
+        env:
+          CIBW_BUILD: ${{ matrix.python }}-${{ matrix.buildplat[1] }}
+          CIBW_ARCHS_LINUX: aarch64
+      - name: Build wheels (not aarch64)
+        if: ${{ !contains(matrix.buildplat[1], 'aarch64') }}
         uses: pypa/cibuildwheel@v2.19
         env:
           CIBW_BUILD: ${{ matrix.python }}-${{ matrix.buildplat[1] }}

diff --git a/.github/workflows/build-wheels.yml b/.github/workflows/build-wheels.yml
@@ -21,8 +21,10 @@ jobs:
         buildplat:
           - [ubuntu-20.04, manylinux_x86_64]
           - [ubuntu-20.04, manylinux_i686]
+          - [ubuntu-20.04, manylinux_aarch64]
           - [ubuntu-20.04, musllinux_x86_64] # No OpenBlas, no test
           - [ubuntu-20.04, musllinux_i686]
+          - [ubuntu-20.04, musllinux_aarch64]
           - [macos-12, macosx_x86_64]
           - [macos-14, macosx_arm64]
           - [windows-2019, win_amd64]
@@ -31,7 +33,19 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
-      - name: Build wheels
+      - name: Set up QEMU # Required for aarch64 builds
+        if: ${{ contains(matrix.buildplat[1], 'aarch64') }}
+        uses: docker/setup-qemu-action@v3
+        with:
+          platforms: all
+      - name: Build wheels (aarch64)
+        if: ${{ contains(matrix.buildplat[1], 'aarch64') }}
+        uses: pypa/cibuildwheel@v2.19
+        env:
+          CIBW_BUILD: ${{ matrix.python }}-${{ matrix.buildplat[1] }}
+          CIBW_ARCHS_LINUX: aarch64
+      - name: Build wheels (not aarch64)
+        if: ${{ !contains(matrix.buildplat[1], 'aarch64') }}
         uses: pypa/cibuildwheel@v2.19
         env:
           CIBW_BUILD: ${{ matrix.python }}-${{ matrix.buildplat[1] }}

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -189,7 +189,7 @@ if (BUILD_CXX)
     set(ipo_supported NO)
     message(STATUS "IPO / LTO not currently supported building HiGHS on MinGW")
   else()
-    if(CMAKE_VERSION VERSION_GREATER "3.23.0") 
+    if(CMAKE_VERSION VERSION_GREATER_EQUAL  "3.24.0") 
       cmake_policy(SET CMP0138 NEW)
     endif()