Merge pull request #68 from lbl-srg/issue61_macOSUniversal

Issue61 mac os universal

.github/workflows/cmake.yml

@@ -65,13 +65,13 @@ jobs:
         shell: bash
         run: ctest -C $BUILD_TYPE --verbose
 
-      - name: Push changes to remote
-        if: contains(matrix.os, 'latest') && contains(matrix.python-version, '3.9')
+      - name: Push binaries
+        if: contains(matrix.os, 'latest') && contains(matrix.python-version, '3.9') && github.event.pull_request.merged == true
         run: |
           git config --global user.name $GH_USERNAME
           git config --global user.email [email protected]
           git config --global pull.rebase false
-          git add ${{ github.workspace }}/pyfunnel/lib
-          git commit -m "Add ${{ matrix.os }} binaries" --allow-empty
           git pull
+          git add ${{ github.workspace }}/pyfunnel/lib
+          git diff-index --quiet HEAD || git commit -m "Add ${{ matrix.os }} binaries"
           git push

CHANGELOG.md

@@ -1,9 +1,16 @@
 # Change Log
 
+## Version 1.0.0
+
+- Add macOS universal build
+- Add support for headless Linux
+- Other bug fixes and improvements
+
 ## Version 0.3.1
 
 - Add tube size limit to avoid vanishing tube size in case of relative tolerance and low variable value
 - Change print format for higher precision (`%.16g`)
+
 ## Version 0.3.0
 
 - Add local tolerance parameters `ltolx` and `ltoly`

CMakeLists.txt

@@ -16,6 +16,14 @@
 cmake_policy(SET CMP0048 NEW)
 cmake_minimum_required(VERSION 3.22)
 file(READ "${CMAKE_SOURCE_DIR}/pyfunnel/VERSION" VERSION)
+
+# Configure macOS universal build.
+# This should be set prior to the first project() or enable_language() command invocation because
+# it may influence configuration of the toolchain and flags.
+# This is ignored on platforms other than Apple.
+set(CMAKE_OSX_ARCHITECTURES "x86_64;arm64" CACHE STRING "")
+
+# Set up project.
 project(funnel VERSION ${VERSION} LANGUAGES C)
 enable_testing()
 
@@ -30,7 +38,7 @@ elseif(CMAKE_SYSTEM_NAME MATCHES Darwin)
     set(MACOSX 1)
     message("Mac OS X system detected.")
 else()
-    message(WARNING "OS unknown!")
+    message(FATAL_ERROR "OS unknown!")
 endif()
 
 # Set compiling and linking options.

README.md

@@ -65,9 +65,9 @@ By convention, the error is `max(0, y - y_up) - min(0, y - y_low)` and hence it
 
 The software is tested on the following platforms.
 
-  * Linux x64
-  * Windows x64
-  * macOS
+  * Linux x64 (Ubuntu 22.04)
+  * Windows x64 (Windows Server 2022)
+  * macOS x64 and arm64 (macOS 12)
 
 A Python binding is available to access the library. It is supported on Python versions 3.8 through 3.9.
 

pyfunnel/VERSION

@@ -1 +1 @@
-0.3.1
+1.0.0

tests/test_bin/results/upperBound.csv

@@ -3,7 +3,7 @@ x,y
 0.048,0.002
 0.098,1.002
 0.202,1.002
-0.249,0.06200000000000061
+0.249,0.06199999999999956
 0.298,3.002
 0.352,3.002
 0.402,0.002