Modify install path for omp

PennyLaneAI · Apr 22, 2024 · 66d57b5 · 66d57b5
1 parent fbd8d0c
commit 66d57b5
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/.github/workflows/wheel_macos_x86_64.yml b/.github/workflows/wheel_macos_x86_64.yml
@@ -45,9 +45,7 @@ jobs:
         id: kokkos-cache
         uses: actions/cache@v4
         with:
-          path: |
-            ${{ github.workspace}}/ext_lib/Kokkos_install/${{ matrix.exec_model }}
-            ${{ github.workspace}}/ext_lib/libomp_install/
+          path: ${{ github.workspace}}/ext_lib/
           key: ${{ matrix.os }}-kokkos${{ matrix.kokkos_version }}-${{ matrix.exec_model }}
 
       - name: Clone Kokkos libs
@@ -91,7 +89,7 @@ jobs:
                           -DCMAKE_CXX_STANDARD=20 \
                           -DCMAKE_POSITION_INDEPENDENT_CODE=ON \
                           -DCMAKE_CXX_COMPILER=g++ \
-                          -DOpenMP_ROOT=${{ github.workspace}}/ext_lib/libomp_install \
+                          -DOpenMP_ROOT=${{ github.workspace}}/ext_lib/libomp_install/usr/local/ \
                           -G Ninja
           cmake --build ./Build --verbose
           cmake --install ./Build
@@ -120,13 +118,15 @@ jobs:
         id: kokkos-cache
         uses: actions/cache@v4
         with:
-          path: ${{ github.workspace}}/ext_lib/Kokkos_install/${{ matrix.exec_model }}
+          path: ${{ github.workspace}}/ext_lib/
           key: ${{ matrix.os }}-kokkos${{ matrix.kokkos_version }}-${{ matrix.exec_model }}
 
       - name: Copy cached libraries
+        if: steps.kokkos-cache.outputs.cache-hit == 'true'
         run: |
-          mkdir Kokkos
+          mkdir Kokkos OpenMP
           cp -rf ${{ github.workspace }}/ext_lib/Kokkos_install/${{ matrix.exec_model }}/* Kokkos/
+          #cp -rf ${{ github.workspace }}/ext_lib/libomp_install/* OpenMP/
 
       - uses: actions/setup-python@v5
         name: Install Python
@@ -150,7 +150,7 @@ jobs:
 
           PL_BACKEND: ${{ matrix.pl_backend }}
 
-          CMAKE_ARGS: "-DOpenMP_ROOT=${{ github.workspace}}/ext_lib/libomp_install"
+          CMAKE_ARGS: "-DOpenMP_ROOT=${{ github.workspace}}/ext_lib/libomp_install/usr/local/"
 
           CIBW_BEFORE_TEST: |
             python -m pip install -r requirements-tests.txt