fixes for ci and included files

AlexeyAB · May 14, 2019 · 920b29f · 920b29f
1 parent d21dc00
commit 920b29f
Show file tree

Hide file tree

Showing 14 changed files with 61 additions and 68 deletions.
diff --git a/.travis.yml b/.travis.yml
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -307,6 +307,8 @@ if(ENABLE_ZED_CAMERA)
 endif()
 
 if(ENABLE_CUDA)
+  target_include_directories(darknet PRIVATE $<BUILD_INTERFACE:${CMAKE_CUDA_TOOLKIT_INCLUDE_DIRECTORIES})
+  target_include_directories(dark PRIVATE $<BUILD_INTERFACE:${CMAKE_CUDA_TOOLKIT_INCLUDE_DIRECTORIES})
   target_link_libraries(darknet PRIVATE curand cublas cuda)
   target_link_libraries(dark PRIVATE curand cublas cuda)
   set_target_properties(dark PROPERTIES CUDA_RESOLVE_DEVICE_SYMBOLS ON)

diff --git a/build.ps1 b/build.ps1
@@ -3,18 +3,6 @@
 $number_of_build_workers=8
 $force_using_include_libs=$false
 
-#$my_cuda_compute_model=75    #Compute capability for Tesla T4, RTX 2080
-#$my_cuda_compute_model=72    #Compute capability for Jetson Xavier
-#$my_cuda_compute_model=70    #Compute capability for Tesla V100
-#$my_cuda_compute_model=62    #Compute capability for Jetson TX2
-#$my_cuda_compute_model=61    #Compute capability for Tesla P40
-#$my_cuda_compute_model=60    #Compute capability for Tesla P100
-#$my_cuda_compute_model=53    #Compute capability for Jetson TX1
-#$my_cuda_compute_model=52    #Compute capability for Tesla M40/M60
-#$my_cuda_compute_model=37    #Compute capability for Tesla K80
-#$my_cuda_compute_model=35    #Compute capability for Tesla K20/K40
-#$my_cuda_compute_model=30    #Compute capability for Tesla K10, Quadro K4000
-
 function getProgramFiles32bit() {
   $out = ${env:PROGRAMFILES(X86)}
   if ($null -eq $out) {
@@ -153,13 +141,6 @@ if (Test-Path env:CUDA_PATH) {
     $env:CUDA_TOOLKIT_ROOT_DIR = "${env:CUDA_PATH}"
     Write-Host "Added missing env variable CUDA_TOOLKIT_ROOT_DIR" -ForegroundColor Yellow
   }
-  if ($my_cuda_compute_model) {
-    $additional_build_setup = "-DCUDA_COMPUTE_MODEL=${my_cuda_compute_model}"
-    Write-Host "Using compute capability ${my_cuda_compute_model}" -ForegroundColor Yellow
-  }
-  else {
-    Write-Host "Using default compute capability" -ForegroundColor Yellow
-  }
 }
 
 

diff --git a/build.sh b/build.sh
@@ -1,18 +1,5 @@
 #!/usr/bin/env bash
 
-## by default darknet is built with CC 3.0 if cuda is found. Uncomment another CC (only one!) if you prefer a different choice
-#my_cuda_compute_model=75    #Compute capability for Tesla T4, RTX 2080
-#my_cuda_compute_model=72    #Compute capability for Jetson Xavier
-#my_cuda_compute_model=70    #Compute capability for Tesla V100
-#my_cuda_compute_model=62    #Compute capability for Jetson TX2
-#my_cuda_compute_model=61    #Compute capability for Tesla P40
-#my_cuda_compute_model=60    #Compute capability for Tesla P100
-#my_cuda_compute_model=53    #Compute capability for Jetson TX1
-#my_cuda_compute_model=52    #Compute capability for Tesla M40/M60
-#my_cuda_compute_model=37    #Compute capability for Tesla K80
-#my_cuda_compute_model=35    #Compute capability for Tesla K20/K40
-#my_cuda_compute_model=30    #Compute capability for Tesla K10, Quadro K4000
-
 number_of_build_workers=8
 bypass_vcpkg=true
 
@@ -26,10 +13,6 @@ else
   vcpkg_triplet="x64-linux"
 fi
 
-if [[ ! -z "$my_cuda_compute_model" ]]; then
-  additional_build_setup="-DCUDA_COMPUTE_MODEL=${my_cuda_compute_model}"
-fi
-
 if [[ ! -z "${VCPKG_ROOT}" ]] && [ -d ${VCPKG_ROOT} ] && [ ! "$bypass_vcpkg" = true ]
 then
   vcpkg_path="${VCPKG_ROOT}"

diff --git a/include/darknet.h b/include/darknet.h
@@ -37,12 +37,12 @@
 
 #ifdef GPU
 
-#include "cuda_runtime.h"
-#include "curand.h"
-#include "cublas_v2.h"
+#include <cuda_runtime.h>
+#include <curand.h>
+#include <cublas_v2.h>
 
 #ifdef CUDNN
-#include "cudnn.h"
+#include <cudnn.h>
 #endif
 #endif
 

diff --git a/src/activation_kernels.cu b/src/activation_kernels.cu
@@ -1,7 +1,7 @@
 #include "darknet.h"
-#include "cuda_runtime.h"
-#include "curand.h"
-#include "cublas_v2.h"
+#include <cuda_runtime.h>
+#include <curand.h>
+#include <cublas_v2.h>
 
 #include "activations.h"
 #include "dark_cuda.h"

diff --git a/src/avgpool_layer_kernels.cu b/src/avgpool_layer_kernels.cu
@@ -1,6 +1,6 @@
-#include "cuda_runtime.h"
-#include "curand.h"
-#include "cublas_v2.h"
+#include <cuda_runtime.h>
+#include <curand.h>
+#include <cublas_v2.h>
 
 #include "avgpool_layer.h"
 #include "dark_cuda.h"

diff --git a/src/blas_kernels.cu b/src/blas_kernels.cu
@@ -1,6 +1,6 @@
-#include "cuda_runtime.h"
-#include "curand.h"
-#include "cublas_v2.h"
+#include <cuda_runtime.h>
+#include <curand.h>
+#include <cublas_v2.h>
 #include <assert.h>
 
 #include "blas.h"
@@ -1021,4 +1021,4 @@ extern "C" int is_nan_or_inf(float *input, size_t size)
 
     CHECK_CUDA(cudaFreeHost(pinned_return));
     return ret_val;
-}
+}
diff --git a/src/col2im_kernels.cu b/src/col2im_kernels.cu
@@ -1,6 +1,6 @@
-#include "cuda_runtime.h"
-#include "curand.h"
-#include "cublas_v2.h"
+#include <cuda_runtime.h>
+#include <curand.h>
+#include <cublas_v2.h>
 
 #include "col2im.h"
 #include "dark_cuda.h"

diff --git a/src/convolutional_kernels.cu b/src/convolutional_kernels.cu
@@ -1,6 +1,6 @@
-#include "cuda_runtime.h"
-#include "curand.h"
-#include "cublas_v2.h"
+#include <cuda_runtime.h>
+#include <curand.h>
+#include <cublas_v2.h>
 
 #include "convolutional_layer.h"
 #include "batchnorm_layer.h"

diff --git a/src/crop_layer_kernels.cu b/src/crop_layer_kernels.cu
@@ -1,6 +1,6 @@
-#include "cuda_runtime.h"
-#include "curand.h"
-#include "cublas_v2.h"
+#include <cuda_runtime.h>
+#include <curand.h>
+#include <cublas_v2.h>
 
 #include "crop_layer.h"
 #include "utils.h"

diff --git a/src/deconvolutional_kernels.cu b/src/deconvolutional_kernels.cu
@@ -1,6 +1,6 @@
-#include "cuda_runtime.h"
-#include "curand.h"
-#include "cublas_v2.h"
+#include <cuda_runtime.h>
+#include <curand.h>
+#include <cublas_v2.h>
 
 #include "convolutional_layer.h"
 #include "deconvolutional_layer.h"

diff --git a/src/dropout_layer_kernels.cu b/src/dropout_layer_kernels.cu
@@ -1,6 +1,6 @@
-#include "cuda_runtime.h"
-#include "curand.h"
-#include "cublas_v2.h"
+#include <cuda_runtime.h>
+#include <curand.h>
+#include <cublas_v2.h>
 
 #include "dropout_layer.h"
 #include "dark_cuda.h"

diff --git a/src/maxpool_layer_kernels.cu b/src/maxpool_layer_kernels.cu
@@ -1,6 +1,6 @@
-#include "cuda_runtime.h"
-#include "curand.h"
-#include "cublas_v2.h"
+#include <cuda_runtime.h>
+#include <curand.h>
+#include <cublas_v2.h>
 
 #include "maxpool_layer.h"
 #include "dark_cuda.h"