diff --git a/CMakeLists.txt b/CMakeLists.txt index bfdb426..a574fe5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,7 +8,7 @@ if (CUDA_FOUND) #Get CUDA compute capability set(OUTPUTFILE ${CMAKE_CURRENT_SOURCE_DIR}/cmake/cuda_script) # No suffix required set(CUDAFILE ${CMAKE_CURRENT_SOURCE_DIR}/cmake/getCudaArch.cu) - execute_process(COMMAND nvcc -lcuda ${CUDAFILE} -o ${OUTPUTFILE}) + execute_process(COMMAND ${CUDA_NVCC_EXECUTABLE} -lcuda ${CUDAFILE} -o ${OUTPUTFILE}) execute_process(COMMAND ${OUTPUTFILE} RESULT_VARIABLE CUDA_RETURN_CODE OUTPUT_VARIABLE ARCH) diff --git a/demo/demo/demo.cpp b/demo/demo/demo.cpp index fbfbb6f..c3afcda 100644 --- a/demo/demo/demo.cpp +++ b/demo/demo/demo.cpp @@ -40,7 +40,7 @@ int main(int argc, char *argv[]) { #ifdef __linux__ std::string input = "../demo/yolo_test.mp4"; #elif _WIN32 - std::string input = "..\\..\\..\\demo\\yolo_test.mp4"; + std::string input = "..\\demo\\yolo_test.mp4"; #endif char ntype = 'y'; diff --git a/src/pluginsRT/DeformableConvRT.cpp b/src/pluginsRT/DeformableConvRT.cpp index 1dc4d1a..1c1df84 100644 --- a/src/pluginsRT/DeformableConvRT.cpp +++ b/src/pluginsRT/DeformableConvRT.cpp @@ -291,31 +291,6 @@ bool DeformableConvRT::supportsFormat(DataType type, PluginFormat format) const DeformableConvRTPluginCreator::DeformableConvRTPluginCreator() { mPluginAttributes.clear(); - mPluginAttributes.emplace_back(PluginField("chunk_dim", nullptr,PluginFieldType::kINT32,1)); - mPluginAttributes.emplace_back(PluginField("kh", nullptr,PluginFieldType::kINT32,1)); - mPluginAttributes.emplace_back(PluginField("kw", nullptr,PluginFieldType::kINT32,1)); - mPluginAttributes.emplace_back(PluginField("sh", nullptr,PluginFieldType::kINT32,1)); - mPluginAttributes.emplace_back(PluginField("sw", nullptr,PluginFieldType::kINT32,1)); - mPluginAttributes.emplace_back(PluginField("ph", nullptr,PluginFieldType::kINT32,1)); - mPluginAttributes.emplace_back(PluginField("pw", nullptr,PluginFieldType::kINT32,1)); - mPluginAttributes.emplace_back(PluginField("deformable_group", nullptr,PluginFieldType::kINT32,1)); - mPluginAttributes.emplace_back(PluginField("i_n", nullptr,PluginFieldType::kINT32,1)); - mPluginAttributes.emplace_back(PluginField("i_c", nullptr,PluginFieldType::kINT32,1)); - mPluginAttributes.emplace_back(PluginField("i_h", nullptr,PluginFieldType::kINT32,1)); - mPluginAttributes.emplace_back(PluginField("i_w", nullptr,PluginFieldType::kINT32,1)); - mPluginAttributes.emplace_back(PluginField("o_n", nullptr,PluginFieldType::kINT32,1)); - mPluginAttributes.emplace_back(PluginField("o_c", nullptr,PluginFieldType::kINT32,1)); - mPluginAttributes.emplace_back(PluginField("o_h", nullptr,PluginFieldType::kINT32,1)); - mPluginAttributes.emplace_back(PluginField("o_w", nullptr,PluginFieldType::kINT32,1)); - mPluginAttributes.emplace_back(PluginField("mask_v", nullptr,PluginFieldType::kFLOAT32,1)); - mPluginAttributes.emplace_back(PluginField("offset_v", nullptr,PluginFieldType::kFLOAT32,1)); - mPluginAttributes.emplace_back(PluginField("ones_d2_v", nullptr,PluginFieldType::kFLOAT32,1)); - mPluginAttributes.emplace_back(PluginField("ones_d1_v", nullptr,PluginFieldType::kFLOAT32,1)); - mPluginAttributes.emplace_back(PluginField("data_d_v", nullptr,PluginFieldType::kFLOAT32,1)); - mPluginAttributes.emplace_back(PluginField("bias2_d_v", nullptr,PluginFieldType::kFLOAT32,1)); - mPluginAttributes.emplace_back(PluginField("height_ones", nullptr,PluginFieldType::kINT32,1)); - mPluginAttributes.emplace_back(PluginField("width_ones", nullptr,PluginFieldType::kINT32,1)); - mPluginAttributes.emplace_back(PluginField("dim_ones", nullptr,PluginFieldType::kINT32,1)); mFC.nbFields = mPluginAttributes.size(); mFC.fields = mPluginAttributes.data(); } diff --git a/src/pluginsRT/FlattenConcatRT.cpp b/src/pluginsRT/FlattenConcatRT.cpp index c281579..53036ff 100644 --- a/src/pluginsRT/FlattenConcatRT.cpp +++ b/src/pluginsRT/FlattenConcatRT.cpp @@ -163,11 +163,6 @@ bool FlattenConcatRT::supportsFormat(DataType type, PluginFormat format) const N FlattenConcatRTPluginCreator::FlattenConcatRTPluginCreator() { mPluginAttributes.clear(); - mPluginAttributes.emplace_back(PluginField("c", nullptr,PluginFieldType::kINT32,1)); - mPluginAttributes.emplace_back(PluginField("h", nullptr,PluginFieldType::kINT32,1)); - mPluginAttributes.emplace_back(PluginField("w", nullptr,PluginFieldType::kINT32,1)); - mPluginAttributes.emplace_back(PluginField("rows", nullptr,PluginFieldType::kINT32,1)); - mPluginAttributes.emplace_back(PluginField("cols", nullptr,PluginFieldType::kINT32,1)); mFC.nbFields = mPluginAttributes.size(); mFC.fields = mPluginAttributes.data(); } diff --git a/src/pluginsRT/RegionRT.cpp b/src/pluginsRT/RegionRT.cpp index 2d9899c..249c48a 100644 --- a/src/pluginsRT/RegionRT.cpp +++ b/src/pluginsRT/RegionRT.cpp @@ -170,12 +170,6 @@ void RegionRT::detachFromContext() NOEXCEPT { RegionRTPluginCreator::RegionRTPluginCreator() { mPluginAttributes.clear(); - mPluginAttributes.emplace_back(PluginField("classes", nullptr,PluginFieldType::kINT32,1)); - mPluginAttributes.emplace_back(PluginField("coords", nullptr,PluginFieldType::kINT32,1)); - mPluginAttributes.emplace_back(PluginField("num", nullptr,PluginFieldType::kINT32,1)); - mPluginAttributes.emplace_back(PluginField("c", nullptr,PluginFieldType::kINT32,1)); - mPluginAttributes.emplace_back(PluginField("h", nullptr,PluginFieldType::kINT32,1)); - mPluginAttributes.emplace_back(PluginField("w", nullptr,PluginFieldType::kINT32,1)); mFC.nbFields = mPluginAttributes.size(); mFC.fields = mPluginAttributes.data(); } diff --git a/src/pluginsRT/ReorgRT.cpp b/src/pluginsRT/ReorgRT.cpp index b1e7b1f..e3a18df 100644 --- a/src/pluginsRT/ReorgRT.cpp +++ b/src/pluginsRT/ReorgRT.cpp @@ -133,10 +133,6 @@ void ReorgRT::detachFromContext() NOEXCEPT { ReorgRTPluginCreator::ReorgRTPluginCreator() { mPluginAttributes.clear(); - mPluginAttributes.emplace_back(PluginField("stride", nullptr,PluginFieldType::kINT32,1)); - mPluginAttributes.emplace_back(PluginField("c", nullptr,PluginFieldType::kINT32,1)); - mPluginAttributes.emplace_back(PluginField("h", nullptr,PluginFieldType::kINT32,1)); - mPluginAttributes.emplace_back(PluginField("w", nullptr,PluginFieldType::kINT32,1)); mFC.nbFields = mPluginAttributes.size(); mFC.fields = mPluginAttributes.data(); } diff --git a/src/pluginsRT/ReshapeRT.cpp b/src/pluginsRT/ReshapeRT.cpp index 43cf8af..f026d3a 100644 --- a/src/pluginsRT/ReshapeRT.cpp +++ b/src/pluginsRT/ReshapeRT.cpp @@ -137,10 +137,6 @@ void ReshapeRT::detachFromContext() NOEXCEPT { ReshapeRTPluginCreator::ReshapeRTPluginCreator() { mPluginAttributes.clear(); - mPluginAttributes.emplace_back(PluginField("n", nullptr,PluginFieldType::kINT32,1)); - mPluginAttributes.emplace_back(PluginField("c", nullptr,PluginFieldType::kINT32,1)); - mPluginAttributes.emplace_back(PluginField("h", nullptr,PluginFieldType::kINT32,1)); - mPluginAttributes.emplace_back(PluginField("w", nullptr,PluginFieldType::kINT32,1)); mFC.nbFields = mPluginAttributes.size(); mFC.fields = mPluginAttributes.data(); } diff --git a/src/pluginsRT/ShortcutRT.cpp b/src/pluginsRT/ShortcutRT.cpp index ea18b0e..2a126bb 100644 --- a/src/pluginsRT/ShortcutRT.cpp +++ b/src/pluginsRT/ShortcutRT.cpp @@ -151,13 +151,6 @@ DataType ShortcutRT::getOutputDataType(int32_t index, const nvinfer1::DataType * ShortcutRTPluginCreator::ShortcutRTPluginCreator() { mPluginAttributes.clear(); - mPluginAttributes.emplace_back(PluginField("bc", nullptr,PluginFieldType::kINT32,1)); - mPluginAttributes.emplace_back(PluginField("bh", nullptr,PluginFieldType::kINT32,1)); - mPluginAttributes.emplace_back(PluginField("bw", nullptr,PluginFieldType::kINT32,1)); - mPluginAttributes.emplace_back(PluginField("mul", nullptr,PluginFieldType::kUNKNOWN,1)); - mPluginAttributes.emplace_back(PluginField("c", nullptr,PluginFieldType::kINT32,1)); - mPluginAttributes.emplace_back(PluginField("h", nullptr,PluginFieldType::kINT32,1)); - mPluginAttributes.emplace_back(PluginField("w", nullptr,PluginFieldType::kINT32,1)); mFC.nbFields = mPluginAttributes.size(); mFC.fields = mPluginAttributes.data(); } diff --git a/src/pluginsRT/UpsampleRT.cpp b/src/pluginsRT/UpsampleRT.cpp index 6859984..21ee95a 100644 --- a/src/pluginsRT/UpsampleRT.cpp +++ b/src/pluginsRT/UpsampleRT.cpp @@ -139,10 +139,6 @@ DataType UpsampleRT::getOutputDataType(int32_t index, const nvinfer1::DataType * UpsampleRTPluginCreator::UpsampleRTPluginCreator() { mPluginAttributes.clear(); - mPluginAttributes.emplace_back(PluginField("stride", nullptr,PluginFieldType::kINT32,1)); - mPluginAttributes.emplace_back(PluginField("c", nullptr,PluginFieldType::kINT32,1)); - mPluginAttributes.emplace_back(PluginField("h", nullptr,PluginFieldType::kINT32,1)); - mPluginAttributes.emplace_back(PluginField("w", nullptr,PluginFieldType::kINT32,1)); mFC.nbFields = mPluginAttributes.size(); mFC.fields = mPluginAttributes.data(); } diff --git a/src/pluginsRT/YoloRT.cpp b/src/pluginsRT/YoloRT.cpp index aa99415..3612c4e 100644 --- a/src/pluginsRT/YoloRT.cpp +++ b/src/pluginsRT/YoloRT.cpp @@ -242,19 +242,6 @@ void YoloRT::detachFromContext() NOEXCEPT { YoloRTPluginCreator::YoloRTPluginCreator() { mPluginAttributes.clear(); - mPluginAttributes.emplace_back(PluginField("classes", nullptr,PluginFieldType::kINT32,1)); - mPluginAttributes.emplace_back(PluginField("num", nullptr,PluginFieldType::kINT32,1)); - mPluginAttributes.emplace_back(PluginField("c", nullptr,PluginFieldType::kINT32,1)); - mPluginAttributes.emplace_back(PluginField("h", nullptr,PluginFieldType::kINT32,1)); - mPluginAttributes.emplace_back(PluginField("w", nullptr,PluginFieldType::kINT32,1)); - mPluginAttributes.emplace_back(PluginField("classNames", nullptr,PluginFieldType::kUNKNOWN,1)); - mPluginAttributes.emplace_back(PluginField("mask_v", nullptr,PluginFieldType::kFLOAT32,1)); - mPluginAttributes.emplace_back(PluginField("bias_v", nullptr,PluginFieldType::kFLOAT32,1)); - mPluginAttributes.emplace_back(PluginField("n_masks", nullptr,PluginFieldType::kINT32,1)); - mPluginAttributes.emplace_back(PluginField("scaleXy", nullptr,PluginFieldType::kFLOAT32,1)); - mPluginAttributes.emplace_back(PluginField("nms_thresh", nullptr,PluginFieldType::kFLOAT32,1)); - mPluginAttributes.emplace_back(PluginField("nms_kind", nullptr,PluginFieldType::kINT32,1)); - mPluginAttributes.emplace_back(PluginField("new_coords", nullptr,PluginFieldType::kINT32,1)); mFC.nbFields = mPluginAttributes.size(); mFC.fields = mPluginAttributes.data(); }