From ea40cc942cbeca561c9bbf289810cf03030465aa Mon Sep 17 00:00:00 2001 From: "Lee J. O'Riordan" Date: Fri, 13 Dec 2024 13:45:49 -0500 Subject: [PATCH 1/2] Ensure deps are built with explicit MacOS SDK version 13.0 --- .github/workflows/build-wheel-macos-arm64.yaml | 9 ++++++--- .github/workflows/build-wheel-macos-x86_64.yaml | 10 +++++++--- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build-wheel-macos-arm64.yaml b/.github/workflows/build-wheel-macos-arm64.yaml index 1470ea855b..6fdeb67035 100644 --- a/.github/workflows/build-wheel-macos-arm64.yaml +++ b/.github/workflows/build-wheel-macos-arm64.yaml @@ -157,7 +157,8 @@ jobs: -DMLIR_ENABLE_BINDINGS_PYTHON=ON \ -DPython3_EXECUTABLE=$(which python${{ matrix.python_version }}) \ -DPython3_NumPy_INCLUDE_DIRS=$(python${{ matrix.python_version }} -c "import numpy as np; print(np.get_include())") \ - -DCMAKE_CXX_VISIBILITY_PRESET=default + -DCMAKE_CXX_VISIBILITY_PRESET=default \ + -DCMAKE_OSX_DEPLOYMENT_TARGET=$MACOSX_DEPLOYMENT_TARGET # TODO: when updating LLVM, test to see if mlir/unittests/Bytecode/BytecodeTest.cpp:55 is passing # and remove filter @@ -189,7 +190,8 @@ jobs: -DLLVM_ENABLE_LLD=OFF \ -DLLVM_ENABLE_ZLIB=FORCE_ON \ -DLLVM_ENABLE_ZSTD=OFF \ - -DCMAKE_CXX_VISIBILITY_PRESET=default + -DCMAKE_CXX_VISIBILITY_PRESET=default \ + -DCMAKE_OSX_DEPLOYMENT_TARGET=$MACOSX_DEPLOYMENT_TARGET cmake --build mhlo-build --target check-mlir-hlo @@ -208,7 +210,8 @@ jobs: -DCMAKE_BUILD_TYPE=Release \ -DLLVM_DIR=$GITHUB_WORKSPACE/llvm-build/lib/cmake/llvm \ -DENZYME_STATIC_LIB=ON \ - -DCMAKE_CXX_VISIBILITY_PRESET=default + -DCMAKE_CXX_VISIBILITY_PRESET=default \ + -DCMAKE_OSX_DEPLOYMENT_TARGET=$MACOSX_DEPLOYMENT_TARGET cmake --build enzyme-build --target EnzymeStatic-19 diff --git a/.github/workflows/build-wheel-macos-x86_64.yaml b/.github/workflows/build-wheel-macos-x86_64.yaml index b7a244817a..0b208ad339 100644 --- a/.github/workflows/build-wheel-macos-x86_64.yaml +++ b/.github/workflows/build-wheel-macos-x86_64.yaml @@ -148,7 +148,9 @@ jobs: -DMLIR_ENABLE_BINDINGS_PYTHON=ON \ -DPython3_EXECUTABLE=$(which python${{ matrix.python_version }}) \ -DPython3_NumPy_INCLUDE_DIRS=$(python${{ matrix.python_version }} -c "import numpy as np; print(np.get_include())") \ - -DCMAKE_CXX_VISIBILITY_PRESET=default + -DCMAKE_CXX_VISIBILITY_PRESET=default \ + -DCMAKE_OSX_DEPLOYMENT_TARGET=$MACOSX_DEPLOYMENT_TARGET + # TODO: when updating LLVM, test to see if mlir/unittests/Bytecode/BytecodeTest.cpp:55 is passing # and remove filter @@ -180,7 +182,8 @@ jobs: -DLLVM_ENABLE_LLD=OFF \ -DLLVM_ENABLE_ZLIB=FORCE_ON \ -DLLVM_ENABLE_ZSTD=OFF \ - -DCMAKE_CXX_VISIBILITY_PRESET=default + -DCMAKE_CXX_VISIBILITY_PRESET=default \ + -DCMAKE_OSX_DEPLOYMENT_TARGET=$MACOSX_DEPLOYMENT_TARGET cmake --build mhlo-build --target check-mlir-hlo @@ -199,7 +202,8 @@ jobs: -DCMAKE_BUILD_TYPE=Release \ -DLLVM_DIR=$GITHUB_WORKSPACE/llvm-build/lib/cmake/llvm \ -DENZYME_STATIC_LIB=ON \ - -DCMAKE_CXX_VISIBILITY_PRESET=default + -DCMAKE_CXX_VISIBILITY_PRESET=default \ + -DCMAKE_OSX_DEPLOYMENT_TARGET=$MACOSX_DEPLOYMENT_TARGET cmake --build enzyme-build --target EnzymeStatic-19 From 1cead2e1c66f74e7bac6fd7519f370c32535333e Mon Sep 17 00:00:00 2001 From: Lee James O'Riordan Date: Fri, 13 Dec 2024 13:49:14 -0500 Subject: [PATCH 2/2] Update .github/workflows/build-wheel-macos-x86_64.yaml --- .github/workflows/build-wheel-macos-x86_64.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/build-wheel-macos-x86_64.yaml b/.github/workflows/build-wheel-macos-x86_64.yaml index 0b208ad339..abce143596 100644 --- a/.github/workflows/build-wheel-macos-x86_64.yaml +++ b/.github/workflows/build-wheel-macos-x86_64.yaml @@ -151,7 +151,6 @@ jobs: -DCMAKE_CXX_VISIBILITY_PRESET=default \ -DCMAKE_OSX_DEPLOYMENT_TARGET=$MACOSX_DEPLOYMENT_TARGET - # TODO: when updating LLVM, test to see if mlir/unittests/Bytecode/BytecodeTest.cpp:55 is passing # and remove filter # This tests fails on CI/CD not locally.