fix: in tensorrt builds, remove forced cuda version and unused lib ou…

…tput + force-select tensorrt when tensorrt_oss is selected
jolibrain · Oct 2, 2020 · 9430fb4 · 9430fb4
1 parent 4c93ace
commit 9430fb4
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -19,6 +19,10 @@ if (USE_CAFFE)
   add_definitions(-DUSE_CAFFE)
 endif()
 
+if (USE_TENSORRT_OSS)
+  set(USE_TENSORRT ON)
+endif()
+
 if (USE_TF AND USE_CAFFE2)
   message(FATAL_ERROR "Building with tensorflow AND caffe2 causes conflict
 (The two libraries have their own protobuf embed)")
@@ -906,8 +910,6 @@ if (USE_TENSORRT)
 
 
     list(APPEND TRT_FLAGS
-      -DTRT_LIB_DIR=${TENSORRT_DIR}/lib
-      -DCUDA_VERSION=10.0
       -DTRT_OUT_DIR=${CMAKE_BINARY_DIR}/tensorrt-oss/bin
       -DCMAKE_CUDA_COMPILER=/usr/local/cuda/bin/nvcc
       )