From e6ed3965668a3d2609005d09d2f065d9743f6018 Mon Sep 17 00:00:00 2001 From: Michael Rapp Date: Sun, 5 May 2024 03:10:50 +0200 Subject: [PATCH 1/2] Explicitly specify paths to include directories and libraries for MacOS build. --- .github/workflows/template_publish_platform.yml | 6 ++---- .github/workflows/test_build.yml | 6 ++---- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/.github/workflows/template_publish_platform.yml b/.github/workflows/template_publish_platform.yml index d3cd737911..5238f8392e 100644 --- a/.github/workflows/template_publish_platform.yml +++ b/.github/workflows/template_publish_platform.yml @@ -33,9 +33,7 @@ jobs: echo "Set version to $(cat VERSION)" - name: Install OpenMP if: matrix.os == 'macos-latest' - run: | - brew install libomp - brew link libomp --force + run: brew install libomp - name: Prepare MSVC if: matrix.os == 'windows-latest' uses: ilammy/msvc-dev-cmd@v1 @@ -43,7 +41,7 @@ jobs: uses: pypa/cibuildwheel@v2.17 env: CIBW_BEFORE_BUILD_LINUX: ./build --clean && SUBPROJECTS=${{ inputs.subproject }} TEST_SUPPORT=disabled GPU_SUPPORT=disabled ./build install - CIBW_BEFORE_BUILD_MACOS: rm -rf venv && ./build --clean && SUBPROJECTS=${{ inputs.subproject }} TEST_SUPPORT=disabled GPU_SUPPORT=disabled ./build install + CIBW_BEFORE_BUILD_MACOS: rm -rf venv && ./build --clean && SUBPROJECTS=${{ inputs.subproject }} TEST_SUPPORT=disabled GPU_SUPPORT=disabled CPLUS_INCLUDE_PATH=/opt/homebrew/opt/libomp/include/ LIBRARY_PATH=/opt/homebrew/opt/libomp/lib/ ./build install CIBW_BEFORE_BUILD_WINDOWS: .\build.bat --clean && set SUBPROJECTS=${{ inputs.subproject }} && set TEST_SUPPORT=disabled && set GPU_SUPPORT=disabled && .\build.bat install CIBW_BUILD_FRONTEND: build CIBW_ARCHS: auto64 diff --git a/.github/workflows/test_build.yml b/.github/workflows/test_build.yml index 4ee0bba665..5b6f7071d3 100644 --- a/.github/workflows/test_build.yml +++ b/.github/workflows/test_build.yml @@ -123,9 +123,7 @@ jobs: - name: Checkout uses: actions/checkout@v4 - name: Install OpenMP - run: | - brew install libomp - brew link libomp --force + run: brew install libomp - name: Install OpenCL run: brew install opencl-clhpp-headers - name: Prepare ccache @@ -133,7 +131,7 @@ jobs: with: key: ${{ runner.os }}-test-build-ccache - name: Compile via Clang - run: TEST_SUPPORT=disabled CPLUS_INCLUDE_PATH=/usr/local/opt/opencl-clhpp-headers/include ./build compile + run: TEST_SUPPORT=disabled CPLUS_INCLUDE_PATH=/opt/homebrew/opt/libomp/include/:/opt/homebrew/opt/opencl-clhpp-headers/include/ LIBRARY_PATH=/opt/homebrew/opt/libomp/lib/ ./build compile windows_build: needs: changes if: ${{ needs.changes.outputs.cpp == 'true' }} From 745f238c11c66415c493ec5d1638bbeea9c6208a Mon Sep 17 00:00:00 2001 From: michael-rapp <6638695+michael-rapp@users.noreply.github.com> Date: Sun, 5 May 2024 16:07:54 +0000 Subject: [PATCH 2/2] [Bot] Merge bugfix into feature branch. --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 027934ea1a..d33c3a2128 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.11.1 \ No newline at end of file +0.12.0 \ No newline at end of file