Conv 在BM1682上的实现

.gitignore

@@ -37,3 +37,6 @@ android_build
 ios_build
 gpu_build
 output
+
+.idea
+.vscode

.travis.yml

@@ -7,8 +7,8 @@ os:
 env:
   - JOB="-p NVIDIA-GPU -o Centos"
   - JOB="-p NVIDIA-GPU -o Ubuntu"
-  #- JOB="-p AMD_GPU -o Centos"
-  #- JOB="-p AMD_GPU -o Ubuntu"
+  #- JOB="-p AMD-GPU -o Centos"
+  #- JOB="-p AMD-GPU -o Ubuntu"
   #- JOB="-p X86-ONLY -o Centos"
   #- JOB="-p X86-ONLY -o Ubuntu"
   #- JOB="-p ARM -o Centos"
@@ -31,6 +31,8 @@ branches:
   only:
   - master
   - developing
+  - AMD
+  - dev_v2
 
 notifications:
   email:

AUTHORS.md

@@ -0,0 +1,27 @@
+| Github account | name |
+|---|---|
+|   chenjiaoAngel   |   Jiao Chen   |
+|   cyj1986 |   Yujuan Cheng    |
+|   feifei14119 |   Fei Wang    |
+|   jackyh  |   Chengjie He |
+|   Jayoprell   |   Xiaocheng Luo   |
+|   jjsbear |   Jingsong Ji |
+|   LittleMaer  |   Yi Zhuang   |
+|   mengkai94   |   Kai Meng    |
+|   micytw  |   Michael Wu  |
+|   pangge  |   Chaowen Cui |
+|   perchbird   |   Xiaokun Yu  |
+|   PeterJkPeng |   Junyi Peng  |
+|   qq332982511 |   Junjie Liu  |
+|   Shixiaowei02    |   Xiaowei Shi |
+|   sogalin |   Soga Lin    |
+|   throneclay  |   Shuai Zhang |
+|   vin-huang   |   Vin Huang   |
+|   wgy0804 |   Guoya Wang  |
+|   xklnono |   Kailu Xu    |
+|   xyoungli    |   Xiaoyang Li |
+|   yanan1112   |   Yanan Liu   |
+|   yao-matrix  |   Weifeng Yao |
+|   zdcocnftcp10    |   Dachuan Zhao    |
+|   zhouhuan2009    |   Huan Zhou   |
+|   zoooooooyuan    |   Yuan Zu |

CMakeLists.txt

@@ -1,23 +1,32 @@
-# ----------------------------------------------------------------------------
-# Copyright (c) 2016 Baidu.com, Inc. All Rights Reserved
-# @file		root cmakefile
-# @auther   cuichaowen
-# @date		2017-10-24
-# ----------------------------------------------------------------------------
+# Copyright (c) 2018 Anakin Authors, Inc. 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.
+
 include(cmake/thirdparty_version.cmake)
-cmake_minimum_required(VERSION ${MIN_CMAKE_V} FATAL_ERROR)
-project(ANAKIN C CXX) 
+project(ANAKIN C CXX)
 include(cmake/msg_color.cmake)
 include(cmake/utils.cmake)
 include(cmake/statistic.cmake)
 
 # ----------------------------------------------------------------------------
 # section: global anakin version and lib name
 # ----------------------------------------------------------------------------
-# global anakin version 2.0.1
-set(VERSION_MAJOR "2")
-set(VERSION_MINOR "0")
-set(VERSION_PATCH "1")
+cmake_minimum_required(VERSION ${MIN_CMAKE_V} FATAL_ERROR)
+
+# global anakin version 0.1.0
+set(VERSION_MAJOR "0")
+set(VERSION_MINOR "1")
+set(VERSION_PATCH "0")
 set(VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}")
 
 # anakin lib name and global directories
@@ -28,12 +37,15 @@ set(ANAKIN_ROOT ${PROJECT_SOURCE_DIR})
 include_directories(${ANAKIN_ROOT})
 
 set(ANAKIN_FRAMEWORK ${ANAKIN_ROOT}/framework)
-set(ANAKIN_THIRD_PARTY_PATH ${CMAKE_BINARY_DIR}/third-party)
+set(ANAKIN_LITE ${ANAKIN_FRAMEWORK}/lite)
 set(ANAKIN_UTILS ${ANAKIN_ROOT}/utils)
 set(ANAKIN_THIRD_PARTY_PATH ${ANAKIN_ROOT}/third-party)
 set(ANAKIN_MODEL_PARSER ${ANAKIN_FRAMEWORK}/model_parser)
+set(ANAKIN_SERVICE ${ANAKIN_FRAMEWORK}/service)
 set(ANAKIN_SABER ${ANAKIN_ROOT}/saber)
 set(ANAKIN_UNIT_TEST ${ANAKIN_ROOT}/test)
+set(ANAKIN_EXAMPLES ${ANAKIN_ROOT}/examples)
+
 
 # ----------------------------------------------------------------------------
 # section: options for anakin
@@ -48,12 +60,13 @@ anakin_option(ANAKIN_TYPE_INT8 "define the INT8 for data precision." NO)
 anakin_option(USE_GPU_PLACE "Select the build mode for GPU place." YES)
 anakin_option(USE_X86_PLACE "Select the build mode for X86 place." YES)
 anakin_option(USE_ARM_PLACE "Select the build mode for ARM place." NO)
+anakin_option(USE_BM_PLACE "Select the build mode for BM place." NO)
 
 # plantfrom details
 anakin_option(NVIDIA_GPU "Use NVIDIA GPU place." YES if USE_GPU_PLACE)
 anakin_option(AMD_GPU "Use AMD GPU place." NO if USE_GPU_PLACE AND NOT NVIDIA_GPU)
-anakin_option(TARGET_ANDROID "" NO if USE_ARM_PLACE)
-anakin_option(TARGET_IOS "" NO if USE_ARM_PLACE)
+anakin_option(TARGET_ANDROID "build for android" YES if USE_ARM_PLACE)
+anakin_option(TARGET_IOS "not supported now" YES if USE_ARM_PLACE AND NOT TARGET_ANDROID)
 
 # compile options for NVIDIA_GPU place
 anakin_option(USE_CUDA "Use Cuda libs." YES if NVIDIA_GPU)
@@ -64,60 +77,52 @@ anakin_option(USE_CUDNN "Use Cudnn libs." YES if USE_CUDA)
 anakin_option(BUILD_CROSS_PLANTFORM "Build anakin lib for any nvidia device plantform." YES if USE_CUDA)
 anakin_option(BUILD_FAT_BIN "Build anakin cuda fat-bin lib for all device plantform" NO if BUILD_CROSS_PLANTFORM)
 
-# compile options for BM place
-#anakin_option(USE_BM "Use Cuda libs." YES if NVIDIA_GPU)
-#anakin_option(USE_CUBLAS "Use Cublas libs." YES if USE_BM)
-#anakin_option(USE_CURAND "Use Curand libs." YES if USE_BM)
-#anakin_option(USE_CUFFT "Use CuFFT libs." YES if USE_BM)
-#anakin_option(USE_CUDNN "Use Cudnn libs." YES if USE_BM)
-#anakin_option(BUILD_CROSS_PLANTFORM "Build anakin lib for any nvidia device plantform." YES if USE_BM)
-
-
 if(USE_CUDA)
     # Select gpu target arch for local high performance implement sass code . Now we have checked on sm_61 sm_50 and it works well.
     set(SELECTED_SASS_TARGET_ARCH "61")
-elseif(USE_BM)
-    # Select gpu target arch for local high performance implement sass code . Now we have checked on sm_61 sm_50 and it works well.
-    #set(SELECTED_SASS_TARGET_ARCH "61")
 endif()
 if((NOT BUILD_FAT_BIN) AND (NOT BUILD_CROSS_PLANTFORM) AND USE_CUDA)
     # Select the only nvidia gpu arch you want to be built on
-    set(TARGET_GPUARCH 6.1) 
+    set(TARGET_GPUARCH 6.1)
 endif()
 
 # build options for cuda.
 anakin_option(BUILD_CUBIN "BUILD with the -cubin option in Device mode" NO if USE_CUDA)
 anakin_option(COMPILE_PTX "Returns a list of PTX files generated from src." NO if USE_CUDA)
 
-# build options for BM.
-anakin_option(BUILD_CUBIN "BUILD with the -cubin option in Device mode" NO if USE_BM)
-anakin_option(COMPILE_PTX "Returns a list of PTX files generated from src." NO if USE_BM)
-
-
 # common build options
-anakin_option(ENABLE_DEBUG "Enable DEBUG(default) mode." NO)
+anakin_option(ENABLE_DEBUG "Enable DEBUG(default) mode." YES)
 anakin_option(ENABLE_VERBOSE_MSG "Enable verbose=1 : compile msg during make." NO)
 anakin_option(DISABLE_ALL_WARNINGS "Disable all the warning msg during compile." YES)
 anakin_option(ENABLE_NOISY_WARNINGS "Enable noisy warning msg during compile." NO if DISABLE_ALL_WARNINGS)
 
 # using 3rd party libs 
-anakin_option(USE_GLOG "Build Glog components." NO)
+anakin_option(USE_LOGGER "Build native logger components." YES)
+anakin_option(USE_GLOG "Build Glog components." NO if NOT USE_LOGGER)
 anakin_option(USE_PROTOBUF "Build Google protobuf components." YES)
 anakin_option(USE_OPENCV "Use static opencv libs." NO)
 anakin_option(USE_BOOST "Use static BOOST libs." NO)
-anakin_option(USE_OPENMP "Use Openmp when in andriod environment." YES if TARGET_ANDROID)
+anakin_option(USE_OPENMP "Use Openmp when in android environment." YES if TARGET_ANDROID)
 anakin_option(USE_GTEST "Use googletest libs." NO if BUILD_WITH_UNIT_TEST)
 anakin_option(USE_PYTHON "Generate py wrappers." NO)
-anakin_option(USE_OPENCL "Use OpenCL ." NO)
+anakin_option(USE_OPENCL "Use OpenCL ." YES if AMD_GPU)
 anakin_option(USE_GFLAGS "Build Google gflags components." NO)
 anakin_option(USE_MKL "Use mkl libs." NO if USE_X86_PLACE)
 anakin_option(USE_MKLML "Use MKLML libs." YES if USE_X86_PLACE)
 anakin_option(USE_XBYAK "Use XBYAK libs." YES if USE_X86_PLACE)
-anakin_option(USE_OPENMP "Use Openmp when in andriod environment." YES if TARGET_ANDROID)
+anakin_option(USE_OPENMP "Use Openmp when in android environment." YES if TARGET_ANDROID)
 
 # build components
 anakin_option(BUILD_WITH_UNIT_TEST "Build anakin unit test components." YES)
 
+anakin_option(BUILD_WITH_FRAMEWORK "Build anakin framework" YES)
+
+anakin_option(BUILD_RPC "Build anakin rpc service components." NO if BUILD_WITH_FRAMEWORK)
+anakin_option(BUILD_WITH_LITE "Build anakin lite components." YES if USE_GPU_PLACE AND BUILD_WITH_FRAMEWORK)
+
+# build examples
+anakin_option(BUILD_EXAMPLES "build detection and classification examples" NO)
+
 # build target
 anakin_option(BUILD_SHARED "Build anakin shared lib." YES)
 anakin_option(BUILD_STATIC "Build anakin static lib." YES if NOT BUILD_SHARED)
@@ -127,19 +132,25 @@ anakin_option(ENABLE_OP_TIMER "Enable op timer mode." NO)
 # ----------------------------------------------------------------------------
 # section: anakin compiler and linker options
 # ----------------------------------------------------------------------------
+set(CMAKE_BUILD_TYPE Debug FORCE)
 if(ENABLE_DEBUG)
-	set(CMAKE_BUILD_TYPE Debug FORCE)
+    set(CMAKE_BUILD_TYPE Debug FORCE)
 else()
-	set(CMAKE_BUILD_TYPE Release FORCE)
+    set(CMAKE_BUILD_TYPE Release FORCE)
+endif()
+
+if(USE_LOGGER) 
+	anakin_option(ENABLE_STACKTRACES "If enable local logger with stacktrace." YES if NOT USE_ARM_PLACE)
+	anakin_option(SUPPORT_PTHREADS "If enable local logger with supporting pthreads. " YES)
 endif()
 
 # ----------------------------------------------------------------------------
 # section:configure a header file to pass some of the CMake settings to the source
 # 		  code
 # ----------------------------------------------------------------------------
 configure_file (
-  "${PROJECT_SOURCE_DIR}/cmake/config/anakin_config.h.in"
-  "${PROJECT_BINARY_DIR}/anakin_config.h"
+        "${PROJECT_SOURCE_DIR}/cmake/config/anakin_config.h.in"
+        "${PROJECT_BINARY_DIR}/anakin_config.h"
 )
 # add the binary tree to the search path so that anakin will find ak_config.h
 include_directories(${PROJECT_BINARY_DIR})
@@ -157,10 +168,6 @@ if(USE_CUDA)
     include(cmake/cuda.cmake)
 endif()
 
-if(USE_BM)
-    #include(cmake/cuda.cmake)
-endif()
-
 if(USE_X86_PLACE)
     set(ANAKIN_TEMP_THIRD_PARTY_PATH ${CMAKE_BINARY_DIR}/third-party)
     if(USE_MKLML)
@@ -172,6 +179,10 @@ if(USE_X86_PLACE)
     #include(cmake/external/mkldnn.cmake)
 endif()
 
+if(AMD_GPU)
+    include(cmake/amd.cmake)
+endif()
+
 # gather all the config options to anakin
 include(cmake/gather.cmake)
 
@@ -181,14 +192,35 @@ include(cmake/gather.cmake)
 # ----------------------------------------------------------------------------
 # add source sub_directory whick holds the cmake build module
 # fetch files of model_parser
-add_subdirectory(${ANAKIN_MODEL_PARSER})
+
+
 add_subdirectory(${ANAKIN_SABER})
-add_subdirectory(${ANAKIN_FRAMEWORK})
+
+if(USE_BM_PLACE)
+  add_subdirectory(${ANAKIN_SABER}/funcs/impl/bm)
+endif()
+
+if(BUILD_WITH_FRAMEWORK)
+    add_subdirectory(${ANAKIN_MODEL_PARSER})
+    if(BUILD_RPC) 
+        add_subdirectory(${ANAKIN_SERVICE}) 
+    endif()
+    if(BUILD_WITH_LITE) 
+        add_subdirectory(${ANAKIN_LITE})
+    endif()
+    add_subdirectory(${ANAKIN_FRAMEWORK})
+endif()
 
 if(BUILD_WITH_UNIT_TEST)
     add_subdirectory(${ANAKIN_UNIT_TEST})
 endif()
 
+if (BUILD_EXAMPLES)
+    if(BUILD_WITH_FRAMEWORK)
+        add_subdirectory(${ANAKIN_EXAMPLES})
+    endif()
+endif()
+
 anakin_print_statistic()
 
 

README.md

@@ -1,4 +1,4 @@
-# Anakin
+# Anakin12
 
 [![Build Status](https://travis-ci.org/PaddlePaddle/Anakin.svg?branch=developing)](https://travis-ci.org/PaddlePaddle/Anakin)
 [![License](https://img.shields.io/badge/license-Apache%202-blue.svg)](LICENSE)
@@ -7,63 +7,65 @@
 
 Welcome to the Anakin GitHub.
 
-Anakin is an cross-platform, high-performance inference engine, which is originally
+Anakin is a cross-platform, high-performance inference engine, which is originally
 developed by Baidu engineers and is a large-scale application of industrial products.
 
-Please refer to our [release announcement]() to track the latest feature of Anakin.
+Please refer to our [release announcement](https://github.com/PaddlePaddle/Anakin/releases) to track the latest feature of Anakin.
 
 ## Features
 
 - **Flexibility**
 
     Anakin supports a wide range of neural network architectures and
-    diffrent hardware platform. It is easy to run Anakin at GPU/x86/ARM platform.
+    different hardware platforms. It is easy to run Anakin on GPU / x86 / ARM platform.
 
 -  **High performance**
 
-    In order to giving full play to the performance of hardware, we optimize the
-    forward prediction at diffrent levels.
-      - Automatic graph fusion. The goal of all performance optimization under a 
-      given algorithm is to make ALU as busy as possible, Operator fusion 
-      can effectively reduce memory access and keep ALU busy.
-      
-      - Memory reuse. Forward prediction is a one-way calculation. We reuse 
-      the memory between the input and output of different operators, thus 
+    In order to give full play to the performance of hardware, we optimized the
+    forward prediction at different levels.
+      - Automatic graph fusion. The goal of all performance optimizations under a
+      given algorithm is to make the ALU as busy as possible. Operator fusion
+      can effectively reduce memory access and keep the ALU busy.
+
+      - Memory reuse. Forward prediction is a one-way calculation. We reuse
+      the memory between the input and output of different operators, thus
       reducing the overall memory overhead.
 
-      - Assembly level optimization. Saber is Anakin's underlying DNN library, which
+      - Assembly level optimization. Saber is a underlying DNN library for Anakin, which
       is deeply optimized at assembly level. Performance comparison between Anakin, TensorRT
-      and Tensorflow-lite, please refer to the benchmark tests.
+      and Tensorflow-lite, please refer to the [benchmark tests](benchmark/README.md).
 
 
 ## Installation
 
 It is recommended to check out the
-[Docker installation guide](docker/README.md).
+[docker installation guide](docker/README.md).
 before looking into the
 [build from source guide](docs/Manual/INSTALL_en.md).
 
+For ARM, please refer [run on arm](docs/Manual/run_on_arm_en.md).
+
 ## Benchmark
-It is recommended to check out the [Benchmark Readme](benchmark/README.md)
+It is recommended to check out the [readme of benchmark](benchmark/README.md).
 
 ## Documentation
 
-We provide [English](docs/Manual/Tutorial_en.md) and
-[Chinese](docs/Manual/Tutorial_ch.md) documentation.
+We provide [English](docs/Manual/Tutorial_en.md) and [Chinese](docs/Manual/Tutorial_ch.md) documentation.
 
-- [Anakin developer guide]()
+- Developer guide
 
-  You might want to know more details of Anakin and make it better.
+  You might want to know more details of Anakin and make it better. Please refer to [how to add custom devices](docs/Manual/addCustomDevice.md) and [how to add custom device operators](docs/Manual/addCustomOp.md).
 
-- [C++ API]()
+- User guide
 
-   Python API is under-developing.
+   You can get the working principle of the project, C++ interface description and code examples from [here](docs/Manual/Tutorial_ch.md). You can also learn about the model converter [here](docs/Manual/Converter_ch.md).
 
-- [How to Contribute]()
+- [How to Contribute](docs/Manual/Contribution_ch.md)
 
    We appreciate your contributions!
 
 
+
 ## Ask Questions
 
 You are welcome to submit questions and bug reports as [Github Issues](https://github.com/PaddlePaddle/Anakin/issues).