From b004e315b14c08bd3d45def7d52aa282371311d7 Mon Sep 17 00:00:00 2001 From: Stephen Nneji Date: Wed, 23 Jul 2025 11:08:10 +0100 Subject: [PATCH] Updates cpp and add Mac ARM to test --- .github/workflows/run_tests.yml | 18 ++++++++++++++---- cpp/RAT | 2 +- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/.github/workflows/run_tests.yml b/.github/workflows/run_tests.yml index e930df1a..a2de2b66 100644 --- a/.github/workflows/run_tests.yml +++ b/.github/workflows/run_tests.yml @@ -19,13 +19,13 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-latest, windows-latest, macos-13] + platform: [windows-latest, ubuntu-latest, macos-13, macos-14] version: ["3.10", "3.13"] defaults: run: shell: bash -l {0} - runs-on: ${{ matrix.os }} + runs-on: ${{ matrix.platform}} steps: - uses: actions/checkout@v4 @@ -35,8 +35,8 @@ jobs: uses: actions/setup-python@v4 with: python-version: ${{ matrix.version }} - - name: Install OMP (MacOS) - if: runner.os == 'macOS' + - name: Install OMP (MacOS Intel) + if: matrix.platform == 'macos-13' run: | brew install llvm libomp echo "export CC=/usr/local/opt/llvm/bin/clang" >> ~/.bashrc @@ -45,6 +45,16 @@ jobs: echo "export CXXFLAGS=\"$CXXFLAGS -I/usr/local/opt/libomp/include\"" >> ~/.bashrc echo "export LDFLAGS=\"$LDFLAGS -Wl,-rpath,/usr/local/opt/libomp/lib -L/usr/local/opt/libomp/lib -lomp\"" >> ~/.bashrc source ~/.bashrc + - name: Install OMP (MacOS M1) + if: matrix.platform == 'macos-14' + run: | + brew install llvm libomp + echo "export CC=/opt/homebrew/opt/llvm/bin/clang" >> ~/.bashrc + echo "export CXX=/opt/homebrew/opt/llvm/bin/clang++" >> ~/.bashrc + echo "export CFLAGS=\"$CFLAGS -I/opt/homebrew/opt/libomp/include\"" >> ~/.bashrc + echo "export CXXFLAGS=\"$CXXFLAGS -I/opt/homebrew/opt/libomp/include\"" >> ~/.bashrc + echo "export LDFLAGS=\"$LDFLAGS -Wl,-rpath,/opt/homebrew/opt/libomp/lib -L/opt/homebrew/opt/libomp/lib -lomp\"" >> ~/.bashrc + source ~/.bashrc - name: Install OMP (Linux) if: runner.os == 'Linux' run: | diff --git a/cpp/RAT b/cpp/RAT index cf81c8d0..370d46f1 160000 --- a/cpp/RAT +++ b/cpp/RAT @@ -1 +1 @@ -Subproject commit cf81c8d00f0d0348cbeb360446362f8381093203 +Subproject commit 370d46f19859eb1ada7b031e6540c7747e328f82