diff --git a/.github/workflows/enzyme-ci.yml b/.github/workflows/enzyme-ci.yml index 5f8e9ea6e524..e112f678707c 100644 --- a/.github/workflows/enzyme-ci.yml +++ b/.github/workflows/enzyme-ci.yml @@ -56,13 +56,14 @@ jobs: build-macos: name: Enzyme CI LLVM ${{ matrix.llvm }} ${{ matrix.build }} macOS - runs-on: macos-latest + runs-on: ${{ matrix.os }} strategy: fail-fast: false matrix: llvm: ["12", "13", "14", "15", "16"] build: ["Release", "Debug"] # "RelWithDebInfo" + os: [macos-13, macos-14] timeout-minutes: 30 steps: @@ -79,29 +80,30 @@ jobs: run: cmake ../enzyme -DCMAKE_BUILD_TYPE=${{ matrix.build }} -DLLVM_EXTERNAL_LIT=`which lit` -DLLVM_DIR=`brew --prefix llvm@${{ matrix.llvm }}`/lib/cmake/llvm - name: make working-directory: build - run: make -j 3 + run: make -j `sysctl -n hw.ncpu` - name: make check-typeanalysis working-directory: build - run: make -j 3 check-typeanalysis + run: make -j `sysctl -n hw.ncpu` check-typeanalysis - name: make check-activityanalysis working-directory: build - run: make -j 3 check-activityanalysis + run: make -j `sysctl -n hw.ncpu` check-activityanalysis - name: make check-enzyme working-directory: build - run: make -j3 check-enzyme-bench + run: make -j `sysctl -n hw.ncpu` check-enzyme-bench - name: graph results if: github.event_name != 'pull_request' && matrix.build == 'Release' run: python3 enzyme/test/upload-results.py build/test/Enzyme/results.json --url https://enzyme.mit.edu/cibench/api --token ${{ secrets.GRAPH_TOKEN }} build-xcode: name: Enzyme CI LLVM ${{ matrix.llvm }} ${{ matrix.build }} macOS XCode - runs-on: macos-latest + runs-on: ${{ matrix.os }} strategy: fail-fast: false matrix: llvm: ["13"] #, "14"] build: ["Release"] # "RelWithDebInfo" + os: [macos-13, macos-14] timeout-minutes: 30 steps: @@ -116,4 +118,4 @@ jobs: working-directory: build run: | cmake ../enzyme -GXcode -DCMAKE_BUILD_TYPE=${{ matrix.build }} -DLLVM_EXTERNAL_LIT=`which lit` -DLLVM_DIR=`brew --prefix llvm@${{ matrix.llvm }}`/lib/cmake/llvm - cmake --build . --parallel 3 + cmake --build . --parallel `sysctl -n hw.ncpu` diff --git a/.github/workflows/enzyme-julia.yml b/.github/workflows/enzyme-julia.yml index 4aabf7204f5b..ce2daaaec1af 100644 --- a/.github/workflows/enzyme-julia.yml +++ b/.github/workflows/enzyme-julia.yml @@ -23,9 +23,9 @@ jobs: - '1.8' os: - ubuntu-latest - - macOS-latest - arch: - - x64 + - macos-13 + - macos-14 + timeout-minutes: 60 steps: - uses: actions/checkout@v4 @@ -37,15 +37,14 @@ jobs: - uses: julia-actions/setup-julia@v1 with: version: ${{ matrix.version }} - arch: ${{ matrix.arch }} - name: Build libEnzyme - if: ${{ matrix.os != 'macOS-latest'}} + if: ${{ matrix.os == 'ubuntu-latest'}} run: | julia --project=jl/deps -e 'using Pkg; Pkg.instantiate()' julia --project=jl/deps jl/deps/build_local.jl ./enzyme - name: Build libEnzyme MacOS - if: ${{ matrix.os == 'macOS-latest'}} + if: ${{ matrix.os == 'macos-13'}} run: | julia --project=jl/deps -e 'using Pkg; Pkg.instantiate()' SDKROOT=`xcrun --show-sdk-path` julia --project=jl/deps jl/deps/build_local.jl ./enzyme