提交 f89f4b3a 编写于 作者: W wangguibao

image_classfication demo pass

Change-Id: I4f81d3e8f73138f2b9e5b84cc47913ce4cc1213b
上级 3f35cbc4
...@@ -42,9 +42,12 @@ ExternalProject_Add( ...@@ -42,9 +42,12 @@ ExternalProject_Add(
-DBUILD_PERF_TESTS=OFF -DBUILD_PERF_TESTS=OFF
-DCMAKE_BUILD_TYPE=${THIRD_PARTY_BUILD_TYPE} -DCMAKE_BUILD_TYPE=${THIRD_PARTY_BUILD_TYPE}
-DWITH_EIGEN=OFF -DWITH_EIGEN=OFF
-DWITH_JPEG=OFF -DWITH_JPEG=ON
-DWITH_PNG=OFF -DBUILD_JPEG=ON
-DWITH_TIFF=OFF -DWITH_PNG=ON
-DBUILD_PNG=ON
-DWITH_TIFF=ON
-DBUILD_TIFF=ON
-DBUILD_SHARED_LIBS=OFF -DBUILD_SHARED_LIBS=OFF
${EXTERNAL_OPTIONAL_ARGS} ${EXTERNAL_OPTIONAL_ARGS}
CMAKE_CACHE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=${OPENCV_INSTALL_DIR} CMAKE_CACHE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=${OPENCV_INSTALL_DIR}
...@@ -106,6 +109,15 @@ SET_PROPERTY(TARGET libjasper PROPERTY IMPORTED_LOCATION ${BINARY_DIR}/3rdparty/ ...@@ -106,6 +109,15 @@ SET_PROPERTY(TARGET libjasper PROPERTY IMPORTED_LOCATION ${BINARY_DIR}/3rdparty/
ADD_LIBRARY(libwebp STATIC IMPORTED GLOBAL) ADD_LIBRARY(libwebp STATIC IMPORTED GLOBAL)
SET_PROPERTY(TARGET libwebp PROPERTY IMPORTED_LOCATION ${BINARY_DIR}/3rdparty/lib/liblibwebp.a) SET_PROPERTY(TARGET libwebp PROPERTY IMPORTED_LOCATION ${BINARY_DIR}/3rdparty/lib/liblibwebp.a)
ADD_LIBRARY(libjpeg STATIC IMPORTED GLOBAL)
SET_PROPERTY(TARGET libjpeg PROPERTY IMPORTED_LOCATION ${BINARY_DIR}/3rdparty/lib/liblibjpeg.a)
ADD_LIBRARY(libpng STATIC IMPORTED GLOBAL)
SET_PROPERTY(TARGET libpng PROPERTY IMPORTED_LOCATION ${BINARY_DIR}/3rdparty/lib/liblibpng.a)
ADD_LIBRARY(libtiff STATIC IMPORTED GLOBAL)
SET_PROPERTY(TARGET libtiff PROPERTY IMPORTED_LOCATION ${BINARY_DIR}/3rdparty/lib/liblibtiff.a)
#ADD_LIBRARY(zlib STATIC IMPORTED GLOBAL) #ADD_LIBRARY(zlib STATIC IMPORTED GLOBAL)
#SET_PROPERTY(TARGET zlib PROPERTY IMPORTED_LOCATION ${BINARY_DIR}/3rdparty/lib/libzlib.a) #SET_PROPERTY(TARGET zlib PROPERTY IMPORTED_LOCATION ${BINARY_DIR}/3rdparty/lib/libzlib.a)
...@@ -116,4 +128,7 @@ LIST(APPEND opencv_depend_libs ...@@ -116,4 +128,7 @@ LIST(APPEND opencv_depend_libs
IlmImf IlmImf
libjasper libjasper
libwebp libwebp
libjpeg
libpng
libtiff
zlib) zlib)
...@@ -115,6 +115,7 @@ SET(CMAKE_EXTRA_INCLUDE_FILES "") ...@@ -115,6 +115,7 @@ SET(CMAKE_EXTRA_INCLUDE_FILES "")
if (NOT WIN32) if (NOT WIN32)
set(COMMON_FLAGS set(COMMON_FLAGS
-D__const__= -D__const__=
-DUSE_PTHREAD
-fPIC -fPIC
-fno-omit-frame-pointer -fno-omit-frame-pointer
-Wall -Wall
......
...@@ -15,6 +15,7 @@ ...@@ -15,6 +15,7 @@
**/ **/
#include "common.h" #include "common.h"
#include <stdint.h>
#ifndef BAIDU_PADDLE_SERVING_SDK_CPP_ENDPOINT_CONFIG_H #ifndef BAIDU_PADDLE_SERVING_SDK_CPP_ENDPOINT_CONFIG_H
#define BAIDU_PADDLE_SERVING_SDK_CPP_ENDPOINT_CONFIG_H #define BAIDU_PADDLE_SERVING_SDK_CPP_ENDPOINT_CONFIG_H
...@@ -52,6 +53,9 @@ template<typename T> struct type_traits { ...@@ -52,6 +53,9 @@ template<typename T> struct type_traits {
static type_traits<T> tag; static type_traits<T> tag;
}; };
template<typename T>
type_traits<T> type_traits<T>::tag;
template<typename T> struct ConfigItem { template<typename T> struct ConfigItem {
T value; T value;
bool init; bool init;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册