Merge pull request #122 from pyswmm/dev_arm64_omp

Author: karosc

.github/workflows/build_wheel.yml

@@ -3,12 +3,12 @@ name: Build Wheels
 # Cross compile wheels only on main branch and tags
 on:
   pull_request:
-    branches:    
-      - master  
+    branches:
+      - master
   push:
-    branches:    
+    branches:
       - master
-    tags:        
+    tags:
       - v*
   workflow_dispatch:
 
@@ -44,7 +44,7 @@ jobs:
   build_wheels:
     runs-on: ${{ matrix.os }}
     strategy:
-      fail-fast: true
+      fail-fast: false
       matrix:
         os: [ubuntu-latest, windows-2022, macos-12]
         pyver: [cp38, cp39, cp310, cp311]
@@ -59,22 +59,23 @@ jobs:
         uses: pypa/cibuildwheel@v2.15.0
         with:
           package-dir: ./swmm-toolkit
-        env:          
+        env:
           CIBW_TEST_COMMAND: "pytest {package}/tests"
           CIBW_BEFORE_TEST: pip install -r {package}/test-requirements.txt
           # mac needs ninja to build
           CIBW_BEFORE_BUILD_MACOS: brew install ninja
           # configure cibuildwheel to build native archs ('auto'), and some emulated ones      
           CIBW_ARCHS_LINUX: x86_64
-          CIBW_ARCHS_WINDOWS: AMD64 
-          CIBW_ARCHS_MACOS: x86_64  
+          CIBW_ARCHS_WINDOWS: AMD64
+          CIBW_ARCHS_MACOS: x86_64
           # only build current supported python: https://devguide.python.org/versions/
           # don't build pypy or musllinux to save build time. TODO: find a good way to support those archs
           CIBW_BUILD: ${{matrix.pyver}}-*
           CIBW_SKIP: cp36-* cp37-* cp312-* pp* *-musllinux*
           # Will avoid testing on emulated architectures
           # Skip trying to test arm64 builds on Intel Macs
           CIBW_TEST_SKIP: "*-*linux_{aarch64,ppc64le,s390x} *-macosx_arm64 *-macosx_universal2:arm64"
+          CIBW_BUILD_VERBOSITY: 1
 
       - uses: actions/upload-artifact@v3
         with:
@@ -83,7 +84,7 @@ jobs:
   build_cross_wheels:
     runs-on: ${{ matrix.os }}
     strategy:
-      fail-fast: true
+      fail-fast: false
       matrix:
         os: [ubuntu-latest,macos-12]
         pyver: [cp38, cp39, cp310, cp311]
@@ -114,6 +115,7 @@ jobs:
           # don't build pypy or musllinux to save build time. TODO: find a good way to support those archs
           CIBW_BUILD: ${{matrix.pyver}}-*
           CIBW_SKIP: cp36-* cp37-* cp312-* pp* *-musllinux*
+          CIBW_BUILD_VERBOSITY: 1
 
       - uses: actions/upload-artifact@v3
         with:

swmm-toolkit/CMakeLists.txt

@@ -36,10 +36,16 @@ cmake_policy(SET CMP0078 NEW)
 cmake_policy(SET CMP0086 NEW)
 include(${SWIG_USE_FILE})
 
-find_package(OpenMP
-    OPTIONAL_COMPONENTS
-        C
-)
+# If wheel build on Apple fetch and build OpenMP Library
+if (APPLE)
+    include(./extern/openmp.cmake)
+else()
+    find_package(OpenMP
+        REQUIRED
+        OPTIONAL_COMPONENTS
+            C
+    )
+endif()
 
 # Add project subdirectories
 add_subdirectory(swmm-solver)

swmm-toolkit/extern/openmp.cmake

@@ -0,0 +1,60 @@
+#
+# CMakeLists.txt - CMake configuration file for OpenMP Library on Darwin
+#
+# Created: Mar 17, 2021
+# Updated: May 19, 2021
+#
+# Author: Michael E. Tryby
+#         US EPA ORD/CESER
+#
+# Note:
+#  Need to build libomp for binary compatibility with Python.
+#
+#  OpenMP library build fails for Xcode generator. Use Ninja or Unix Makefiles
+#  instead.
+#
+
+################################################################################
+#####################    CMAKELISTS FOR OPENMP LIBRARY    ######################
+################################################################################
+
+include(FetchContent)
+
+
+FetchContent_Declare(OpenMP
+    URL
+        https://github.com/llvm/llvm-project/releases/download/llvmorg-12.0.1/openmp-12.0.1.src.tar.xz
+    URL_HASH
+        SHA256=60fe79440eaa9ebf583a6ea7f81501310388c02754dbe7dc210776014d06b091
+)
+
+set(OPENMP_STANDALONE_BUILD TRUE)
+set(LIBOMP_INSTALL_ALIASES OFF)
+
+FetchContent_MakeAvailable(OpenMP)
+set(OpenMP_AVAILABLE TRUE)
+
+
+target_link_directories(omp
+    PUBLIC
+        $<BUILD_INTERFACE:${CMAKE_BINARY_DIR}/_deps/openmp-build/runtime/src>
+        $<INSTALL_INTERFACE:${LIBRARY_DIST}>
+)
+
+install(TARGETS omp
+    LIBRARY
+    DESTINATION
+        "${LIBRARY_DIST}"
+)
+
+if(CMAKE_C_COMPILER_ID MATCHES "Clang\$")
+    set(OpenMP_C_FLAGS "-Xpreprocessor -fopenmp -I${CMAKE_BINARY_DIR}/_deps/openmp-build/runtime/src")
+    set(OpenMP_C_LIB_NAMES "omp")
+    set(OpenMP_omp_LIBRARY "${CMAKE_BINARY_DIR}/_deps/openmp-build/runtime/src/libomp.dylib")
+endif()
+
+if(CMAKE_CXX_COMPILER_ID MATCHES "Clang\$")
+    set(OpenMP_CXX_FLAGS "-Xpreprocessor -fopenmp -I${CMAKE_BINARY_DIR}/_deps/openmp-build/runtime/src")
+    set(OpenMP_CXX_LIB_NAMES "omp")
+    set(OpenMP_omp_LIBRARY "${CMAKE_BINARY_DIR}/_deps/openmp-build/runtime/src/libomp.dylib")
+endif()