diff --git a/projects/FastRT/CMakeLists.txt b/projects/FastRT/CMakeLists.txt index d929874..055b2cb 100644 --- a/projects/FastRT/CMakeLists.txt +++ b/projects/FastRT/CMakeLists.txt @@ -4,7 +4,7 @@ set(LIBARARY_NAME "FastRT" CACHE STRING "The Fastreid-tensorrt library name") set(LIBARARY_VERSION_MAJOR "0") set(LIBARARY_VERSION_MINOR "0") -set(LIBARARY_VERSION_SINOR "1") +set(LIBARARY_VERSION_SINOR "2") set(LIBARARY_SOVERSION "0") set(LIBARARY_VERSION "${LIBARARY_VERSION_MAJOR}.${LIBARARY_VERSION_MINOR}.${LIBARARY_VERSION_SINOR}") project(${LIBARARY_NAME}${LIBARARY_VERSION}) @@ -54,4 +54,4 @@ if(BUILD_DEMO) message(STATUS "BUILD_DEMO: ON") else() message(STATUS "BUILD_DEMO: OFF") -endif() \ No newline at end of file +endif() diff --git a/projects/FastRT/demo/CMakeLists.txt b/projects/FastRT/demo/CMakeLists.txt index 1cc0f42..68b28fe 100644 --- a/projects/FastRT/demo/CMakeLists.txt +++ b/projects/FastRT/demo/CMakeLists.txt @@ -16,7 +16,7 @@ add_executable(${APP_PROJECT_NAME} inference.cpp) find_package(OpenCV) target_include_directories(${APP_PROJECT_NAME} PUBLIC - OpenCV_INCLUDE_DIRS + ${OpenCV_INCLUDE_DIRS} ) target_link_libraries(${APP_PROJECT_NAME} PUBLIC diff --git a/projects/FastRT/fastrt/CMakeLists.txt b/projects/FastRT/fastrt/CMakeLists.txt index aefecd0..2cfcc72 100644 --- a/projects/FastRT/fastrt/CMakeLists.txt +++ b/projects/FastRT/fastrt/CMakeLists.txt @@ -24,7 +24,7 @@ PUBLIC find_package(OpenCV) target_include_directories(${PROJECT_NAME} PUBLIC - OpenCV_INCLUDE_DIRS + ${OpenCV_INCLUDE_DIRS} ) target_link_libraries(${PROJECT_NAME} diff --git a/projects/FastRT/include/fastrt/model.h b/projects/FastRT/include/fastrt/model.h index a8509a7..ba0bb26 100644 --- a/projects/FastRT/include/fastrt/model.h +++ b/projects/FastRT/include/fastrt/model.h @@ -31,9 +31,9 @@ namespace fastrt { /* Create builder */ auto builder = make_holder(createInferBuilder(gLogger)); - auto config = make_holder(builder->createBuilderConfig()); + /* Create model to populate the network, then set the outputs and create an engine */ - auto engine = createEngine(builder.get(), config.get(), backbone, head); + auto engine = createEngine(builder.get(), backbone, head); TRTASSERT(engine.get()); /* Serialize the engine */ @@ -74,15 +74,16 @@ namespace fastrt { private: template - TensorRTHolder createEngine(IBuilder* builder, IBuilderConfig* config, + TensorRTHolder createEngine(IBuilder* builder, std::function&, ITensor&, const FastreidConfig&)> backbone, std::function&, ITensor&, const FastreidConfig&)> head) { auto network = make_holder(builder->createNetworkV2(0U)); + auto config = make_holder(builder->createBuilderConfig()); auto data = network->addInput(_engineCfg.input_name.c_str(), _dt, Dims3{3, _engineCfg.input_h, _engineCfg.input_w}); TRTASSERT(data); - std::map weightMap = loadWeights(_engineCfg.weights_path); + auto weightMap = loadWeights(_engineCfg.weights_path); /* Preprocessing */ auto pre_input = preprocessing_gpu(network.get(), weightMap, data); @@ -90,7 +91,9 @@ namespace fastrt { /* Modeling */ auto feat_map = backbone(network.get(), weightMap, *pre_input, _reidcfg); + TRTASSERT(feat_map); auto embedding = head(network.get(), weightMap, *feat_map->getOutput(0), _reidcfg); + TRTASSERT(embedding); /* Set output */ embedding->getOutput(0)->setName(_engineCfg.output_name.c_str());