Update macos.yml

AdaptiveCpp · May 11, 2024 · 24386f4 · 24386f4
1 parent 56cf637
commit 24386f4
Showing 1 changed file with 5 additions and 8 deletions.
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
@@ -15,11 +15,12 @@ jobs:
         set +e
         brew update
         brew install cmake
-        brew install llvm@17
+        brew install llvm
+        brew install libomp
         brew install boost
         set -e
 
-        export CXX=`brew list llvm@17 | grep clang++`
+        export CXX=`brew list llvm | grep clang++`
         echo "CXX=${CXX}" >> $GITHUB_ENV
         export LLVM_ROOT=`echo $CXX | sed -E "s/bin\/.*//"`
         echo "LLVM_DIR=${LLVM_ROOT}/lib/cmake/llvm" >> $GITHUB_ENV
@@ -31,16 +32,14 @@ jobs:
         cmake .. \
         -DWITH_OPENCL_BACKEND=OFF \
         -DCMAKE_INSTALL_PREFIX=${GITHUB_WORKSPACE}/build/install \
-        -DLLVM_DIR=$LLVM_DIR \
-        -DOpenMP_ROOT=$LLVM_DIR
+        -DLLVM_DIR=$LLVM_DIR
         make -j 2 install VERBOSE=ON
     - name: build library only CPU tests
       run: |
         mkdir build/tests-cpu && cd build/tests-cpu
         cmake \
         -DACPP_TARGETS=omp.library-only \
         -DAdaptiveCpp_DIR=${GITHUB_WORKSPACE}/build/install/lib/cmake/AdaptiveCpp \
-        -DOpenMP_ROOT=$LLVM_DIR \
         ${GITHUB_WORKSPACE}/tests
         make -j 2 VERBOSE=ON
     - name: build accelerated CPU tests
@@ -49,7 +48,6 @@ jobs:
         cmake \
         -DACPP_TARGETS=omp.accelerated \
         -DAdaptiveCpp_DIR=${GITHUB_WORKSPACE}/build/install/lib/cmake/AdaptiveCpp \
-        -DOpenMP_ROOT=$LLVM_DIR \
         ${GITHUB_WORKSPACE}/tests
         make -j 2 VERBOSE=ON
     - name: build SSCP (CPU) tests
@@ -58,13 +56,12 @@ jobs:
         cmake \
         -DACPP_TARGETS=generic \
         -DAdaptiveCpp_DIR=${GITHUB_WORKSPACE}/build/install/lib/cmake/AdaptiveCpp \
-        -DOpenMP_ROOT=$LLVM_DIR \
         ${GITHUB_WORKSPACE}/tests
         make -j 2 VERBOSE=ON
     - name: run CPU tests
       run: |
         cd ${GITHUB_WORKSPACE}/build/tests-cpu
-        LD_LIBRARY_PATH=${GITHUB_WORKSPACE}/build/install/lib ./sycl_tests
+        ./sycl_tests
     - name: run accelerated CPU tests
       run: |
         cd ${GITHUB_WORKSPACE}/build/tests-acc-cpu