diff --git a/.travis.yml b/.travis.yml
index 8834e2af54e..93a4f6bdbe8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -668,6 +668,8 @@ matrix:
       env:
         - additional_defines=""
         - CUDACXX=/usr/local/cuda-10.0/bin/nvcc
+        - CUDA_PATH=/usr/local/cuda-10.0
+        - CUDA_TOOLKIT_ROOT_DIR=/usr/local/cuda-10.0
         - LD_LIBRARY_PATH="/usr/local/cuda-10.0/lib64:/usr/local/cuda-10.0/lib64/stubs:${LD_LIBRARY_PATH}"
         - MATRIX_EVAL="wget http://developer.download.nvidia.com/compute/cuda/repos/ubuntu1404/x86_64/cuda-repo-ubuntu1404_10.0.130-1_amd64.deb && sudo apt-key adv --fetch-keys http://developer.download.nvidia.com/compute/cuda/repos/ubuntu1404/x86_64/7fa2af80.pub && sudo dpkg -i cuda-repo-ubuntu1404_10.0.130-1_amd64.deb && wget http://developer.download.nvidia.com/compute/machine-learning/repos/ubuntu1404/x86_64/nvidia-machine-learning-repo-ubuntu1404_4.0-2_amd64.deb && sudo dpkg -i nvidia-machine-learning-repo-ubuntu1404_4.0-2_amd64.deb && sudo apt-get -y update && sudo apt-get install -y --no-install-recommends cuda-compiler-10-0 cuda-libraries-dev-10-0 cuda-driver-dev-10-0 cuda-cudart-dev-10-0 cuda-cublas-dev-10-0 cuda-curand-dev-10-0 && sudo apt-get install -y --no-install-recommends libcudnn7-dev && sudo ln -s /usr/local/cuda-10.0/lib64/stubs/libcuda.so /usr/local/cuda-10.0/lib64/stubs/libcuda.so.1"
 
@@ -683,6 +685,8 @@ matrix:
       env:
         - additional_defines=""
         - CUDACXX=/usr/local/cuda-10.0/bin/nvcc
+        - CUDA_PATH=/usr/local/cuda-10.0
+        - CUDA_TOOLKIT_ROOT_DIR=/usr/local/cuda-10.0
         - LD_LIBRARY_PATH="/usr/local/cuda-10.0/lib64:/usr/local/cuda-10.0/lib64/stubs:${LD_LIBRARY_PATH}"
         - MATRIX_EVAL="export CC=clang-3.6 && export CXX=clang++-3.6 && wget http://developer.download.nvidia.com/compute/cuda/repos/ubuntu1404/x86_64/cuda-repo-ubuntu1404_10.0.130-1_amd64.deb && sudo apt-key adv --fetch-keys http://developer.download.nvidia.com/compute/cuda/repos/ubuntu1404/x86_64/7fa2af80.pub && sudo dpkg -i cuda-repo-ubuntu1404_10.0.130-1_amd64.deb && wget http://developer.download.nvidia.com/compute/machine-learning/repos/ubuntu1404/x86_64/nvidia-machine-learning-repo-ubuntu1404_4.0-2_amd64.deb && sudo dpkg -i nvidia-machine-learning-repo-ubuntu1404_4.0-2_amd64.deb && sudo apt-get -y update && sudo apt-get install -y --no-install-recommends cuda-compiler-10-0 cuda-libraries-dev-10-0 cuda-driver-dev-10-0 cuda-cudart-dev-10-0 cuda-cublas-dev-10-0 cuda-curand-dev-10-0 && sudo apt-get install -y --no-install-recommends libcudnn7-dev && sudo ln -s /usr/local/cuda-10.0/lib64/stubs/libcuda.so /usr/local/cuda-10.0/lib64/stubs/libcuda.so.1"
 
@@ -700,6 +704,8 @@ matrix:
       env:
         - additional_defines=""
         - CUDACXX=/usr/local/cuda-10.0/bin/nvcc
+        - CUDA_PATH=/usr/local/cuda-10.0
+        - CUDA_TOOLKIT_ROOT_DIR=/usr/local/cuda-10.0
         - LD_LIBRARY_PATH="/usr/local/cuda-10.0/lib64:/usr/local/cuda-10.0/lib64/stubs:${LD_LIBRARY_PATH}"
         - MATRIX_EVAL="export CC=clang-3.8 && export CXX=clang++-3.8 && wget http://developer.download.nvidia.com/compute/cuda/repos/ubuntu1404/x86_64/cuda-repo-ubuntu1404_10.0.130-1_amd64.deb && sudo apt-key adv --fetch-keys http://developer.download.nvidia.com/compute/cuda/repos/ubuntu1404/x86_64/7fa2af80.pub && sudo dpkg -i cuda-repo-ubuntu1404_10.0.130-1_amd64.deb && wget http://developer.download.nvidia.com/compute/machine-learning/repos/ubuntu1404/x86_64/nvidia-machine-learning-repo-ubuntu1404_4.0-2_amd64.deb && sudo dpkg -i nvidia-machine-learning-repo-ubuntu1404_4.0-2_amd64.deb && sudo apt-get -y update && sudo apt-get install -y --no-install-recommends cuda-compiler-10-0 cuda-libraries-dev-10-0 cuda-driver-dev-10-0 cuda-cudart-dev-10-0 cuda-cublas-dev-10-0 cuda-curand-dev-10-0 && sudo apt-get install -y --no-install-recommends libcudnn7-dev && sudo ln -s /usr/local/cuda-10.0/lib64/stubs/libcuda.so /usr/local/cuda-10.0/lib64/stubs/libcuda.so.1"
 
@@ -717,6 +723,8 @@ matrix:
       env:
         - additional_defines=""
         - CUDACXX=/usr/local/cuda-10.0/bin/nvcc
+        - CUDA_PATH=/usr/local/cuda-10.0
+        - CUDA_TOOLKIT_ROOT_DIR=/usr/local/cuda-10.0
         - LD_LIBRARY_PATH="/usr/local/cuda-10.0/lib64:/usr/local/cuda-10.0/lib64/stubs:${LD_LIBRARY_PATH}"
         - MATRIX_EVAL="export CC=clang-3.9 && export CXX=clang++-3.9 && wget http://developer.download.nvidia.com/compute/cuda/repos/ubuntu1404/x86_64/cuda-repo-ubuntu1404_10.0.130-1_amd64.deb && sudo apt-key adv --fetch-keys http://developer.download.nvidia.com/compute/cuda/repos/ubuntu1404/x86_64/7fa2af80.pub && sudo dpkg -i cuda-repo-ubuntu1404_10.0.130-1_amd64.deb && wget http://developer.download.nvidia.com/compute/machine-learning/repos/ubuntu1404/x86_64/nvidia-machine-learning-repo-ubuntu1404_4.0-2_amd64.deb && sudo dpkg -i nvidia-machine-learning-repo-ubuntu1404_4.0-2_amd64.deb && sudo apt-get -y update && sudo apt-get install -y --no-install-recommends cuda-compiler-10-0 cuda-libraries-dev-10-0 cuda-driver-dev-10-0 cuda-cudart-dev-10-0 cuda-cublas-dev-10-0 cuda-curand-dev-10-0 && sudo apt-get install -y --no-install-recommends libcudnn7-dev && sudo ln -s /usr/local/cuda-10.0/lib64/stubs/libcuda.so /usr/local/cuda-10.0/lib64/stubs/libcuda.so.1"
 
@@ -734,6 +742,8 @@ matrix:
       env:
         - additional_defines=""
         - CUDACXX=/usr/local/cuda-10.0/bin/nvcc
+        - CUDA_PATH=/usr/local/cuda-10.0
+        - CUDA_TOOLKIT_ROOT_DIR=/usr/local/cuda-10.0
         - LD_LIBRARY_PATH="/usr/local/cuda-10.0/lib64:/usr/local/cuda-10.0/lib64/stubs:${LD_LIBRARY_PATH}"
         - MATRIX_EVAL="export CC=clang-4.0 && export CXX=clang++-4.0 && wget http://developer.download.nvidia.com/compute/cuda/repos/ubuntu1404/x86_64/cuda-repo-ubuntu1404_10.0.130-1_amd64.deb && sudo apt-key adv --fetch-keys http://developer.download.nvidia.com/compute/cuda/repos/ubuntu1404/x86_64/7fa2af80.pub && sudo dpkg -i cuda-repo-ubuntu1404_10.0.130-1_amd64.deb && wget http://developer.download.nvidia.com/compute/machine-learning/repos/ubuntu1404/x86_64/nvidia-machine-learning-repo-ubuntu1404_4.0-2_amd64.deb && sudo dpkg -i nvidia-machine-learning-repo-ubuntu1404_4.0-2_amd64.deb && sudo apt-get -y update && sudo apt-get install -y --no-install-recommends cuda-compiler-10-0 cuda-libraries-dev-10-0 cuda-driver-dev-10-0 cuda-cudart-dev-10-0 cuda-cublas-dev-10-0 cuda-curand-dev-10-0 && sudo apt-get install -y --no-install-recommends libcudnn7-dev && sudo ln -s /usr/local/cuda-10.0/lib64/stubs/libcuda.so /usr/local/cuda-10.0/lib64/stubs/libcuda.so.1"
 
@@ -751,6 +761,8 @@ matrix:
       env:
         - additional_defines=""
         - CUDACXX=/usr/local/cuda-10.0/bin/nvcc
+        - CUDA_PATH=/usr/local/cuda-10.0
+        - CUDA_TOOLKIT_ROOT_DIR=/usr/local/cuda-10.0
         - LD_LIBRARY_PATH="/usr/local/cuda-10.0/lib64:/usr/local/cuda-10.0/lib64/stubs:${LD_LIBRARY_PATH}"
         - MATRIX_EVAL="export CC=clang-5.0 && export CXX=clang++-5.0 && wget http://developer.download.nvidia.com/compute/cuda/repos/ubuntu1404/x86_64/cuda-repo-ubuntu1404_10.0.130-1_amd64.deb && sudo apt-key adv --fetch-keys http://developer.download.nvidia.com/compute/cuda/repos/ubuntu1404/x86_64/7fa2af80.pub && sudo dpkg -i cuda-repo-ubuntu1404_10.0.130-1_amd64.deb && wget http://developer.download.nvidia.com/compute/machine-learning/repos/ubuntu1404/x86_64/nvidia-machine-learning-repo-ubuntu1404_4.0-2_amd64.deb && sudo dpkg -i nvidia-machine-learning-repo-ubuntu1404_4.0-2_amd64.deb && sudo apt-get -y update && sudo apt-get install -y --no-install-recommends cuda-compiler-10-0 cuda-libraries-dev-10-0 cuda-driver-dev-10-0 cuda-cudart-dev-10-0 cuda-cublas-dev-10-0 cuda-curand-dev-10-0 && sudo apt-get install -y --no-install-recommends libcudnn7-dev && sudo ln -s /usr/local/cuda-10.0/lib64/stubs/libcuda.so /usr/local/cuda-10.0/lib64/stubs/libcuda.so.1"
 
@@ -769,6 +781,8 @@ matrix:
       env:
         - additional_defines=""
         - CUDACXX=/usr/local/cuda-10.0/bin/nvcc
+        - CUDA_PATH=/usr/local/cuda-10.0
+        - CUDA_TOOLKIT_ROOT_DIR=/usr/local/cuda-10.0
         - LD_LIBRARY_PATH="/usr/local/cuda-10.0/lib64:/usr/local/cuda-10.0/lib64/stubs:${LD_LIBRARY_PATH}"
         - MATRIX_EVAL="export CC=clang-6.0 && export CXX=clang++-6.0 && wget http://developer.download.nvidia.com/compute/cuda/repos/ubuntu1404/x86_64/cuda-repo-ubuntu1404_10.0.130-1_amd64.deb && sudo apt-key adv --fetch-keys http://developer.download.nvidia.com/compute/cuda/repos/ubuntu1404/x86_64/7fa2af80.pub && sudo dpkg -i cuda-repo-ubuntu1404_10.0.130-1_amd64.deb && wget http://developer.download.nvidia.com/compute/machine-learning/repos/ubuntu1404/x86_64/nvidia-machine-learning-repo-ubuntu1404_4.0-2_amd64.deb && sudo dpkg -i nvidia-machine-learning-repo-ubuntu1404_4.0-2_amd64.deb && sudo apt-get -y update && sudo apt-get install -y --no-install-recommends cuda-compiler-10-0 cuda-libraries-dev-10-0 cuda-driver-dev-10-0 cuda-cudart-dev-10-0 cuda-cublas-dev-10-0 cuda-curand-dev-10-0 && sudo apt-get install -y --no-install-recommends libcudnn7-dev && sudo ln -s /usr/local/cuda-10.0/lib64/stubs/libcuda.so /usr/local/cuda-10.0/lib64/stubs/libcuda.so.1"
 
@@ -783,6 +797,8 @@ matrix:
       env:
         - additional_defines=""
         - CUDACXX=/usr/local/cuda-10.0/bin/nvcc
+        - CUDA_PATH=/usr/local/cuda-10.0
+        - CUDA_TOOLKIT_ROOT_DIR=/usr/local/cuda-10.0
         - LD_LIBRARY_PATH="/usr/local/cuda-10.0/lib64:/usr/local/cuda-10.0/lib64/stubs:${LD_LIBRARY_PATH}"
         - MATRIX_EVAL="wget http://developer.download.nvidia.com/compute/cuda/repos/ubuntu1404/x86_64/cuda-repo-ubuntu1404_10.0.130-1_amd64.deb && sudo apt-key adv --fetch-keys http://developer.download.nvidia.com/compute/cuda/repos/ubuntu1404/x86_64/7fa2af80.pub && sudo dpkg -i cuda-repo-ubuntu1404_10.0.130-1_amd64.deb && wget http://developer.download.nvidia.com/compute/machine-learning/repos/ubuntu1404/x86_64/nvidia-machine-learning-repo-ubuntu1404_4.0-2_amd64.deb && sudo dpkg -i nvidia-machine-learning-repo-ubuntu1404_4.0-2_amd64.deb && sudo apt-get -y update && sudo apt-get install -y --no-install-recommends cuda-compiler-10-0 cuda-libraries-dev-10-0 cuda-driver-dev-10-0 cuda-cudart-dev-10-0 cuda-cublas-dev-10-0 cuda-curand-dev-10-0 && sudo apt-get install -y --no-install-recommends libcudnn7-dev && sudo ln -s /usr/local/cuda-10.0/lib64/stubs/libcuda.so /usr/local/cuda-10.0/lib64/stubs/libcuda.so.1"
 
@@ -800,6 +816,8 @@ matrix:
       env:
         - additional_defines=""
         - CUDACXX=/usr/local/cuda-10.0/bin/nvcc
+        - CUDA_PATH=/usr/local/cuda-10.0
+        - CUDA_TOOLKIT_ROOT_DIR=/usr/local/cuda-10.0
         - LD_LIBRARY_PATH="/usr/local/cuda-10.0/lib64:/usr/local/cuda-10.0/lib64/stubs:${LD_LIBRARY_PATH}"
         - MATRIX_EVAL="export CC=gcc-4.9 && export CXX=g++-4.9 && wget http://developer.download.nvidia.com/compute/cuda/repos/ubuntu1404/x86_64/cuda-repo-ubuntu1404_10.0.130-1_amd64.deb && sudo apt-key adv --fetch-keys http://developer.download.nvidia.com/compute/cuda/repos/ubuntu1404/x86_64/7fa2af80.pub && sudo dpkg -i cuda-repo-ubuntu1404_10.0.130-1_amd64.deb && wget http://developer.download.nvidia.com/compute/machine-learning/repos/ubuntu1404/x86_64/nvidia-machine-learning-repo-ubuntu1404_4.0-2_amd64.deb && sudo dpkg -i nvidia-machine-learning-repo-ubuntu1404_4.0-2_amd64.deb && sudo apt-get -y update && sudo apt-get install -y --no-install-recommends cuda-compiler-10-0 cuda-libraries-dev-10-0 cuda-driver-dev-10-0 cuda-cudart-dev-10-0 cuda-cublas-dev-10-0 cuda-curand-dev-10-0 && sudo apt-get install -y --no-install-recommends libcudnn7-dev && sudo ln -s /usr/local/cuda-10.0/lib64/stubs/libcuda.so /usr/local/cuda-10.0/lib64/stubs/libcuda.so.1"
 
@@ -817,6 +835,8 @@ matrix:
       env:
         - additional_defines=""
         - CUDACXX=/usr/local/cuda-10.0/bin/nvcc
+        - CUDA_PATH=/usr/local/cuda-10.0
+        - CUDA_TOOLKIT_ROOT_DIR=/usr/local/cuda-10.0
         - LD_LIBRARY_PATH="/usr/local/cuda-10.0/lib64:/usr/local/cuda-10.0/lib64/stubs:${LD_LIBRARY_PATH}"
         - MATRIX_EVAL="export CC=gcc-5 && export CXX=g++-5 && wget http://developer.download.nvidia.com/compute/cuda/repos/ubuntu1404/x86_64/cuda-repo-ubuntu1404_10.0.130-1_amd64.deb && sudo apt-key adv --fetch-keys http://developer.download.nvidia.com/compute/cuda/repos/ubuntu1404/x86_64/7fa2af80.pub && sudo dpkg -i cuda-repo-ubuntu1404_10.0.130-1_amd64.deb && wget http://developer.download.nvidia.com/compute/machine-learning/repos/ubuntu1404/x86_64/nvidia-machine-learning-repo-ubuntu1404_4.0-2_amd64.deb && sudo dpkg -i nvidia-machine-learning-repo-ubuntu1404_4.0-2_amd64.deb && sudo apt-get -y update && sudo apt-get install -y --no-install-recommends cuda-compiler-10-0 cuda-libraries-dev-10-0 cuda-driver-dev-10-0 cuda-cudart-dev-10-0 cuda-cublas-dev-10-0 cuda-curand-dev-10-0 && sudo apt-get install -y --no-install-recommends libcudnn7-dev && sudo ln -s /usr/local/cuda-10.0/lib64/stubs/libcuda.so /usr/local/cuda-10.0/lib64/stubs/libcuda.so.1"
 
@@ -834,6 +854,8 @@ matrix:
       env:
         - additional_defines=""
         - CUDACXX=/usr/local/cuda-10.0/bin/nvcc
+        - CUDA_PATH=/usr/local/cuda-10.0
+        - CUDA_TOOLKIT_ROOT_DIR=/usr/local/cuda-10.0
         - LD_LIBRARY_PATH="/usr/local/cuda-10.0/lib64:/usr/local/cuda-10.0/lib64/stubs:${LD_LIBRARY_PATH}"
         - MATRIX_EVAL="export CC=gcc-6 && export CXX=g++-6 && wget http://developer.download.nvidia.com/compute/cuda/repos/ubuntu1404/x86_64/cuda-repo-ubuntu1404_10.0.130-1_amd64.deb && sudo apt-key adv --fetch-keys http://developer.download.nvidia.com/compute/cuda/repos/ubuntu1404/x86_64/7fa2af80.pub && sudo dpkg -i cuda-repo-ubuntu1404_10.0.130-1_amd64.deb && wget http://developer.download.nvidia.com/compute/machine-learning/repos/ubuntu1404/x86_64/nvidia-machine-learning-repo-ubuntu1404_4.0-2_amd64.deb && sudo dpkg -i nvidia-machine-learning-repo-ubuntu1404_4.0-2_amd64.deb && sudo apt-get -y update && sudo apt-get install -y --no-install-recommends cuda-compiler-10-0 cuda-libraries-dev-10-0 cuda-driver-dev-10-0 cuda-cudart-dev-10-0 cuda-cublas-dev-10-0 cuda-curand-dev-10-0 && sudo apt-get install -y --no-install-recommends libcudnn7-dev && sudo ln -s /usr/local/cuda-10.0/lib64/stubs/libcuda.so /usr/local/cuda-10.0/lib64/stubs/libcuda.so.1"
 
@@ -851,6 +873,8 @@ matrix:
       env:
         - additional_defines=""
         - CUDACXX=/usr/local/cuda-10.0/bin/nvcc
+        - CUDA_PATH=/usr/local/cuda-10.0
+        - CUDA_TOOLKIT_ROOT_DIR=/usr/local/cuda-10.0
         - LD_LIBRARY_PATH="/usr/local/cuda-10.0/lib64:/usr/local/cuda-10.0/lib64/stubs:${LD_LIBRARY_PATH}"
         - MATRIX_EVAL="export CC=gcc-7 && export CXX=g++-7 && wget http://developer.download.nvidia.com/compute/cuda/repos/ubuntu1404/x86_64/cuda-repo-ubuntu1404_10.0.130-1_amd64.deb && sudo apt-key adv --fetch-keys http://developer.download.nvidia.com/compute/cuda/repos/ubuntu1404/x86_64/7fa2af80.pub && sudo dpkg -i cuda-repo-ubuntu1404_10.0.130-1_amd64.deb && wget http://developer.download.nvidia.com/compute/machine-learning/repos/ubuntu1404/x86_64/nvidia-machine-learning-repo-ubuntu1404_4.0-2_amd64.deb && sudo dpkg -i nvidia-machine-learning-repo-ubuntu1404_4.0-2_amd64.deb && sudo apt-get -y update && sudo apt-get install -y --no-install-recommends cuda-compiler-10-0 cuda-libraries-dev-10-0 cuda-driver-dev-10-0 cuda-cudart-dev-10-0 cuda-cublas-dev-10-0 cuda-curand-dev-10-0 && sudo apt-get install -y --no-install-recommends libcudnn7-dev && sudo ln -s /usr/local/cuda-10.0/lib64/stubs/libcuda.so /usr/local/cuda-10.0/lib64/stubs/libcuda.so.1"
 
@@ -868,6 +892,8 @@ matrix:
       env:
         - additional_defines=""
         - CUDACXX=/usr/local/cuda-10.0/bin/nvcc
+        - CUDA_PATH=/usr/local/cuda-10.0
+        - CUDA_TOOLKIT_ROOT_DIR=/usr/local/cuda-10.0
         - LD_LIBRARY_PATH="/usr/local/cuda-10.0/lib64:/usr/local/cuda-10.0/lib64/stubs:${LD_LIBRARY_PATH}"
         - MATRIX_EVAL="export CC=gcc-8 && export CXX=g++-8 && wget http://developer.download.nvidia.com/compute/cuda/repos/ubuntu1404/x86_64/cuda-repo-ubuntu1404_10.0.130-1_amd64.deb && sudo apt-key adv --fetch-keys http://developer.download.nvidia.com/compute/cuda/repos/ubuntu1404/x86_64/7fa2af80.pub && sudo dpkg -i cuda-repo-ubuntu1404_10.0.130-1_amd64.deb && wget http://developer.download.nvidia.com/compute/machine-learning/repos/ubuntu1404/x86_64/nvidia-machine-learning-repo-ubuntu1404_4.0-2_amd64.deb && sudo dpkg -i nvidia-machine-learning-repo-ubuntu1404_4.0-2_amd64.deb && sudo apt-get -y update && sudo apt-get install -y --no-install-recommends cuda-compiler-10-0 cuda-libraries-dev-10-0 cuda-driver-dev-10-0 cuda-cudart-dev-10-0 cuda-cublas-dev-10-0 cuda-curand-dev-10-0 && sudo apt-get install -y --no-install-recommends libcudnn7-dev && sudo ln -s /usr/local/cuda-10.0/lib64/stubs/libcuda.so /usr/local/cuda-10.0/lib64/stubs/libcuda.so.1"
 
@@ -887,6 +913,7 @@ matrix:
         - VCPKG_DEFINES="-DCMAKE_TOOLCHAIN_FILE=$HOME/vcpkg/scripts/buildsystems/vcpkg.cmake"
         - CUDACXX=/usr/local/cuda-10.0/bin/nvcc
         - CUDA_PATH=/usr/local/cuda-10.0
+        - CUDA_TOOLKIT_ROOT_DIR=/usr/local/cuda-10.0
         - LD_LIBRARY_PATH="/usr/local/cuda-10.0/lib64:/usr/local/cuda-10.0/lib64/stubs:${LD_LIBRARY_PATH}"
         - MATRIX_EVAL="export CC=gcc-8 && export CXX=g++-8 && wget http://developer.download.nvidia.com/compute/cuda/repos/ubuntu1404/x86_64/cuda-repo-ubuntu1404_10.0.130-1_amd64.deb && sudo apt-key adv --fetch-keys http://developer.download.nvidia.com/compute/cuda/repos/ubuntu1404/x86_64/7fa2af80.pub && sudo dpkg -i cuda-repo-ubuntu1404_10.0.130-1_amd64.deb && wget http://developer.download.nvidia.com/compute/machine-learning/repos/ubuntu1404/x86_64/nvidia-machine-learning-repo-ubuntu1404_4.0-2_amd64.deb && sudo dpkg -i nvidia-machine-learning-repo-ubuntu1404_4.0-2_amd64.deb && sudo apt-get -y update && sudo apt-get install -y --no-install-recommends cuda-compiler-10-0 cuda-libraries-dev-10-0 cuda-driver-dev-10-0 cuda-cudart-dev-10-0 cuda-cublas-dev-10-0 cuda-curand-dev-10-0 && sudo apt-get install -y --no-install-recommends libcudnn7-dev && sudo ln -s /usr/local/cuda-10.0/lib64/stubs/libcuda.so /usr/local/cuda-10.0/lib64/stubs/libcuda.so.1"
 
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8d0384b3cd4..9ebd7a361fb 100644
--- 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
index e18ee4fa7d2..b36d305404d 100755
--- 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
index 481bbaf56a7..8bbabf2f2fc 100755
--- 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
index 82f033e3bea..878d07d809c 100644
--- 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
index 6c9445a6e7c..6bd86dcae37 100644
--- 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
index 676faa69809..b8cdd603d63 100644
--- 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
index 2070bc1f029..4115669316c 100644
--- 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;
-}
\ No newline at end of file
+}
diff --git a/src/col2im_kernels.cu b/src/col2im_kernels.cu
index 2f18a0fd3c4..a6e985f1132 100644
--- 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
index cfa4fe7e8fc..892ccc93443 100644
--- 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
index 46afca6c593..85783bcc39f 100644
--- 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
index 472b2247977..6af65ebbd46 100644
--- 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
index ceba0fa38bc..d3af0ea614f 100644
--- 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
index 36fccf322a3..341a5b8b81c 100644
--- 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"