Skip to content

Commit

Permalink
Merge pull request #776 from EwoutH/AppVeyor-Cuda10
Browse files Browse the repository at this point in the history
AppVeyor: Build with VS 2019, Cuda 11
  • Loading branch information
fabiencastan authored Jun 16, 2020
2 parents 1b046fb + f08d3c5 commit da02a22
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 19 deletions.
18 changes: 5 additions & 13 deletions appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,22 +1,14 @@
version: '1.0.{build}'

image: Visual Studio 2015
image: Visual Studio 2019
configuration: Release

branches:
only:
- master
- develop # PRs are built

platform:
- x64

# environment:
# APPVEYOR_SAVE_CACHE_ON_ERROR: true

configuration:
- Release
# - Debug

install:
- git submodule update --init --recursive
- cmd: >-
Expand All @@ -36,15 +28,15 @@ install:
eigen3
ceres[suitesparse]
cuda
--triplet %PLATFORM%-windows
--triplet x64-windows
--recurse
- vcpkg list

before_build:
- cd %APPVEYOR_BUILD_FOLDER%
- md build
- cd build
- cmake .. -G "Visual Studio 14 2015 Win64"
- cmake .. -A x64
-DCMAKE_BUILD_TYPE=%CONFIGURATION%
-DALICEVISION_USE_INTERNAL_CERES:BOOL=OFF
-DALICEVISION_USE_CUDA:BOOL=ON
Expand All @@ -53,7 +45,7 @@ before_build:
- ls -l

build:
project: $(APPVEYOR_BUILD_FOLDER)\build\aliceVision.sln
project: build\aliceVision.sln
verbosity: minimal

#comment the above and uncomment the following to just build the dependencies
Expand Down
13 changes: 7 additions & 6 deletions cudaInstallAppveyor.cmd
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
@echo off

set CUDA_VERSION_MAJOR=9
set CUDA_VERSION_MINOR=2
set CUDA_VERSION_MICRO=88
set OS_PLATFORM=windows
set CUDA_VERSION_MAJOR=11
set CUDA_VERSION_MINOR=0
set CUDA_VERSION_MICRO=1
set DRIVER_VERSION=451.22
set OS_PLATFORM=win10

set CUDA_VERSION=%CUDA_VERSION_MAJOR%.%CUDA_VERSION_MINOR%
set CUDA_VERSION_FULL=%CUDA_VERSION%.%CUDA_VERSION_MICRO%
set CUDA_SDK_FILENAME=cuda_%CUDA_VERSION_FULL%_%OS_PLATFORM%
set CUDA_SDK_URL=https://developer.nvidia.com/compute/cuda/%CUDA_VERSION%/Prod/local_installers/%CUDA_SDK_FILENAME%
set CUDA_SDK_FILENAME=cuda_%CUDA_VERSION_FULL%_%DRIVER_VERSION%_%OS_PLATFORM%
set CUDA_SDK_URL=https://developer.download.nvidia.com/compute/cuda/%CUDA_VERSION_FULL%/local_installers/%CUDA_SDK_FILENAME%.exe

echo Downloading CUDA toolkit %CUDA_VERSION_FULL%
echo -- url: %CUDA_SDK_URL%
Expand Down

0 comments on commit da02a22

Please sign in to comment.