From fc46123a9c75dce5f1fe61640462e43075f5d078 Mon Sep 17 00:00:00 2001 From: Hyungtae Lim <35317311+LimHyungTae@users.noreply.github.com> Date: Tue, 28 Jan 2025 12:24:53 -0500 Subject: [PATCH 1/5] (WIP) Fixing MacOS build issue on workflows... --- .github/workflows/pypi.yml | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/.github/workflows/pypi.yml b/.github/workflows/pypi.yml index 1ab8edd..d98f037 100644 --- a/.github/workflows/pypi.yml +++ b/.github/workflows/pypi.yml @@ -35,6 +35,16 @@ jobs: steps: - uses: actions/checkout@v3 + # To handle OpenMP issue in MacOS + - name: Install dependencies (macOS) + if: runner.os == 'macOS' + run: | + brew install llvm + echo 'export CC=/opt/homebrew/opt/llvm/bin/clang' >> $GITHUB_ENV + echo 'export CXX=/opt/homebrew/opt/llvm/bin/clang++' >> $GITHUB_ENV + echo 'export LDFLAGS="-L/opt/homebrew/opt/llvm/lib -Wl,-rpath,/opt/homebrew/opt/llvm/lib"' >> $GITHUB_ENV + echo 'export CPPFLAGS="-I/opt/homebrew/opt/llvm/include"' >> $GITHUB_ENV + - name: Build test wheels (only PRs) if: github.event_name != 'release' uses: pypa/cibuildwheel@v2.22.0 @@ -42,15 +52,7 @@ jobs: CIBW_BUILD: "cp310-*" with: package-dir: ${{github.workspace}}/python/ - - # To handle OpenMP issue in MacOS - - name: Install dependencies (macOS) - if: runner.os == 'macOS' - run: | - brew install llvm - echo 'export CC=/opt/homebrew/opt/llvm/bin/clang' >> $GITHUB_ENV - echo 'export CXX=/opt/homebrew/opt/llvm/bin/clang++' >> $GITHUB_ENV - + - name: Build all wheels if: github.event_name == 'release' uses: pypa/cibuildwheel@v2.22.0 From c9dad72df251e575a960411add2993df03af9ec0 Mon Sep 17 00:00:00 2001 From: Hyungtae Lim <35317311+LimHyungTae@users.noreply.github.com> Date: Tue, 28 Jan 2025 23:35:08 -0500 Subject: [PATCH 2/5] Detach MacOS dependency due to xenium. See https://github.com/mpoeter/xenium/issues/3 --- .github/workflows/pypi.yml | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/.github/workflows/pypi.yml b/.github/workflows/pypi.yml index d98f037..4652123 100644 --- a/.github/workflows/pypi.yml +++ b/.github/workflows/pypi.yml @@ -30,21 +30,11 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ubuntu-24.04, windows-2022, macos-15] + os: [ubuntu-24.04, windows-2022] steps: - uses: actions/checkout@v3 - # To handle OpenMP issue in MacOS - - name: Install dependencies (macOS) - if: runner.os == 'macOS' - run: | - brew install llvm - echo 'export CC=/opt/homebrew/opt/llvm/bin/clang' >> $GITHUB_ENV - echo 'export CXX=/opt/homebrew/opt/llvm/bin/clang++' >> $GITHUB_ENV - echo 'export LDFLAGS="-L/opt/homebrew/opt/llvm/lib -Wl,-rpath,/opt/homebrew/opt/llvm/lib"' >> $GITHUB_ENV - echo 'export CPPFLAGS="-I/opt/homebrew/opt/llvm/include"' >> $GITHUB_ENV - - name: Build test wheels (only PRs) if: github.event_name != 'release' uses: pypa/cibuildwheel@v2.22.0 From 2ffcc34c6a91414fd9c97f446e07b6796996e98d Mon Sep 17 00:00:00 2001 From: Hyungtae Lim <35317311+LimHyungTae@users.noreply.github.com> Date: Wed, 29 Jan 2025 00:04:40 -0500 Subject: [PATCH 3/5] (WIP) degrade ubuntu version --- .github/workflows/pypi.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pypi.yml b/.github/workflows/pypi.yml index 4652123..a3878d3 100644 --- a/.github/workflows/pypi.yml +++ b/.github/workflows/pypi.yml @@ -30,7 +30,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ubuntu-24.04, windows-2022] + os: [ubuntu-20.04, windows-2022] steps: - uses: actions/checkout@v3 From 04c26feec788c0b0c5a28ac325eb5949468ccaa8 Mon Sep 17 00:00:00 2001 From: Hyungtae Lim <35317311+LimHyungTae@users.noreply.github.com> Date: Wed, 29 Jan 2025 05:56:02 -0500 Subject: [PATCH 4/5] Update pypi.yml --- .github/workflows/pypi.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.github/workflows/pypi.yml b/.github/workflows/pypi.yml index a3878d3..9c73c3f 100644 --- a/.github/workflows/pypi.yml +++ b/.github/workflows/pypi.yml @@ -16,6 +16,13 @@ jobs: steps: - uses: actions/checkout@v3 + - name: Check system information + run: | + uname -a + lscpu + gcc -v + clang -v + - name: Build sdist run: pipx run build --sdist ${{github.workspace}}/python/ - name: Move sdist to dist From 091e4566bf14b165b1f2d493f4fcfa03093e7cfd Mon Sep 17 00:00:00 2001 From: Hyungtae Lim <35317311+LimHyungTae@users.noreply.github.com> Date: Wed, 29 Jan 2025 05:58:51 -0500 Subject: [PATCH 5/5] Roll back the trial --- .github/workflows/pypi.yml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/.github/workflows/pypi.yml b/.github/workflows/pypi.yml index 9c73c3f..a3878d3 100644 --- a/.github/workflows/pypi.yml +++ b/.github/workflows/pypi.yml @@ -16,13 +16,6 @@ jobs: steps: - uses: actions/checkout@v3 - - name: Check system information - run: | - uname -a - lscpu - gcc -v - clang -v - - name: Build sdist run: pipx run build --sdist ${{github.workspace}}/python/ - name: Move sdist to dist