From 5a52de17eb3ca1eeb529db3022f9abbb78177d1f Mon Sep 17 00:00:00 2001
From: Francesco Gatti <gattifrancesco@hotmail.it>
Date: Mon, 21 Aug 2017 09:50:05 -0700
Subject: [PATCH] driveworks compile

---
 CMakeLists.txt                   | 17 +++++++++++------
 src/pluginsRT/Int8Calibrator.cpp |  8 +++++---
 src/utils.cpp                    |  4 +++-
 3 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index afdcac5..d206dca 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -33,12 +33,17 @@ cuda_add_library(kernels SHARED src/kernels/activation_elu.cu
                                 src/kernels/reorg.cu
                                 src/kernels/softmax.cu)
 
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -std=c++11")
+file(GLOB tkdnn_SRC "src/*.cpp")
+set(tkdnn_LIBS kernels ${CUDA_LIBRARIES} ${CUDA_CUBLAS_LIBRARIES} -lcudnn -lnvinfer ${OpenCV_LIBS})
+
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -std=c++11 -D_GLIBCXX_USE_CXX11_ABI=0")
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include ${CUDA_INCLUDE_DIRS} ${OPENCV_INCLUDE_DIRS})
-add_library(tkDNN SHARED src/Layer.cpp src/LayerWgs.cpp
-    src/Dense.cpp src/Activation.cpp src/Conv2d.cpp src/Flatten.cpp src/MulAdd.cpp src/Pooling.cpp src/Softmax.cpp
-    src/Route.cpp src/Reorg.cpp src/Region.cpp src/Network.cpp src/utils.cpp src/NetworkRT.cpp)
-target_link_libraries(tkDNN kernels ${CUDA_LIBRARIES} ${CUDA_CUBLAS_LIBRARIES} -lcudnn -lnvinfer ${OpenCV_LIBS})
+add_library(tkDNN SHARED ${tkdnn_SRC})
+target_link_libraries(tkDNN ${tkdnn_LIBS})
+
+#static 
+#add_library(tkDNN_static STATIC ${tkdnn_SRC})
+#target_link_libraries(tkDNN_static ${tkdnn_LIBS})
 
 add_executable(test_simple tests/simple/test_simple.cpp)
 target_link_libraries(test_simple tkDNN)
@@ -56,7 +61,7 @@ add_executable(test_yolo_tiny tests/yolo-tiny/yolo-tiny.cpp)
 target_link_libraries(test_yolo_tiny tkDNN)
 
 add_executable(test_rtinference tests/test_rtinference/rtinference.cpp)
-target_link_libraries(test_rtinference tkDNN)
+target_link_libraries(test_rtinference tkDNN_static)
 
 #install
 install(DIRECTORY include/ DESTINATION include/${CMAKE_PROJECT_NAME}
diff --git a/src/pluginsRT/Int8Calibrator.cpp b/src/pluginsRT/Int8Calibrator.cpp
index 60def25..e33d7db 100644
--- a/src/pluginsRT/Int8Calibrator.cpp
+++ b/src/pluginsRT/Int8Calibrator.cpp
@@ -143,8 +143,10 @@ public:
 		mCalibrationCache.clear();
 		std::ifstream input("table.calib", std::ios::binary);
 		input >> std::noskipws;
-		if (mReadCache && input.good())
-			std::copy(std::istream_iterator<char>(input), std::istream_iterator<char>(), std::back_inserter(mCalibrationCache));
+		
+        FatalError("rewrite different");
+        //if (mReadCache && input.good())
+		//	std::copy(std::istream_iterator<char>(input), std::istream_iterator<char>(), std::back_inserter(mCalibrationCache));
 
 		length = mCalibrationCache.size();
 		return length ? &mCalibrationCache[0] : nullptr;
@@ -163,4 +165,4 @@ private:
 	size_t mInputCount;
 	void* mDeviceInput{ nullptr };
 	std::vector<char> mCalibrationCache;
-};
\ No newline at end of file
+};
diff --git a/src/utils.cpp b/src/utils.cpp
index 57f4d40..0240874 100644
--- a/src/utils.cpp
+++ b/src/utils.cpp
@@ -15,7 +15,9 @@ void printCenteredTitle(const char *title, char fill, int dim) {
 
 bool fileExist(const char *fname) {
     std::ifstream dataFile (fname, std::ios::in | std::ios::binary);
-    return (bool) dataFile;
+    if(!dataFile)
+        return false;
+    return true;
 }