From 5702db4bdeaf7ec2eeab3a6c52d55215335b65fd Mon Sep 17 00:00:00 2001 From: luncliff Date: Sun, 17 Dec 2023 20:24:54 +0900 Subject: [PATCH] ci: try fix of ICE with VS version --- .github/workflows/build-macos.yml | 8 ++++---- .github/workflows/build-ubuntu.yml | 2 +- .github/workflows/build-windows.yml | 10 ++++++---- test/self-hosted-cuda.json | 5 +---- 4 files changed, 12 insertions(+), 13 deletions(-) diff --git a/.github/workflows/build-macos.yml b/.github/workflows/build-macos.yml index 53fdfcdb..b7b06b0e 100644 --- a/.github/workflows/build-macos.yml +++ b/.github/workflows/build-macos.yml @@ -19,9 +19,9 @@ jobs: VCPKG_OVERLAY_TRIPLETS: ${{ github.workspace }}/triplets steps: - uses: actions/checkout@v4.1.1 - - uses: ConorMacBride/install-package@v1 - with: - brew: curl bison nasm yasm meson nuget pkg-config + # - uses: ConorMacBride/install-package@v1 + # with: + # brew: curl bison nasm yasm meson nuget pkg-config - uses: actions/setup-python@v5.0.0 with: @@ -36,7 +36,7 @@ jobs: mkdir -p ${VCPKG_DEFAULT_BINARY_CACHE} - uses: actions/cache@v3 with: - key: "v2349-${{ runner.os }}-${{ matrix.triplet }}" + key: "v2350-${{ runner.os }}-${{ matrix.triplet }}" path: | /usr/local/share/vcpkg-downloads /usr/local/share/vcpkg-archives diff --git a/.github/workflows/build-ubuntu.yml b/.github/workflows/build-ubuntu.yml index 640ecfde..b9a7ec03 100644 --- a/.github/workflows/build-ubuntu.yml +++ b/.github/workflows/build-ubuntu.yml @@ -38,7 +38,7 @@ jobs: VCPKG_DEFAULT_BINARY_CACHE: "${{ runner.temp }}/vcpkg-archives" - uses: actions/cache@v3 with: - key: "v2349-${{ runner.os }}-${{ matrix.triplet }}" + key: "v2350-${{ runner.os }}-${{ matrix.triplet }}" path: | ${{ runner.temp }}/vcpkg-downloads ${{ runner.temp }}/vcpkg-archives diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build-windows.yml index 49ef54fe..83190991 100644 --- a/.github/workflows/build-windows.yml +++ b/.github/workflows/build-windows.yml @@ -35,13 +35,14 @@ jobs: New-Item -Type Directory -Force ${env:VCPKG_DEFAULT_BINARY_CACHE} - uses: actions/cache@v3 with: - key: "v2349-${{ runner.os }}-${{ matrix.triplet }}" + key: "v2350-${{ runner.os }}-${{ matrix.triplet }}" path: | C:/vcpkg/downloads C:/vcpkg/archives - - uses: microsoft/setup-msbuild@v1.1 + - uses: microsoft/setup-msbuild@v1.3.1 with: msbuild-architecture: x64 + vs-version: '[17.8,17.9)' - uses: lukka/run-vcpkg@v11.3 timeout-minutes: 180 with: @@ -56,7 +57,7 @@ jobs: cuda_x64: runs-on: ["self-hosted", "Windows", "CUDA"] continue-on-error: true - timeout-minutes: 60 + timeout-minutes: 180 env: VCPKG_DOWNLOADS: "C:/vcpkg/downloads" VCPKG_DEFAULT_BINARY_CACHE: "C:/vcpkg/archives" @@ -69,9 +70,10 @@ jobs: New-Item -Type Directory -Force ${env:VCPKG_DOWNLOADS} New-Item -Type Directory -Force ${env:VCPKG_DEFAULT_BINARY_CACHE} Move-Item -Path "test/self-hosted-cuda.json" -Destination "test/vcpkg.json" -Force - - uses: microsoft/setup-msbuild@v1.1 + - uses: microsoft/setup-msbuild@v1.3.1 with: msbuild-architecture: x64 + vs-version: '[17.8,17.9)' - uses: lukka/run-vcpkg@v11.3 with: vcpkgDirectory: "C:/vcpkg" diff --git a/test/self-hosted-cuda.json b/test/self-hosted-cuda.json index 29d175a7..6a364386 100644 --- a/test/self-hosted-cuda.json +++ b/test/self-hosted-cuda.json @@ -13,10 +13,7 @@ "platform": "x64 & windows" }, { - "name": "opencv4", - "features": [ - "cudnn" - ], + "name": "libtorch", "platform": "x64 & windows" } ]