OrgLion-ML
/
darknet
mirror of https://github.com/AlexeyAB/darknet.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix cuda build on appveyor, remove old unsupported config on macOS

This commit is contained in:
Stefano Sinigardi 2019-03-03 13:07:49 +01:00
parent dd0fdfb684
commit 80d0582ee4
2 changed files with 9 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
.travis.yml
View File

@ -3,18 +3,6 @@ language: cpp
matrix: matrix:
include: include:
- os: osx
compiler: gcc
name: macOS - gcc@5 - opencv@2
env:
- MATRIX_EVAL="brew install gcc@5 opencv@2 && CC=gcc-5 && CXX=g++-5 && OpenCV_DIR=/usr/local/opt/opencv@2"
- os: osx
compiler: gcc
name: macOS - gcc@5 - opencv@3
env:
- MATRIX_EVAL="brew install gcc@5 opencv@3 && CC=gcc-5 && CXX=g++-5 && OpenCV_DIR=/usr/local/opt/opencv@3"
- os: osx - os: osx
compiler: gcc compiler: gcc
name: macOS - native gcc (llvm backend) - opencv@2 name: macOS - native gcc (llvm backend) - opencv@2

18
appveyor.yml
View File

@ -13,9 +13,6 @@ environment:
VCPKG_ROOT: C:\projects\vcpkg VCPKG_ROOT: C:\projects\vcpkg
VCPKG_DEFAULT_TRIPLET: x64-windows VCPKG_DEFAULT_TRIPLET: x64-windows
USE_CUDA: yes USE_CUDA: yes
CUDACXX: C:\CUDA\bin\nvcc.exe
CUDA_PATH: C:\CUDA\
CUDA_PATH_V10_0: C:\CUDA\
- platform: Win64 - platform: Win64
COMPILER: vs COMPILER: vs
VCPKG_ROOT: C:\projects\vcpkg VCPKG_ROOT: C:\projects\vcpkg
@ -33,12 +30,15 @@ install:
- if [%COMPILER%]==[cygwin] SET PATH=%PATH:C:\Program Files\Git\usr\bin;=% - if [%COMPILER%]==[cygwin] SET PATH=%PATH:C:\Program Files\Git\usr\bin;=%
- git submodule -q update --init --recursive - git submodule -q update --init --recursive
- cd %WORKSPACE%\ - cd %WORKSPACE%\
- if [%USE_CUDA%]==[yes] curl -L https://developer.nvidia.com/compute/cuda/10.0/Prod/local_installers/cuda_10.0.130_411.31_windows -o cuda_10.0.130_411.31_windows.exe - if [%USE_CUDA%]==[yes] curl -L https://developer.nvidia.com/compute/cuda/10.1/Prod/local_installers/cuda_10.1.105_418.96_win10.exe -o setup.exe
- if [%USE_CUDA%]==[yes] mkdir C:\CUDATEMP - if [%USE_CUDA%]==[yes] .\setup.exe -s nvcc_10.1 cuobjdump_10.1 nvprune_10.1 cupti_10.1 gpu_library_advisor_10.1 memcheck_10.1 nvdisasm_10.1 nvprof_10.1 visual_profiler_10.1 visual_studio_integration_10.1 cublas_10.1 cublas_dev_10.1 cudart_10.1 cufft_10.1 cufft_dev_10.1 curand_10.1 curand_dev_10.1 cusolver_10.1 cusolver_dev_10.1 cusparse_10.1 cusparse_dev_10.1 nvgraph_10.1 nvgraph_dev_10.1 npp_10.1 npp_dev_10.1 nvrtc_10.1 nvrtc_dev_10.1 nvml_dev_10.1 occupancy_calculator_10.1 fortran_examples_10.1
- if [%USE_CUDA%]==[yes] mkdir C:\CUDA - if [%USE_CUDA%]==[yes] set CUDACXX=%ProgramFiles%\NVIDIA GPU Computing Toolkit\CUDA\v10.1\bin
- if [%USE_CUDA%]==[yes] 7z x cuda_10.0.130_411.31_windows.exe -oC:\CUDATEMP - if [%USE_CUDA%]==[yes] set CMAKE_CUDA_COMPILER=%ProgramFiles%\NVIDIA GPU Computing Toolkit\CUDA\v10.1\bin
- if [%USE_CUDA%]==[yes] cd C:\CUDATEMP - if [%USE_CUDA%]==[yes] set CUDA_TOOLKIT_ROOT_DIR=%ProgramFiles%\NVIDIA GPU Computing Toolkit\CUDA\v10.1
- if [%USE_CUDA%]==[yes] FOR /D %%G in ("*") DO xcopy C:\CUDATEMP\%%G\* C:\CUDA\ /s /y - if [%USE_CUDA%]==[yes] set CUDA_PATH=%ProgramFiles%\NVIDIA GPU Computing Toolkit\CUDA\v10.1
- if [%USE_CUDA%]==[yes] set CUDA_PATH_V10_1=%ProgramFiles%\NVIDIA GPU Computing Toolkit\CUDA\v10.1
- if [%USE_CUDA%]==[yes] set PATH=%ProgramFiles%\NVIDIA GPU Computing Toolkit\CUDA\v10.1\nvvm\bin;%PATH%
- if [%USE_CUDA%]==[yes] set PATH=%ProgramFiles%\NVIDIA GPU Computing Toolkit\CUDA\v10.1\bin;%PATH%
- cd %WORKSPACE%\ - cd %WORKSPACE%\
- mkdir cygwin-downloads - mkdir cygwin-downloads
- ps: if($env:COMPILER -eq "cygwin") { Invoke-WebRequest https://cygwin.com/setup-x86_64.exe -OutFile $env:WORKSPACE\cygwin-setup.exe } - ps: if($env:COMPILER -eq "cygwin") { Invoke-WebRequest https://cygwin.com/setup-x86_64.exe -OutFile $env:WORKSPACE\cygwin-setup.exe }