wip

Tencent · Apr 1, 2024 · 6341aed · 6341aed
1 parent 9093ff3
commit 6341aed
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/.github/workflows/visionos.yml b/.github/workflows/visionos.yml
@@ -86,23 +86,23 @@ jobs:
       run: |
         cd openmp-${{ env.OPENMP_VERSION }}.src
         mkdir -p build-arm64 && cd build-arm64
-        cmake ${{ env.OPENMP_CMAKE_OPTIONS }} -DPLATFORM=WATCHOS -DARCHS="arm64" ..
+        cmake ${{ env.OPENMP_CMAKE_OPTIONS }} -DPLATFORM=VISIONOS -DARCHS="arm64" ..
         cmake --build . -j 4
         cmake --build . --target install
     - name: openmp-simulator-x86_64
       if: steps.cache-openmp.outputs.cache-hit != 'true'
       run: |
         cd openmp-${{ env.OPENMP_VERSION }}.src
         mkdir -p build-simulator-x86_64 && cd build-simulator-x86_64
-        cmake ${{ env.OPENMP_CMAKE_OPTIONS }} -DPLATFORM=SIMULATOR_WATCHOS -DARCHS="x86_64" ..
+        cmake ${{ env.OPENMP_CMAKE_OPTIONS }} -DPLATFORM=SIMULATOR_VISIONOS -DARCHS="x86_64" ..
         cmake --build . -j 4
         cmake --build . --target install
     - name: openmp-simulator-arm64
       if: steps.cache-openmp.outputs.cache-hit != 'true'
       run: |
         cd openmp-${{ env.OPENMP_VERSION }}.src
         mkdir -p build-simulator-arm64 && cd build-simulator-arm64
-        cmake ${{ env.OPENMP_CMAKE_OPTIONS }} -DPLATFORM=SIMULATOR_WATCHOS -DARCHS="arm64" ..
+        cmake ${{ env.OPENMP_CMAKE_OPTIONS }} -DPLATFORM=SIMULATOR_VISIONOS -DARCHS="arm64" ..
         cmake --build . -j 4
         cmake --build . --target install
     - name: openmp-merge-fat-library

diff --git a/.github/workflows/watchos.yml b/.github/workflows/watchos.yml
@@ -46,9 +46,7 @@ jobs:
         -DENABLE_VISIBILITY=$ENABLE_VISIBILITY \
         -DCMAKE_INSTALL_PREFIX=install \
         -DCMAKE_BUILD_TYPE=Release \
-        -DOpenMP_C_FLAGS="-Xclang -fopenmp" -DOpenMP_CXX_FLAGS="-Xclang -fopenmp" \
-        -DOpenMP_C_LIB_NAMES="libomp" -DOpenMP_CXX_LIB_NAMES="libomp" \
-        -DOpenMP_libomp_LIBRARY="libomp.a" \
+        -DNCNN_OPENMP=OFF -DNCNN_THREADS=OFF \
 
     steps:
     - uses: actions/checkout@v4