Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into fix-default-value
Change the default value of the parameter 'drop_last' in 'paddle.batch' to False.guochaorong-patch-1
Zhen Wang
7 years ago
commit
7b7a4afa5a
@ -0,0 +1,57 @@
|
||||
# Copyright (c) 2018 PaddlePaddle Authors. All Rights Reserved.
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
# You may obtain a copy of the License at
|
||||
#
|
||||
# http://www.apache.org/licenses/LICENSE-2.0
|
||||
#
|
||||
# Unless required by applicable law or agreed to in writing, software
|
||||
# distributed under the License is distributed on an "AS IS" BASIS,
|
||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
#
|
||||
|
||||
OPTION(WITH_LIBXSMM "Compile with libxsmm" OFF)
|
||||
|
||||
IF(NOT WITH_LIBXSMM)
|
||||
return()
|
||||
ENDIF()
|
||||
|
||||
IF(WIN32 OR APPLE OR ANDROID OR IOS)
|
||||
MESSAGE(WARNING "Windows, Mac or Mobile are not supported with libxsmm in Paddle yet.")
|
||||
SET(WITH_LIBXSMM OFF CACHE STRING "Disable LIBXSMM" FORCE)
|
||||
return()
|
||||
ENDIF()
|
||||
|
||||
INCLUDE (ExternalProject)
|
||||
|
||||
SET(LIBXSMM_SOURCES_DIR ${THIRD_PARTY_PATH}/libxsmm)
|
||||
SET(LIBXSMM_INSTALL_DIR ${THIRD_PARTY_PATH}/install/libxsmm)
|
||||
SET(LIBXSMM_INCLUDE_DIR "${LIBXSMM_INSTALL_DIR}/include" CACHE PATH "LIBXSMM include directory." FORCE)
|
||||
SET(LIBXSMM_LIBRARY_DIR "${LIBXSMM_INSTALL_DIR}/lib" CACHE PATH "LIBXSMM library directory." FORCE)
|
||||
SET(LIBXSMM_LIBS "${LIBXSMM_LIBRARY_DIR}/libxsmm.a"
|
||||
"${LIBXSMM_LIBRARY_DIR}/libxsmmnoblas.a")
|
||||
|
||||
ExternalProject_Add(
|
||||
extern_libxsmm
|
||||
GIT_REPOSITORY "https://github.com/hfp/libxsmm.git"
|
||||
GIT_TAG "7cc03b5b342fdbc6b6d990b190671c5dbb8489a2"
|
||||
PREFIX ${LIBXSMM_SOURCES_DIR}
|
||||
UPDATE_COMMAND ""
|
||||
CONFIGURE_COMMAND ""
|
||||
BUILD_IN_SOURCE 1
|
||||
BUILD_COMMAND $(MAKE) --silent PREFIX=${LIBXSMM_INSTALL_DIR} CXX=g++ CC=gcc WARP=0 install
|
||||
INSTALL_COMMAND ""
|
||||
)
|
||||
ADD_LIBRARY(libxsmm STATIC IMPORTED GLOBAL)
|
||||
SET_PROPERTY(TARGET libxsmm PROPERTY IMPORTED_LOCATION "${LIBXSMM_LIBRARY_DIR}/libxsmm.a")
|
||||
SET_PROPERTY(TARGET libxsmm PROPERTY IMPORTED_LOCATION "${LIBXSMM_LIBRARY_DIR}/libxsmmnoblas.a")
|
||||
|
||||
MESSAGE(STATUS "Libxsmm library: ${LIBXSMM_LIBS}")
|
||||
include_directories(${LIBXSMM_INCLUDE_DIR})
|
||||
ADD_DEFINITIONS(-DPADDLE_WITH_LIBXSMM)
|
||||
ADD_DEPENDENCIES(libxsmm extern_libxsmm)
|
||||
LIST(APPEND external_project_dependencies libxsmm)
|
||||
|
||||
@ -1,16 +0,0 @@
|
||||
# Copyright (c) 2016 PaddlePaddle Authors. All Rights Reserved.
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
# You may obtain a copy of the License at
|
||||
#
|
||||
# http://www.apache.org/licenses/LICENSE-2.0
|
||||
#
|
||||
# Unless required by applicable law or agreed to in writing, software
|
||||
# distributed under the License is distributed on an "AS IS" BASIS,
|
||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
#
|
||||
|
||||
add_subdirectory(inference)
|
||||
@ -1,61 +0,0 @@
|
||||
# Copyright (c) 2016 PaddlePaddle Authors. All Rights Reserved.
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
# You may obtain a copy of the License at
|
||||
#
|
||||
# http://www.apache.org/licenses/LICENSE-2.0
|
||||
#
|
||||
# Unless required by applicable law or agreed to in writing, software
|
||||
# distributed under the License is distributed on an "AS IS" BASIS,
|
||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
#
|
||||
|
||||
inference_api_test(simple_on_word2vec ARGS test_word2vec)
|
||||
|
||||
option(WITH_INFERENCE_DEMO "Compile with Inference demo" OFF)
|
||||
if(NOT WITH_INFERENCE_DEMO)
|
||||
return()
|
||||
endif()
|
||||
|
||||
set(DEMO_INSTALL_DIR "${PADDLE_BINARY_DIR}/inference_demo")
|
||||
set(URL_ROOT http://paddlemodels.bj.bcebos.com/inference-vis-demos%2F)
|
||||
|
||||
function(inference_download_test_demo TARGET)
|
||||
if (NOT WITH_TESTING)
|
||||
return()
|
||||
endif()
|
||||
set(options "")
|
||||
set(oneValueArgs URL)
|
||||
set(multiValueArgs SRCS)
|
||||
cmake_parse_arguments(tests "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
|
||||
|
||||
set(test_dir "${DEMO_INSTALL_DIR}/${TARGET}")
|
||||
message(STATUS "inference demo ${test_dir}")
|
||||
|
||||
if(NOT EXISTS "${test_dir}")
|
||||
message(STATUS "Download ${TARGET} model from ${tests_URL}")
|
||||
execute_process(COMMAND bash -c "mkdir -p ${test_dir}")
|
||||
execute_process(COMMAND bash -c "cd ${test_dir}; wget -q ${tests_URL}")
|
||||
execute_process(COMMAND bash -c "cd ${test_dir}; tar xzf *.tar.gz")
|
||||
endif()
|
||||
|
||||
cc_test(${TARGET} SRCS "${tests_SRCS}"
|
||||
DEPS paddle_inference_api paddle_fluid
|
||||
ARGS --data=${test_dir}/data.txt
|
||||
--modeldir=${test_dir}/model
|
||||
--refer=${test_dir}/result.txt)
|
||||
endfunction()
|
||||
|
||||
# disable mobilenet test
|
||||
#inference_download_test_demo(mobilenet_inference_demo
|
||||
# SRCS vis_demo.cc
|
||||
# URL ${URL_ROOT}mobilenet.tar.gz)
|
||||
inference_download_test_demo(se_resnext50_inference_demo
|
||||
SRCS vis_demo.cc
|
||||
URL ${URL_ROOT}se_resnext50.tar.gz)
|
||||
inference_download_test_demo(ocr_inference_demo
|
||||
SRCS vis_demo.cc
|
||||
URL ${URL_ROOT}ocr.tar.gz)
|
||||
@ -1,36 +0,0 @@
|
||||
# Infernce Demos
|
||||
|
||||
Input data format:
|
||||
|
||||
- Each line contains a single record
|
||||
- Each record's format is
|
||||
|
||||
```
|
||||
<space splitted floats as data>\t<space splitted ints as shape>
|
||||
```
|
||||
|
||||
Follow the C++ codes in `vis_demo.cc`.
|
||||
|
||||
## MobileNet
|
||||
|
||||
To execute the demo, simply run
|
||||
|
||||
```sh
|
||||
./mobilenet_inference_demo --modeldir <model> --data <datafile>
|
||||
```
|
||||
|
||||
## SE-ResNeXt-50
|
||||
|
||||
To execute the demo, simply run
|
||||
|
||||
```sh
|
||||
./se_resnext50_inference_demo --modeldir <model> --data <datafile>
|
||||
```
|
||||
|
||||
## OCR
|
||||
|
||||
To execute the demo, simply run
|
||||
|
||||
```sh
|
||||
./ocr_inference_demo --modeldir <model> --data <datafile>
|
||||
```
|
||||
File diff suppressed because it is too large
Load Diff
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in new issue