提交 1eb9c36f 编写于 作者: Y Yu Yang

Make ApproximatelyEquals fit for protobuf2

上级 f11be50c
...@@ -12,6 +12,17 @@ include(package) ...@@ -12,6 +12,17 @@ include(package)
find_package(SWIG 2.0) find_package(SWIG 2.0)
find_package(CUDA QUIET) find_package(CUDA QUIET)
find_package(Protobuf REQUIRED) find_package(Protobuf REQUIRED)
# Check protobuf library version.
execute_process(COMMAND ${PROTOBUF_PROTOC_EXECUTABLE} --version
OUTPUT_VARIABLE PROTOBUF_VERSION)
string(REPLACE "libprotoc " "" PROTOBUF_VERSION ${PROTOBUF_VERSION})
set(PROTOBUF_3 OFF)
if (${PROTOBUF_VERSION} VERSION_GREATER "3.0.0" OR ${PROTOBUF_VERSION} VERSION_EQUAL "3.0.0")
set(PROTOBUF_3 ON)
endif()
find_package(PythonLibs 2.7 REQUIRED) find_package(PythonLibs 2.7 REQUIRED)
find_package(PythonInterp 2.7 REQUIRED) find_package(PythonInterp 2.7 REQUIRED)
find_package(ZLIB REQUIRED) find_package(ZLIB REQUIRED)
......
execute_process(COMMAND ${PROTOBUF_PROTOC_EXECUTABLE} --version
OUTPUT_VARIABLE PROTOBUF_VERSION)
string(REPLACE "libprotoc " "" PROTOBUF_VERSION ${PROTOBUF_VERSION})
set(PROTOBUF_3 OFF)
if (${PROTOBUF_VERSION} VERSION_GREATER "3.0.0" OR ${PROTOBUF_VERSION} VERSION_EQUAL "3.0.0")
set(PROTOBUF_3 ON)
endif()
set(proto_filenames set(proto_filenames
DataConfig.proto DataConfig.proto
DataFormat.proto DataFormat.proto
......
...@@ -4,11 +4,17 @@ add_test(NAME layers_test ...@@ -4,11 +4,17 @@ add_test(NAME layers_test
python ${PROJ_ROOT}/python/paddle/trainer_config_helpers/tests/layers_test.py python ${PROJ_ROOT}/python/paddle/trainer_config_helpers/tests/layers_test.py
WORKING_DIRECTORY ${PROJ_ROOT}/python/paddle) WORKING_DIRECTORY ${PROJ_ROOT}/python/paddle)
add_paddle_exe(protobuf_equal if (PROTOBUF_3)
add_paddle_exe(protobuf_equal
ProtobufEqualMain.cpp) ProtobufEqualMain.cpp)
add_test(NAME test_layerHelpers
add_test(NAME test_layerHelpers
COMMAND COMMAND
${PROJ_ROOT}/python/paddle/trainer_config_helpers/tests/configs/run_tests.sh ${PROJ_ROOT}/python/paddle/trainer_config_helpers/tests/configs/run_tests.sh
${CMAKE_CURRENT_BINARY_DIR}/protobuf_equal ${CMAKE_CURRENT_BINARY_DIR}/protobuf_equal
) )
else()
add_test(NAME test_layerHelpers
COMMAND
${PROJ_ROOT}/python/paddle/trainer_config_helpers/tests/configs/run_tests.sh
)
endif()
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册