From 6341aed89ef607af90ca2ac69bedc3ca1b0b014b Mon Sep 17 00:00:00 2001 From: nihuini Date: Mon, 1 Apr 2024 19:11:28 +0800 Subject: [PATCH] wip --- .github/workflows/visionos.yml | 6 +++--- .github/workflows/watchos.yml | 4 +--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/.github/workflows/visionos.yml b/.github/workflows/visionos.yml index 3fe1df87626..845754754c2 100644 --- a/.github/workflows/visionos.yml +++ b/.github/workflows/visionos.yml @@ -86,7 +86,7 @@ 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 @@ -94,7 +94,7 @@ jobs: 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 @@ -102,7 +102,7 @@ jobs: 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 index b809838b4ec..5da9b0f4508 100644 --- 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