mmr/tkDNN
Archived
1
0
Fork 0
Code Issues 46 Pull Requests 12 Releases 4 Activity

Replaced dynamic arrays with std::vector ,works on linux ..needs to be tested on windows after clearing up the lnk2019 error

Browse Source
This commit is contained in:
hchandirasekar
2021-01-25 04:12:05 +05:30
parent 512acd8cba
commit fb52444cdc
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CMakeLists.txt
+2 -2
View File
@@ -2,13 +2,13 @@ cmake_minimum_required(VERSION 3.5)
project (tkDNN) project (tkDNN)
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake) set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
if(LINUX) if(UNIX)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -fPIC -Wno-deprecated-declarations -Wno-unused-variable") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -fPIC -Wno-deprecated-declarations -Wno-unused-variable")
endif() endif()
if(WIN32) if(WIN32)
set(CMAKE_CXX_STANDARD 14) set(CMAKE_CXX_STANDARD 14)
set(CMAKE_CXX_FLAGS "/O2 /FS ") set(CMAKE_CXX_FLAGS "/O2 /FS ")
endif() endif(WIN32)
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include/tkDNN) include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include/tkDNN)
# project specific flags # project specific flags
src/Yolo3Detection.cpp
+4 -3
View File
@@ -94,9 +94,10 @@ void Yolo3Detection::preprocess(cv::Mat &frame, const int bi){
void Yolo3Detection::postprocess(const int bi, const bool mAP){ void Yolo3Detection::postprocess(const int bi, const bool mAP){
//get yolo outputs //get yolo outputs
dnnType *rt_out[netRT->pluginFactory->n_yolos]; std::vector<float *> rt_out;
for(int i=0; i<netRT->pluginFactory->n_yolos; i++) //dnnType *rt_out[netRT->pluginFactory->n_yolos];
rt_out[i] = (dnnType*)netRT->buffersRT[i+1] + netRT->buffersDIM[i+1].tot()*bi; for(int i=0; i<netRT->pluginFactory->n_yolos; i++)
rt_out.push_back((dnnType*)netRT->buffersRT[i+1] + netRT->buffersDIM[i+1].tot()*bi);
float x_ratio = float(originalSize[bi].width) / float(netRT->input_dim.w); float x_ratio = float(originalSize[bi].width) / float(netRT->input_dim.w);
float y_ratio = float(originalSize[bi].height) / float(netRT->input_dim.h); float y_ratio = float(originalSize[bi].height) / float(netRT->input_dim.h);
src/utils.cpp
+1 -1
View File
@@ -170,7 +170,6 @@ void getMemUsage(double& vm_usage_kb, double& resident_set_kb){
using std::ios_base; using std::ios_base;
using std::ifstream; using std::ifstream;
using std::string; using std::string;
SYSTEM_INFO sysInfo;
vm_usage_kb = 0.0; vm_usage_kb = 0.0;
resident_set_kb = 0.0; resident_set_kb = 0.0;
@@ -195,6 +194,7 @@ void getMemUsage(double& vm_usage_kb, double& resident_set_kb){
#ifdef __linux__ #ifdef __linux__
long page_size_kb = sysconf(_SC_PAGE_SIZE) / 1024; // in case x86-64 is configured to use 2MB pages long page_size_kb = sysconf(_SC_PAGE_SIZE) / 1024; // in case x86-64 is configured to use 2MB pages
#elif _WIN32 #elif _WIN32
SYSTEM_INFO sysInfo;
long page_size_kb = sysInfo.dwPageSize/1024; long page_size_kb = sysInfo.dwPageSize/1024;
#endif #endif