diff --git a/mindspore/lite/minddata/CMakeLists.txt b/mindspore/lite/minddata/CMakeLists.txt index 858dcd8fb7..a167bd07da 100644 --- a/mindspore/lite/minddata/CMakeLists.txt +++ b/mindspore/lite/minddata/CMakeLists.txt @@ -288,24 +288,18 @@ if(BUILD_MINDDATA STREQUAL "full") ${MINDDATA_DIR}/util/arena.cc ) - add_library(minddata-lite SHARED + add_library(minddata-lite-obj OBJECT ${MINDDATA_KERNELS_IMAGE_LITE_CV_FILES} ${CMAKE_CURRENT_SOURCE_DIR}/../src/common/log.cc ${CORE_DIR}/utils/ms_utils.cc ${MINDDATA_FULL_SRC} ) + add_dependencies(minddata-lite-obj fbs_src) - add_library(minddata-lite_static STATIC - ${MINDDATA_KERNELS_IMAGE_LITE_CV_FILES} - ${CMAKE_CURRENT_SOURCE_DIR}/../src/common/log.cc - ${CORE_DIR}/utils/ms_utils.cc - ${MINDDATA_FULL_SRC} - ) + add_library(minddata-lite SHARED $) + add_library(minddata-lite_static STATIC $) set_target_properties(minddata-lite_static PROPERTIES OUTPUT_NAME "minddata-lite") - add_dependencies(minddata-lite fbs_src) - add_dependencies(minddata-lite_static fbs_src) - find_package(Threads REQUIRED) target_link_libraries(minddata-lite securec diff --git a/mindspore/lite/minddata/example/CMakeLists.txt b/mindspore/lite/minddata/example/CMakeLists.txt index f4403ea5d0..7deb5e1a80 100644 --- a/mindspore/lite/minddata/example/CMakeLists.txt +++ b/mindspore/lite/minddata/example/CMakeLists.txt @@ -4,8 +4,8 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror -Wall -fPIC -std=c++17") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-sign-compare") -set(MS_DIR "${CMAKE_CURRENT_SOURCE_DIR}/mindspore-lite-1.3.0-linux-x64/runtime") -set(LITECV_DIR "${CMAKE_CURRENT_SOURCE_DIR}/mindspore-lite-1.3.0-linux-x64/runtime/include/dataset") +set(MS_DIR "${CMAKE_CURRENT_SOURCE_DIR}/mindspore-lite-1.5.0-linux-x64/runtime") +set(LITECV_DIR "${CMAKE_CURRENT_SOURCE_DIR}/mindspore-lite-1.5.0-linux-x64/runtime/include/dataset") include_directories(${MS_DIR} ${LITECV_DIR}) diff --git a/mindspore/lite/minddata/example/testlitecv.cpp b/mindspore/lite/minddata/example/testlitecv.cpp index cd62148ea1..129f91890c 100644 --- a/mindspore/lite/minddata/example/testlitecv.cpp +++ b/mindspore/lite/minddata/example/testlitecv.cpp @@ -66,7 +66,7 @@ int main(int argc, char **argv) { std::cout << "lite_mat_rgb: height=" << lite_mat_rgb.height_ << ", width=" << lite_mat_rgb.width_ << std::endl; LiteMat lite_mat_resize; - constexpr target_size = 256; + constexpr int32_t target_size = 256; ResizeBilinear(lite_mat_rgb, lite_mat_resize, target_size, target_size); std::cout << "lite_mat_resize: height=" << lite_mat_resize.height_ << ", width=" << lite_mat_resize.width_ << std::endl;