Skip to content

P
Paddle

PaddlePaddle / Paddle
大约 2 年 前同步成功

通知 2325
Star 20933
Fork 5424
P
Paddle
提交 2a21d8b3 编写于 作者: D dangqingqing
浏览文件
操作

Merge branch 'develop' of https://github.com/baidu/Paddle into cn_doc

上级 24cfc5ab 85f0e184
展开全部 显示空白变更内容
内联 并排
Showing with 11013 addition and 8006 deletion
.pre-commit-config.yaml
浏览文件 @ 2a21d8b3
...@@ -7,18 +7,14 @@ ...@@ -7,18 +7,14 @@
hooks: hooks:
- id: yapf - id: yapf
- repo: https://github.com/pre-commit/pre-commit-hooks - repo: https://github.com/pre-commit/pre-commit-hooks
sha: 4ef03c4223ad322c7adaa6c6c0efb26b57df3b71 sha: 7539d8bd1a00a3c1bfd34cdb606d3a6372e83469
hooks: hooks:
- id: check-added-large-files - id: check-added-large-files
- id: check-merge-conflict - id: check-merge-conflict
- id: check-symlinks - id: check-symlinks
- id: detect-private-key - id: detect-private-key
- id: end-of-file-fixer - id: end-of-file-fixer
# TODO(yuyang): trailing whitespace has some bugs on markdown - repo: https://github.com/PaddlePaddle/clang-format-pre-commit-hook.git
# files now, please not add it to pre-commit hook now sha: 28c0ea8a67a3e2dbbf4822ef44e85b63a0080a29
# - id: trailing-whitespace hooks:
# - id: clang-formater
# TODO(yuyang): debug-statements not fit for Paddle, because
# not all of our python code is runnable. Some are used for
# documenation
# - id: debug-statements
README.md
浏览文件 @ 2a21d8b3
# PaddlePaddle # PaddlePaddle
[![Build Status](https://travis-ci.org/PaddlePaddle/Paddle.svg?branch=develop)](https://travis-ci.org/baidu/Paddle) [![Build Status](https://travis-ci.org/PaddlePaddle/Paddle.svg?branch=develop)](https://travis-ci.org/PaddlePaddle/Paddle)
[![Documentation Status](https://img.shields.io/badge/docs-latest-brightgreen.svg?style=flat)](http://www.paddlepaddle.org/) [![Documentation Status](https://img.shields.io/badge/docs-latest-brightgreen.svg?style=flat)](http://www.paddlepaddle.org/)
[![Documentation Status](https://img.shields.io/badge/中文文档-最新-brightgreen.svg)](http://www.paddlepaddle.org/cn/index.html) [![Documentation Status](https://img.shields.io/badge/中文文档-最新-brightgreen.svg)](http://www.paddlepaddle.org/cn/index.html)
[![Coverage Status](https://coveralls.io/repos/github/PaddlePaddle/Paddle/badge.svg?branch=develop)](https://coveralls.io/github/baidu/Paddle?branch=develop) [![Coverage Status](https://coveralls.io/repos/github/PaddlePaddle/Paddle/badge.svg?branch=develop)](https://coveralls.io/github/PaddlePaddle/Paddle?branch=develop)
[![Release](https://img.shields.io/github/release/baidu/Paddle.svg?colorB=fedcba)](https://github.com/baidu/Paddle/releases) [![Release](https://img.shields.io/github/release/PaddlePaddle/Paddle.svg)](https://github.com/PaddlePaddle/Paddle/releases)
[![License](https://img.shields.io/badge/license-Apache%202-blue.svg)](LICENSE) [![License](https://img.shields.io/badge/license-Apache%202-blue.svg)](LICENSE)
...@@ -17,7 +17,7 @@ developed by Baidu scientists and engineers for the purpose of applying deep ...@@ -17,7 +17,7 @@ developed by Baidu scientists and engineers for the purpose of applying deep
learning to many products at Baidu. learning to many products at Baidu.
Our vision is to enable deep learning for everyone via PaddlePaddle. Our vision is to enable deep learning for everyone via PaddlePaddle.
Please refer to our [release announcement](https://github.com/baidu/Paddle/releases) to track the latest feature of PaddlePaddle. Please refer to our [release announcement](https://github.com/PaddlePaddle/Paddle/releases) to track the latest feature of PaddlePaddle.
## Features ## Features
...@@ -92,7 +92,7 @@ Both [English Docs](http://paddlepaddle.org/doc/) and [Chinese Docs](http://padd ...@@ -92,7 +92,7 @@ Both [English Docs](http://paddlepaddle.org/doc/) and [Chinese Docs](http://padd
## Ask Questions ## Ask Questions
You are welcome to submit questions and bug reports as [Github Issues](https://github.com/baidu/paddle/issues). You are welcome to submit questions and bug reports as [Github Issues](https://github.com/PaddlePaddle/Paddle/issues).
## Copyright and License ## Copyright and License
PaddlePaddle is provided under the [Apache-2.0 license](LICENSE). PaddlePaddle is provided under the [Apache-2.0 license](LICENSE).
doc/build/build_from_source.md
浏览文件 @ 2a21d8b3
...@@ -6,10 +6,10 @@ Installing from Sources ...@@ -6,10 +6,10 @@ Installing from Sources
* [3. Build on Ubuntu](#ubuntu) * [3. Build on Ubuntu](#ubuntu)
## <span id="download">Download and Setup</span> ## <span id="download">Download and Setup</span>
You can download PaddlePaddle from the [github source](https://github.com/gangliao/Paddle). You can download PaddlePaddle from the [github source](https://github.com/PaddlePaddle/Paddle).
```bash ```bash
git clone https://github.com/baidu/Paddle paddle git clone https://github.com/PaddlePaddle/Paddle paddle
cd paddle cd paddle
``` ```
......
doc_cn/build_and_install/cmake/cblas_settings.csv
浏览文件 @ 2a21d8b3
MKL_ROOT,mkl的路径，在${MKL_ROOT}/include下需要包含mkl.h，在${MKL_ROOT}/lib目录下需要包含 mkl_core，mkl_sequential和mkl_intel_lp64三个库 编译选项,描述,注意
ATLAS_ROOT,ATLAS库的路径，在${ATLAS_ROOT}/include下需要包含cblas.h，而在${ATLAS_ROOT}/lib下需要包含cblas和atlas两个库 MKL_ROOT,MKL的路径,${MKL_ROOT}/include下需要包含mkl.h，${MKL_ROOT}/lib目录下需要包含mkl_core，mkl_sequential和mkl_intel_lp64三个库。
OPENBLAS_ROOT,在${OPENBLAS_ROOT}/include下需要包含cblas.h，而在${OPENBLAS_ROOT}/lib下需要包含openblas库 ATLAS_ROOT,ATLAS的路径,${ATLAS_ROOT}/include下需要包含cblas.h，${ATLAS_ROOT}/lib下需要包含cblas和atlas两个库。
REFERENCE_CBLAS_ROOT,在${REFERENCE_CBLAS_ROOT}/include下需要包含cblas.h，在${REFERENCE_CBLAS_ROOT}/lib下需要包含cblas库 OPENBLAS_ROOT,OpenBLAS的路径,${OPENBLAS_ROOT}/include下需要包含cblas.h，${OPENBLAS_ROOT}/lib下需要包含openblas库。
\ No newline at end of file REFERENCE_CBLAS_ROOT,REFERENCE BLAS的路径,${REFERENCE_CBLAS_ROOT}/include下需要包含cblas.h，${REFERENCE_CBLAS_ROOT}/lib下需要包含cblas库。
\ No newline at end of file
doc_cn/build_and_install/cmake/compile_options.csv
浏览文件 @ 2a21d8b3
选项,说明,默认值 选项,说明,默认值
WITH_GPU,是否编译GPU支持。,是否寻找到cuda工具链 WITH_GPU,是否支持GPU。,取决于是否寻找到CUDA工具链
WITH_DOUBLE,是否使用双精度浮点数。,否 WITH_DOUBLE,是否使用双精度浮点数。,否
WITH_DSO,是否使用运行时动态加载cuda动态库，而非静态加载cuda动态库。,是 WITH_DSO,是否运行时动态加载CUDA动态库，而非静态加载CUDA动态库。,是
WITH_AVX,是否编译含有AVX指令集的PaddlePaddle二进制,是 WITH_AVX,是否编译含有AVX指令集的PaddlePaddle二进制文件,是
WITH_PYTHON,是否内嵌python解释器。可以方便嵌入式工作。,是 WITH_PYTHON,是否内嵌PYTHON解释器。方便今后的嵌入式移植工作。,是
WITH_STYLE_CHECK,是否编译时进行代码风格检查,是 WITH_STYLE_CHECK,是否编译时进行代码风格检查,是
WITH_RDMA,是否开启RDMA支持,否 WITH_RDMA,是否开启RDMA,否
WITH_GLOG,是否使用GLOG，如果不使用则会使用一个简化版的日志实现。可以方便嵌入式工作。,取决于是否寻找到GLOG WITH_GLOG,是否开启GLOG。如果不开启，则会使用一个简化版的日志，同时方便今后的嵌入式移植工作。,取决于是否寻找到GLOG
WITH_GFLAGS,是否使用GFLAGS，如果不使用则会使用一个简化版的命令行参数解析。可以方便嵌入式工作。,取决于是否寻找到GFLAGS WITH_GFLAGS,是否使用GFLAGS。如果不开启，则会使用一个简化版的命令行参数解析器，同时方便今后的嵌入式移植工作。,取决于是否寻找到GFLAGS
WITH_TIMER,是否开启计时功能开启计时功能会导致运行略慢，打印的日志变多。但是方便调试和benchmark,否 WITH_TIMER,是否开启计时功能。如果开启会导致运行略慢，打印的日志变多，但是方便调试和测Benchmark,否
WITH_TESTING,是否开启单元测试,取决于是否寻找到gtest WITH_TESTING,是否开启单元测试,取决于是否寻找到GTEST
WITH_DOC,是否编译英文文档,否 WITH_DOC,是否编译中英文文档,否
WITH_DOC_CN,是否编译中文文档,否 WITH_SWIG_PY,是否编译PYTHON的SWIG接口，该接口可用于预测和定制化训练,取决于是否寻找到SWIG
WITH_SWIG_PY,是否编译python的swig接口，python的swig接口可以方便进行预测和定制化训练,取决于是否找到swig \ No newline at end of file
doc_cn/build_and_install/cmake/compile_options.rst
浏览文件 @ 2a21d8b3
设置PaddlePaddle的编译选项 PaddlePaddle的编译选项
========================== ======================
PaddlePaddle的编译选项可以在调用cmake的时候设置。cmake是一个跨平台的编译脚本，调用 PaddlePaddle的编译选项，包括生成CPU/GPU二进制文件、链接何种BLAS库等。用户可在调用cmake的时候设置它们，详细的cmake使用方法可以参考 `官方文档 <https://cmake.org/cmake-tutorial>`_ 。
cmake可以将cmake项目文件，生成各个平台的makefile。详细的cmake使用方法可以参考
`cmake的官方文档 <https://cmake.org/cmake-tutorial>`_ 。
PaddlePaddle的编译选项是可以控制PaddlePaddle生成CPU/GPU版本二进制，链接何种blas等等。所有的 Bool型的编译选项
编译选项列表如下 ----------------
用户可在cmake的命令行中，通过使用 ``-D`` 命令设置该类编译选项，例如
PaddlePaddle的编译选项 .. code-block:: bash
----------------------
bool型的编译选项 cmake .. -DWITH_GPU=OFF
++++++++++++++++
设置下列编译选项时，可以在cmake的命令行设置。使用 -D命令即可。例如
:code:`cmake -D WITH_GPU=OFF`
.. csv-table:: PaddlePaddle的bool型编译选项 .. csv-table:: Bool型的编译选项
:widths: 1, 7, 2 :widths: 1, 7, 2
:file: compile_options.csv :file: compile_options.csv
blas相关的编译选项 BLAS/CUDA/Cudnn的编译选项
++++++++++++++++++ --------------------------
BLAS
PaddlePaddle可以使用 `MKL <https://software.intel.com/en-us/intel-mkl>`_ ， +++++
`Atlas <http://math-atlas.sourceforge.net/>`_ ,
`OpenBlas <http://www.openblas.net/>`_ 和
`refference Blas <http://www.netlib.org/blas/>`_ ，任意一种cblas实现。
通过编译时指定路径来实现引用各种blas。
cmake编译时会首先在系统路径(/usr/lib\:/usr/local/lib)中寻找这些blas的实现。同时 PaddlePaddle支持以下任意一种BLAS库：`MKL <https://software.intel.com/en-us/intel-mkl>`_ ，`ATLAS <http://math-atlas.sourceforge.net/>`_ ，`OpenBlAS <http://www.openblas.net/>`_ 和 `REFERENCE BLAS <http://www.netlib.org/blas/>`_ 。
也会读取相关路径变量来进行搜索。路径变量为\:
.. csv-table:: BLAS路径相关的编译选项
.. csv-table:: PaddlePaddle的cblas编译选项 :widths: 1, 2, 7
:widths: 1, 9
:header: "编译选项", "描述"
:file: cblas_settings.csv :file: cblas_settings.csv
这些变量均可以使用 -D命令指定。例如 :code:`cmake -D MKL_ROOT=/opt/mkl/`。这些变 CUDA/Cudnn
量也可以通过调用cmake命令前通过环境变量指定。例如 +++++++++++
.. code-block:: bash
export MKL_ROOT=/opt/mkl PaddlePaddle可以使用cudnn v2之后的任何一个版本来编译运行，但尽量请保持编译和运行使用的cudnn是同一个版本。 我们推荐使用最新版本的cudnn v5.1。
cmake
需要注意的是，这些变量只在第一次cmake的时候有效。如果在第一次cmake之后想要重新设 编译选项的设置
置这些变量，推荐清理( :code:`rm -rf` )掉编译目录后，再指定。 ++++++++++++++
cuda/cudnn相关的编译选项 PaddePaddle通过编译时指定路径来实现引用各种BLAS/CUDA/Cudnn库。cmake编译时，首先在系统路径(/usr/lib\:/usr/local/lib)中搜索这几个库，同时也会读取相关路径变量来进行搜索。 通过使用 ``-D`` 命令可以设置，例如
++++++++++++++++++++++++
PaddlePaddle可以使用 cudnn v2之后的任何一个cudnn版本来编译运行。但需要注意的是编译和 .. code-block:: bash
运行使用的cudnn尽量是同一个版本。推荐使用最新版本的cudnn v5.1。
在cmake配置时可以使用 :code:`CUDNN_ROOT` 来配置CUDNN的安装路径。使用的命令也是 cmake .. -DMKL_ROOT=/opt/mkl/ -DCUDNN_ROOT=/opt/cudnnv5
-D，例如 :code:`cmake -D CUDNN_ROOT=/opt/cudnnv5` 。
需要注意的是，这些变量只在第一次cmake的时候有效。如果在第一次cmake之后想要重新设 注意：这几个编译选项的设置，只在第一次cmake的时候有效。如果之后想要重新设置，推荐清理整个编译目录（``rm -rf``）后，再指定。
置这些变量，推荐清理( :code:`rm -rf` )掉编译目录后，再指定。 \ No newline at end of file
doc_cn/howto/how_to_write_docs/index.rst
浏览文件 @ 2a21d8b3
...@@ -2,32 +2,19 @@ ...@@ -2,32 +2,19 @@
如何贡献/修改PaddlePaddle的文档 如何贡献/修改PaddlePaddle的文档
############################### ###############################
PaddlePaddle的文档使用 `cmake`_ 驱动 `sphinx`_ 生成。公有两个文档，:code:`doc` 和 :code:`doc_cn` 。这两者会在 `cmake`_ 中进行编译，生成后的文档会存储在服务器的 :code:`doc` 和 :code:`doc_cn` 两个目录下。 PaddlePaddle的文档包括英文文档 ``doc`` 和中文文档 ``doc_cn`` 两个部分。文档都是通过 `cmake`_ 驱动 `sphinx`_ 编译生成，生成后的文档分别存储在编译目录的 ``doc`` 和 ``doc_cn`` 两个子目录下。
下面分几个部分介绍一下PaddlePaddle文档的贡献方法。
如何书写PaddlePaddle的文档
==========================
TBD
如何构建PaddlePaddle的文档 如何构建PaddlePaddle的文档
========================== ==========================
构建PaddlePaddle文档，需要使用构建Paddle的全部环境。准备这个环境相对来说比较复杂，所以本文档提供两种方式构建PaddlePaddle的文档，即 PaddlePaddle的文档构建有直接构建和基于Docker构建两种方式。构建PaddlePaddle文档需要准备的环境相对较复杂，所以我们推荐使用基于Docker来构建PaddlePaddle的文档。
* 使用Docker构建PaddlePaddle的文档
* 直接构建PaddlePaddle的文档。
并且，我们推荐使用Docker来构建PaddlePaddle的文档。
使用Docker构建PaddlePaddle的文档 使用Docker构建PaddlePaddle的文档
-------------------------------- --------------------------------
使用Docker构建PaddlePaddle的文档，首先要求在系统里安装好Docker工具包。安装Docker请参考 `Docker的官网 <https://docs.docker.com/>`_ 。 使用Docker构建PaddlePaddle的文档，需要在系统里先安装好Docker工具包。Docker安装请参考 `Docker的官网 <https://docs.docker.com/>`_ 。安装好Docker之后可以使用源码目录下的脚本构建文档，即
安装好Docker之后可以使用源码目录下的脚本构建文档，即
.. code-block:: bash .. code-block:: bash
...@@ -35,10 +22,10 @@ TBD ...@@ -35,10 +22,10 @@ TBD
cd paddle/scripts/tools/build_docs cd paddle/scripts/tools/build_docs
bash build_docs.sh bash build_docs.sh
执行完这个脚本后，该目录下会生成两个目录，分别是\: 编译完成后，该目录下会生成如下两个子目录\:
* doc 目录，英文文档地址 * doc 英文文档目录
* doc_cn 目录，中文文档地址 * doc_cn 中文文档目录
打开浏览器访问对应目录下的index.html即可访问本地文档。 打开浏览器访问对应目录下的index.html即可访问本地文档。
...@@ -52,6 +39,10 @@ TBD ...@@ -52,6 +39,10 @@ TBD
TBD TBD
如何书写PaddlePaddle的文档
==========================
TBD
如何更新www.paddlepaddle.org文档 如何更新www.paddlepaddle.org文档
================================ ================================
......
paddle/api/Arguments.cpp
浏览文件 @ 2a21d8b3
...@@ -12,7 +12,6 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ...@@ -12,7 +12,6 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and See the License for the specific language governing permissions and
limitations under the License. */ limitations under the License. */
#include "PaddleAPI.h" #include "PaddleAPI.h"
#include "PaddleAPIPrivate.h" #include "PaddleAPIPrivate.h"
...@@ -112,7 +111,7 @@ void Arguments::setSlotSequenceStartPositions(size_t idx, ...@@ -112,7 +111,7 @@ void Arguments::setSlotSequenceStartPositions(size_t idx,
} }
void Arguments::setSlotSubSequenceStartPositions( void Arguments::setSlotSubSequenceStartPositions(
size_t idx, IVector *vec) throw(RangeError) { size_t idx, IVector* vec) throw(RangeError) {
auto& a = m->getArg(idx); auto& a = m->getArg(idx);
auto& v = m->cast<paddle::IVector>(vec->getSharedPtr()); auto& v = m->cast<paddle::IVector>(vec->getSharedPtr());
a.subSequenceStartPositions = std::make_shared<paddle::ICpuGpuVector>(v); a.subSequenceStartPositions = std::make_shared<paddle::ICpuGpuVector>(v);
......
paddle/api/ConfigParser.cpp
浏览文件 @ 2a21d8b3
...@@ -12,7 +12,6 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ...@@ -12,7 +12,6 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and See the License for the specific language governing permissions and
limitations under the License. */ limitations under the License. */
#include "PaddleAPI.h" #include "PaddleAPI.h"
#include "PaddleAPIPrivate.h" #include "PaddleAPIPrivate.h"
#include "paddle/trainer/Trainer.h" #include "paddle/trainer/Trainer.h"
...@@ -44,8 +43,7 @@ TrainerConfig* TrainerConfig::createFromTrainerConfigFile( ...@@ -44,8 +43,7 @@ TrainerConfig* TrainerConfig::createFromTrainerConfigFile(
return retv; return retv;
} }
TrainerConfig* TrainerConfig::createFromProtoString( TrainerConfig* TrainerConfig::createFromProtoString(const std::string& str) {
const std::string& str) {
auto retv = new TrainerConfig(); auto retv = new TrainerConfig();
paddle::TrainerConfig trainerConfigProto; paddle::TrainerConfig trainerConfigProto;
auto conf = std::make_shared<paddle::TrainerConfigHelper>(trainerConfigProto); auto conf = std::make_shared<paddle::TrainerConfigHelper>(trainerConfigProto);
......
paddle/api/GradientMachine.cpp
浏览文件 @ 2a21d8b3
...@@ -12,7 +12,6 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ...@@ -12,7 +12,6 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and See the License for the specific language governing permissions and
limitations under the License. */ limitations under the License. */
#include "PaddleAPI.h" #include "PaddleAPI.h"
#include "PaddleAPIPrivate.h" #include "PaddleAPIPrivate.h"
...@@ -27,7 +26,8 @@ GradientMachine::GradientMachine() : m(new GradientMachinePrivate()) {} ...@@ -27,7 +26,8 @@ GradientMachine::GradientMachine() : m(new GradientMachinePrivate()) {}
GradientMachine::~GradientMachine() { delete m; } GradientMachine::~GradientMachine() { delete m; }
GradientMachine* GradientMachine::createFromPaddleModelPtr( GradientMachine* GradientMachine::createFromPaddleModelPtr(
const void* confPtr, GradientMatchineCreateMode mode, const void* confPtr,
GradientMatchineCreateMode mode,
const std::vector<int>& types) { const std::vector<int>& types) {
auto& conf = *(const paddle::ModelConfig*)(confPtr); auto& conf = *(const paddle::ModelConfig*)(confPtr);
std::vector<ParameterType> realTypes; std::vector<ParameterType> realTypes;
...@@ -44,7 +44,8 @@ GradientMachine* GradientMachine::createFromPaddleModelPtr( ...@@ -44,7 +44,8 @@ GradientMachine* GradientMachine::createFromPaddleModelPtr(
} }
GradientMachine* GradientMachine::createByConfigProtoStr( GradientMachine* GradientMachine::createByConfigProtoStr(
const std::string& protoStr, GradientMatchineCreateMode mode, const std::string& protoStr,
GradientMatchineCreateMode mode,
const std::vector<int>& types) { const std::vector<int>& types) {
paddle::ModelConfig conf; paddle::ModelConfig conf;
conf.ParseFromString(protoStr); conf.ParseFromString(protoStr);
...@@ -56,13 +57,15 @@ GradientMachine* GradientMachine::createByConfigProtoStr( ...@@ -56,13 +57,15 @@ GradientMachine* GradientMachine::createByConfigProtoStr(
} }
GradientMachine* GradientMachine::createByModelConfig( GradientMachine* GradientMachine::createByModelConfig(
ModelConfig* conf, GradientMatchineCreateMode mode, ModelConfig* conf,
GradientMatchineCreateMode mode,
const std::vector<int>& types) { const std::vector<int>& types) {
auto confPtr = &conf->m->conf->getModelConfig(); auto confPtr = &conf->m->conf->getModelConfig();
return GradientMachine::createFromPaddleModelPtr(confPtr, mode, types); return GradientMachine::createFromPaddleModelPtr(confPtr, mode, types);
} }
void GradientMachine::forward(const Arguments& inArgs, Arguments* outArgs, void GradientMachine::forward(const Arguments& inArgs,
Arguments* outArgs,
PassType passType) { PassType passType) {
auto& in = auto& in =
m->cast<std::vector<paddle::Argument>>(inArgs.getInternalArgumentsPtr()); m->cast<std::vector<paddle::Argument>>(inArgs.getInternalArgumentsPtr());
...@@ -99,7 +102,8 @@ void GradientMachine::backward(const UpdateCallback& callback) { ...@@ -99,7 +102,8 @@ void GradientMachine::backward(const UpdateCallback& callback) {
} }
void GradientMachine::forwardBackward(const Arguments& inArgs, void GradientMachine::forwardBackward(const Arguments& inArgs,
Arguments* outArgs, PassType passType, Arguments* outArgs,
PassType passType,
const UpdateCallback& callback) { const UpdateCallback& callback) {
auto& in = auto& in =
m->cast<std::vector<paddle::Argument>>(inArgs.getInternalArgumentsPtr()); m->cast<std::vector<paddle::Argument>>(inArgs.getInternalArgumentsPtr());
...@@ -140,8 +144,11 @@ Matrix* GradientMachine::getLayerOutput(const std::string& layerName) const ...@@ -140,8 +144,11 @@ Matrix* GradientMachine::getLayerOutput(const std::string& layerName) const
} }
SequenceGenerator* GradientMachine::asSequenceGenerator( SequenceGenerator* GradientMachine::asSequenceGenerator(
const std::vector<std::string>& dict, size_t begin_id, size_t end_id, const std::vector<std::string>& dict,
size_t max_length, size_t beam_size) { size_t begin_id,
size_t end_id,
size_t max_length,
size_t beam_size) {
SequenceGenerator* r = SequenceGenerator* r =
SequenceGenerator::createByGradientMachineSharedPtr(&m->machine); SequenceGenerator::createByGradientMachineSharedPtr(&m->machine);
r->setDict(dict); r->setDict(dict);
......
paddle/api/Internal.h
浏览文件 @ 2a21d8b3
...@@ -12,7 +12,6 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ...@@ -12,7 +12,6 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and See the License for the specific language governing permissions and
limitations under the License. */ limitations under the License. */
#pragma once #pragma once
#include "PaddleAPI.h" #include "PaddleAPI.h"
...@@ -23,7 +22,8 @@ limitations under the License. */ ...@@ -23,7 +22,8 @@ limitations under the License. */
template <typename T1, typename T2> template <typename T1, typename T2>
void staticCastVector(std::vector<T2>* dest, const std::vector<T1>& src) { void staticCastVector(std::vector<T2>* dest, const std::vector<T1>& src) {
dest->resize(src.size()); dest->resize(src.size());
std::transform(src.begin(), src.end(), dest->begin(), [](T1 t){ std::transform(src.begin(),
return static_cast<T2>(t); src.end(),
}); dest->begin(),
[](T1 t) { return static_cast<T2>(t); });
} }
paddle/api/Matrix.cpp
浏览文件 @ 2a21d8b3
...@@ -12,7 +12,6 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ...@@ -12,7 +12,6 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and See the License for the specific language governing permissions and
limitations under the License. */ limitations under the License. */
#include "PaddleAPI.h" #include "PaddleAPI.h"
#include "paddle/math/Matrix.h" #include "paddle/math/Matrix.h"
#include "paddle/math/SparseMatrix.h" #include "paddle/math/SparseMatrix.h"
...@@ -44,17 +43,21 @@ Matrix* Matrix::createZero(size_t height, size_t width, bool useGpu) { ...@@ -44,17 +43,21 @@ Matrix* Matrix::createZero(size_t height, size_t width, bool useGpu) {
return m; return m;
} }
Matrix* Matrix::createDense(const std::vector<float>& data, size_t height, Matrix* Matrix::createDense(const std::vector<float>& data,
size_t width, bool useGpu) { size_t height,
size_t width,
bool useGpu) {
auto m = new Matrix(); auto m = new Matrix();
m->m->mat = paddle::Matrix::create(height, width, useGpu); m->m->mat = paddle::Matrix::create(height, width, useGpu);
m->m->mat->copyFrom(data.data(), data.size()); m->m->mat->copyFrom(data.data(), data.size());
return m; return m;
} }
Matrix* Matrix::createDenseFromNumpy(float* data, int dim1, int dim2, Matrix* Matrix::createDenseFromNumpy(float* data,
bool copy, bool useGpu) int dim1,
throw (UnsupportError) { int dim2,
bool copy,
bool useGpu) throw(UnsupportError) {
if (useGpu) { if (useGpu) {
/// Gpu mode only supports copy=True /// Gpu mode only supports copy=True
if (!copy) { if (!copy) {
...@@ -66,7 +69,9 @@ Matrix* Matrix::createDenseFromNumpy(float* data, int dim1, int dim2, ...@@ -66,7 +69,9 @@ Matrix* Matrix::createDenseFromNumpy(float* data, int dim1, int dim2,
} }
} }
Matrix* Matrix::createCpuDenseFromNumpy(float* data, int dim1, int dim2, Matrix* Matrix::createCpuDenseFromNumpy(float* data,
int dim1,
int dim2,
bool copy) { bool copy) {
auto m = new Matrix(); auto m = new Matrix();
if (copy) { if (copy) {
...@@ -85,12 +90,20 @@ Matrix* Matrix::createGpuDenseFromNumpy(float* data, int dim1, int dim2) { ...@@ -85,12 +90,20 @@ Matrix* Matrix::createGpuDenseFromNumpy(float* data, int dim1, int dim2) {
return m; return m;
} }
Matrix* Matrix::createSparse(size_t height, size_t width, size_t nnz, Matrix* Matrix::createSparse(size_t height,
bool isNonVal, bool isTrans, bool useGpu) { size_t width,
size_t nnz,
bool isNonVal,
bool isTrans,
bool useGpu) {
auto m = new Matrix(); auto m = new Matrix();
m->m->mat = paddle::Matrix::createSparseMatrix( m->m->mat = paddle::Matrix::createSparseMatrix(
height, width, nnz, isNonVal ? paddle::NO_VALUE : paddle::FLOAT_VALUE, height,
isTrans, useGpu); width,
nnz,
isNonVal ? paddle::NO_VALUE : paddle::FLOAT_VALUE,
isTrans,
useGpu);
return m; return m;
} }
...@@ -221,7 +234,8 @@ FloatArray Matrix::getData() const { ...@@ -221,7 +234,8 @@ FloatArray Matrix::getData() const {
} }
void Matrix::sparseCopyFrom( void Matrix::sparseCopyFrom(
const std::vector<int>& rows, const std::vector<int>& cols, const std::vector<int>& rows,
const std::vector<int>& cols,
const std::vector<float>& vals) throw(UnsupportError) { const std::vector<float>& vals) throw(UnsupportError) {
auto cpuSparseMat = auto cpuSparseMat =
std::dynamic_pointer_cast<paddle::CpuSparseMatrix>(m->mat); std::dynamic_pointer_cast<paddle::CpuSparseMatrix>(m->mat);
...@@ -240,7 +254,8 @@ void Matrix::sparseCopyFrom( ...@@ -240,7 +254,8 @@ void Matrix::sparseCopyFrom(
void* Matrix::getSharedPtr() const { return &m->mat; } void* Matrix::getSharedPtr() const { return &m->mat; }
void Matrix::toNumpyMatInplace(float** view_data, int* dim1, void Matrix::toNumpyMatInplace(float** view_data,
int* dim1,
int* dim2) throw(UnsupportError) { int* dim2) throw(UnsupportError) {
auto cpuMat = std::dynamic_pointer_cast<paddle::CpuMatrix>(m->mat); auto cpuMat = std::dynamic_pointer_cast<paddle::CpuMatrix>(m->mat);
if (cpuMat) { if (cpuMat) {
...@@ -251,7 +266,8 @@ void Matrix::toNumpyMatInplace(float** view_data, int* dim1, ...@@ -251,7 +266,8 @@ void Matrix::toNumpyMatInplace(float** view_data, int* dim1,
throw UnsupportError(); throw UnsupportError();
} }
} }
void Matrix::copyToNumpyMat(float** view_m_data, int* dim1, void Matrix::copyToNumpyMat(float** view_m_data,
int* dim1,
int* dim2) throw(UnsupportError) { int* dim2) throw(UnsupportError) {
static_assert(sizeof(paddle::real) == sizeof(float), static_assert(sizeof(paddle::real) == sizeof(float),
"Currently PaddleAPI only support for single " "Currently PaddleAPI only support for single "
...@@ -269,8 +285,8 @@ void Matrix::copyToNumpyMat(float** view_m_data, int* dim1, ...@@ -269,8 +285,8 @@ void Matrix::copyToNumpyMat(float** view_m_data, int* dim1,
} else if (auto gpuMat = dynamic_cast<paddle::GpuMatrix*>(m->mat.get())) { } else if (auto gpuMat = dynamic_cast<paddle::GpuMatrix*>(m->mat.get())) {
auto src = gpuMat->getData(); auto src = gpuMat->getData();
auto dest = *view_m_data; auto dest = *view_m_data;
hl_memcpy_device2host(dest, src, hl_memcpy_device2host(
sizeof(paddle::real) * (*dim1) * (*dim2)); dest, src, sizeof(paddle::real) * (*dim1) * (*dim2));
} else { } else {
LOG(WARNING) << "Unexpected Situation"; LOG(WARNING) << "Unexpected Situation";
throw UnsupportError(); throw UnsupportError();
...@@ -278,7 +294,8 @@ void Matrix::copyToNumpyMat(float** view_m_data, int* dim1, ...@@ -278,7 +294,8 @@ void Matrix::copyToNumpyMat(float** view_m_data, int* dim1,
} }
} }
void Matrix::copyFromNumpyMat(float* data, int dim1, void Matrix::copyFromNumpyMat(float* data,
int dim1,
int dim2) throw(UnsupportError, RangeError) { int dim2) throw(UnsupportError, RangeError) {
if (isSparse()) { if (isSparse()) {
throw UnsupportError(); throw UnsupportError();
......
paddle/api/PaddleAPI.h
浏览文件 @ 2a21d8b3
...@@ -12,7 +12,6 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ...@@ -12,7 +12,6 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and See the License for the specific language governing permissions and
limitations under the License. */ limitations under the License. */
#pragma once #pragma once
#include <stddef.h> #include <stddef.h>
...@@ -61,8 +60,8 @@ class RangeError {}; ...@@ -61,8 +60,8 @@ class RangeError {};
/// Not support Error, such as access GPU memory directly, etc. /// Not support Error, such as access GPU memory directly, etc.
class UnsupportError : public std::runtime_error { class UnsupportError : public std::runtime_error {
public: public:
UnsupportError() : std::runtime_error(" ") {}; UnsupportError() : std::runtime_error(" "){};
UnsupportError(const std::string& message) : std::runtime_error(message) {}; UnsupportError(const std::string& message) : std::runtime_error(message){};
}; };
/// This type will map to python's list of float. /// This type will map to python's list of float.
...@@ -112,7 +111,8 @@ public: ...@@ -112,7 +111,8 @@ public:
/** /**
* Create A Matrix with height,width, which is filled by zero. * Create A Matrix with height,width, which is filled by zero.
*/ */
static Matrix* createZero(size_t height, size_t width, static Matrix* createZero(size_t height,
size_t width,
bool useGpu = isUsingGpu()); bool useGpu = isUsingGpu());
/** /**
...@@ -124,8 +124,11 @@ public: ...@@ -124,8 +124,11 @@ public:
* *
* @note the default sparse type is SPARSE_CSR. * @note the default sparse type is SPARSE_CSR.
*/ */
static Matrix* createSparse(size_t height, size_t width, size_t nnz, static Matrix* createSparse(size_t height,
bool isNonVal = true, bool trans = false, size_t width,
size_t nnz,
bool isNonVal = true,
bool trans = false,
bool useGpu = isUsingGpu()); bool useGpu = isUsingGpu());
/** /**
...@@ -134,13 +137,17 @@ public: ...@@ -134,13 +137,17 @@ public:
* @param data list of float should be passed in python. * @param data list of float should be passed in python.
* @note the value will be copy into a new matrix. * @note the value will be copy into a new matrix.
*/ */
static Matrix* createDense(const std::vector<float>& data, size_t height, static Matrix* createDense(const std::vector<float>& data,
size_t width, bool useGpu = isUsingGpu()); size_t height,
size_t width,
bool useGpu = isUsingGpu());
static Matrix* createDenseFromNumpy(float* data, int dim1, int dim2, static Matrix* createDenseFromNumpy(
float* data,
int dim1,
int dim2,
bool copy = true, bool copy = true,
bool useGpu = isUsingGpu()) bool useGpu = isUsingGpu()) throw(UnsupportError);
throw (UnsupportError);
/** /**
* Create Cpu Dense Matrix from numpy matrix, dtype=float32 * Create Cpu Dense Matrix from numpy matrix, dtype=float32
...@@ -151,7 +158,9 @@ public: ...@@ -151,7 +158,9 @@ public:
* @param copy true if copy into a new matrix, false will create * @param copy true if copy into a new matrix, false will create
* matrix inplace. * matrix inplace.
*/ */
static Matrix* createCpuDenseFromNumpy(float* data, int dim1, int dim2, static Matrix* createCpuDenseFromNumpy(float* data,
int dim1,
int dim2,
bool copy = false); bool copy = false);
/// Create Gpu Dense Matrix from numpy matrix, dtype=float32 /// Create Gpu Dense Matrix from numpy matrix, dtype=float32
...@@ -171,11 +180,13 @@ public: ...@@ -171,11 +180,13 @@ public:
* numpy_mat = m.toNumpyMat() * numpy_mat = m.toNumpyMat()
* @endcode * @endcode
*/ */
void toNumpyMatInplace(float** view_data, int* dim1, void toNumpyMatInplace(float** view_data,
int* dim1,
int* dim2) throw(UnsupportError); int* dim2) throw(UnsupportError);
/// Copy To numpy mat. /// Copy To numpy mat.
void copyToNumpyMat(float** view_m_data, int* dim1, void copyToNumpyMat(float** view_m_data,
int* dim1,
int* dim2) throw(UnsupportError); int* dim2) throw(UnsupportError);
/// Copy From Numpy Mat /// Copy From Numpy Mat
...@@ -248,15 +259,18 @@ public: ...@@ -248,15 +259,18 @@ public:
static Vector* create(const std::vector<float>& data, static Vector* create(const std::vector<float>& data,
bool useGpu = isUsingGpu()); bool useGpu = isUsingGpu());
static Vector* createVectorFromNumpy(float* data, int dim, bool copy = true, static Vector* createVectorFromNumpy(
bool useGpu = isUsingGpu()) float* data,
throw (UnsupportError); int dim,
bool copy = true,
bool useGpu = isUsingGpu()) throw(UnsupportError);
/** /**
* Create Cpu Vector from numpy array, which dtype=float32 * Create Cpu Vector from numpy array, which dtype=float32
* *
* If copy is false, it will create vector inplace. * If copy is false, it will create vector inplace.
*/ */
static Vector* createCpuVectorFromNumpy(float* data, int dim, static Vector* createCpuVectorFromNumpy(float* data,
int dim,
bool copy = false); bool copy = false);
/// Create Gpu Vector from numpy array, which dtype=float32 /// Create Gpu Vector from numpy array, which dtype=float32
...@@ -312,16 +326,19 @@ public: ...@@ -312,16 +326,19 @@ public:
static IVector* create(const std::vector<int>& data, static IVector* create(const std::vector<int>& data,
bool useGpu = isUsingGpu()); bool useGpu = isUsingGpu());
static IVector* createVectorFromNumpy(int* data, int dim, bool copy = true, static IVector* createVectorFromNumpy(
bool useGpu = isUsingGpu()) int* data,
throw (UnsupportError); int dim,
bool copy = true,
bool useGpu = isUsingGpu()) throw(UnsupportError);
/** /**
* Create Cpu IVector from numpy array, which dtype=int32 * Create Cpu IVector from numpy array, which dtype=int32
* *
* If copy is false, it will create vector inplace * If copy is false, it will create vector inplace
*/ */
static IVector* createCpuVectorFromNumpy(int* data, int dim, static IVector* createCpuVectorFromNumpy(int* data,
int dim,
bool copy = false); bool copy = false);
/** /**
* Create Gpu IVector from numpy array, which dtype=int32 * Create Gpu IVector from numpy array, which dtype=int32
...@@ -605,7 +622,8 @@ class ParameterTraverseCallback { ...@@ -605,7 +622,8 @@ class ParameterTraverseCallback {
public: public:
~ParameterTraverseCallback(); ~ParameterTraverseCallback();
void apply(const std::vector<Vector*>& vecs, const ParameterConfig& config, void apply(const std::vector<Vector*>& vecs,
const ParameterConfig& config,
size_t sparseId); size_t sparseId);
private: private:
...@@ -638,7 +656,8 @@ public: ...@@ -638,7 +656,8 @@ public:
void finishBatch(); void finishBatch();
void update(const std::vector<Vector*>& vecs, const ParameterConfig& conf, void update(const std::vector<Vector*>& vecs,
const ParameterConfig& conf,
size_t sparseId = NO_SPARSE_ID); size_t sparseId = NO_SPARSE_ID);
std::vector<int> getParameterTypes() const; std::vector<int> getParameterTypes() const;
...@@ -678,7 +697,8 @@ public: ...@@ -678,7 +697,8 @@ public:
* model config by TrainerConfig * model config by TrainerConfig
*/ */
static GradientMachine* createByModelConfig( static GradientMachine* createByModelConfig(
ModelConfig* conf, GradientMatchineCreateMode mode = CREATE_MODE_NORMAL, ModelConfig* conf,
GradientMatchineCreateMode mode = CREATE_MODE_NORMAL,
const std::vector<int>& parameterTypes = defaultParamTypes); const std::vector<int>& parameterTypes = defaultParamTypes);
/** /**
...@@ -701,7 +721,8 @@ public: ...@@ -701,7 +721,8 @@ public:
/** /**
* Combine forward/backward * Combine forward/backward
*/ */
void forwardBackward(const Arguments& inArgs, Arguments* outArgs, void forwardBackward(const Arguments& inArgs,
Arguments* outArgs,
PassType passType, PassType passType,
const UpdateCallback& callback = UpdateCallback()); const UpdateCallback& callback = UpdateCallback());
...@@ -722,14 +743,17 @@ public: ...@@ -722,14 +743,17 @@ public:
*/ */
SequenceGenerator* asSequenceGenerator( SequenceGenerator* asSequenceGenerator(
const std::vector<std::string>& dict = std::vector<std::string>(), const std::vector<std::string>& dict = std::vector<std::string>(),
size_t begin_id = 0UL, size_t end_id = 0UL, size_t max_length = 100UL, size_t begin_id = 0UL,
size_t end_id = 0UL,
size_t max_length = 100UL,
size_t beam_size = -1UL); size_t beam_size = -1UL);
private: private:
GradientMachinePrivate* m; GradientMachinePrivate* m;
static GradientMachine* createFromPaddleModelPtr( static GradientMachine* createFromPaddleModelPtr(
const void* confPtr, GradientMatchineCreateMode mode, const void* confPtr,
GradientMatchineCreateMode mode,
const std::vector<int>& types); const std::vector<int>& types);
// Not to use c++ 11 init-list, so we use static var as function default arg. // Not to use c++ 11 init-list, so we use static var as function default arg.
...@@ -751,8 +775,8 @@ public: ...@@ -751,8 +775,8 @@ public:
/// Create A Trainer By TrainerConfig. using paddle command line. /// Create A Trainer By TrainerConfig. using paddle command line.
static Trainer* createByCommandLine() throw(IOError); static Trainer* createByCommandLine() throw(IOError);
static Trainer* create(TrainerConfig* optConfig, GradientMachine* gm) static Trainer* create(TrainerConfig* optConfig,
throw(IOError); GradientMachine* gm) throw(IOError);
/// Start training /// Start training
void startTrain(); void startTrain();
......
paddle/api/Parameter.cpp
浏览文件 @ 2a21d8b3
...@@ -12,7 +12,6 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ...@@ -12,7 +12,6 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and See the License for the specific language governing permissions and
limitations under the License. */ limitations under the License. */
#include "PaddleAPI.h" #include "PaddleAPI.h"
#include "paddle/parameter/Parameter.h" #include "paddle/parameter/Parameter.h"
......
paddle/api/ParameterOptimizer.cpp
浏览文件 @ 2a21d8b3
...@@ -12,7 +12,6 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ...@@ -12,7 +12,6 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and See the License for the specific language governing permissions and
limitations under the License. */ limitations under the License. */
#include "PaddleAPI.h" #include "PaddleAPI.h"
#include "PaddleAPIPrivate.h" #include "PaddleAPIPrivate.h"
#include "paddle/parameter/ParameterOptimizer.h" #include "paddle/parameter/ParameterOptimizer.h"
...@@ -32,11 +31,15 @@ struct ParameterTraverseCallbackPrivate { ...@@ -32,11 +31,15 @@ struct ParameterTraverseCallbackPrivate {
const paddle::ParameterOptimizer::TraverseCallback& callback) const paddle::ParameterOptimizer::TraverseCallback& callback)
: callback(callback) {} : callback(callback) {}
void apply(const std::vector<Vector*>& vecs, const ParameterConfig& conf, void apply(const std::vector<Vector*>& vecs,
const ParameterConfig& conf,
size_t sparseId) { size_t sparseId) {
std::vector<paddle::VectorPtr> real_vecs; std::vector<paddle::VectorPtr> real_vecs;
real_vecs.resize(vecs.size()); real_vecs.resize(vecs.size());
std::transform(vecs.begin(), vecs.end(), real_vecs.begin(), [](Vector* v) { std::transform(vecs.begin(),
vecs.end(),
real_vecs.begin(),
[](Vector* v) {
if (v) { if (v) {
return *(paddle::VectorPtr*)(v->getSharedPtr()); return *(paddle::VectorPtr*)(v->getSharedPtr());
} else { } else {
...@@ -86,9 +89,11 @@ void ParameterOptimizer::startBatch(size_t numSamplesProcessed) { ...@@ -86,9 +89,11 @@ void ParameterOptimizer::startBatch(size_t numSamplesProcessed) {
void ParameterOptimizer::finishBatch() { m->optimizer->finishBatch(); } void ParameterOptimizer::finishBatch() { m->optimizer->finishBatch(); }
void ParameterOptimizer::update(const std::vector<Vector*>& vecs, void ParameterOptimizer::update(const std::vector<Vector*>& vecs,
const ParameterConfig& conf, size_t sparseId) { const ParameterConfig& conf,
ParameterTraverseCallbackPrivate invoker([&]( size_t sparseId) {
const paddle::VectorPtr _vecs[], const paddle::ParameterConfig& config, ParameterTraverseCallbackPrivate invoker(
[&](const paddle::VectorPtr _vecs[],
const paddle::ParameterConfig& config,
size_t sid = -1UL) { m->optimizer->update(_vecs, config, sid); }); size_t sid = -1UL) { m->optimizer->update(_vecs, config, sid); });
invoker.apply(vecs, conf, sparseId); invoker.apply(vecs, conf, sparseId);
} }
...@@ -116,8 +121,9 @@ void ParameterTraverseCallback::apply(const std::vector<Vector*>& vecs, ...@@ -116,8 +121,9 @@ void ParameterTraverseCallback::apply(const std::vector<Vector*>& vecs,
ParameterTraverseCallback* ParameterOptimizer::needSpecialTraversal( ParameterTraverseCallback* ParameterOptimizer::needSpecialTraversal(
const ParameterConfig& config) const { const ParameterConfig& config) const {
auto& param_config = *(paddle::ParameterConfig*)const_cast<ParameterConfig&>( auto& param_config =
config).getRawPtr(); *(paddle::ParameterConfig*)const_cast<ParameterConfig&>(config)
.getRawPtr();
auto callback = m->optimizer->needSpecialTraversal(param_config); auto callback = m->optimizer->needSpecialTraversal(param_config);
if (callback) { if (callback) {
auto retCallback = new ParameterTraverseCallback(); auto retCallback = new ParameterTraverseCallback();
......
paddle/api/SequenceGenerator.cpp
浏览文件 @ 2a21d8b3
...@@ -12,7 +12,6 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ...@@ -12,7 +12,6 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and See the License for the specific language governing permissions and
limitations under the License. */ limitations under the License. */
#include "PaddleAPI.h" #include "PaddleAPI.h"
#include "paddle/gserver/gradientmachines/GradientMachine.h" #include "paddle/gserver/gradientmachines/GradientMachine.h"
#include "paddle/parameter/Argument.h" #include "paddle/parameter/Argument.h"
...@@ -42,8 +41,10 @@ struct Path { ...@@ -42,8 +41,10 @@ struct Path {
// position // position
static void findNBest(paddle::GradientMachine* gradMachine, static void findNBest(paddle::GradientMachine* gradMachine,
std::vector<paddle::Argument>& inArgs, std::vector<paddle::Argument>& inArgs,
std::vector<Path>& finalPaths, size_t bos_id, std::vector<Path>& finalPaths,
size_t eos_id, size_t max_length) { size_t bos_id,
size_t eos_id,
size_t max_length) {
std::vector<Path> paths; std::vector<Path> paths;
Path emptyPath; Path emptyPath;
paths.push_back(emptyPath); paths.push_back(emptyPath);
...@@ -166,7 +167,8 @@ public: ...@@ -166,7 +167,8 @@ public:
if (id < getSize()) { if (id < getSize()) {
Path& p = (*path_)[id]; Path& p = (*path_)[id];
std::ostringstream sout; std::ostringstream sout;
std::transform(p.ids.begin(), p.ids.end(), std::transform(p.ids.begin(),
p.ids.end(),
std::ostream_iterator<std::string>(sout, split ? " " : ""), std::ostream_iterator<std::string>(sout, split ? " " : ""),
[&](int id) { return (*dict_)[id]; }); [&](int id) { return (*dict_)[id]; });
return sout.str(); return sout.str();
......
paddle/api/Trainer.cpp
浏览文件 @ 2a21d8b3
...@@ -64,12 +64,11 @@ Trainer* Trainer::createByCommandLine() throw(IOError) { ...@@ -64,12 +64,11 @@ Trainer* Trainer::createByCommandLine() throw(IOError) {
Trainer::Trainer(TrainerConfig* config, GradientMachine* gm) Trainer::Trainer(TrainerConfig* config, GradientMachine* gm)
: m(new TrainerPrivate()) { : m(new TrainerPrivate()) {
m->init(config->m->conf, /* testing= */false, gm ? gm->m->machine : nullptr); m->init(config->m->conf, /* testing= */ false, gm ? gm->m->machine : nullptr);
} }
Trainer* Trainer::create(TrainerConfig* config, GradientMachine* gm) Trainer* Trainer::create(TrainerConfig* config,
throw(IOError) GradientMachine* gm) throw(IOError) {
{
auto retv = new Trainer(config, gm); auto retv = new Trainer(config, gm);
if (retv->m->getConfig().IsInitialized()) { if (retv->m->getConfig().IsInitialized()) {
return retv; return retv;
...@@ -140,7 +139,9 @@ Matrix* Trainer::getLayerOutput(const std::string& layerName) { ...@@ -140,7 +139,9 @@ Matrix* Trainer::getLayerOutput(const std::string& layerName) {
return Matrix::createByPaddleMatrixPtr(&m); return Matrix::createByPaddleMatrixPtr(&m);
} }
void Trainer::forwardOneBatch(size_t batchSize) { m->forwardOneBatch(batchSize); } void Trainer::forwardOneBatch(size_t batchSize) {
m->forwardOneBatch(batchSize);
}
bool TrainerPrivate::forwardOneBatch(size_t batchSize) { bool TrainerPrivate::forwardOneBatch(size_t batchSize) {
CHECK(dataProvider_) << "data_provider is not specified"; CHECK(dataProvider_) << "data_provider is not specified";
...@@ -156,7 +157,6 @@ bool TrainerPrivate::forwardOneBatch(size_t batchSize) { ...@@ -156,7 +157,6 @@ bool TrainerPrivate::forwardOneBatch(size_t batchSize) {
void TrainerPrivate::forwardOneDataBatch( void TrainerPrivate::forwardOneDataBatch(
const std::vector<paddle::Argument>& inArgs) { const std::vector<paddle::Argument>& inArgs) {
std::vector<paddle::Argument>& outArgs = forwardOutput_; std::vector<paddle::Argument>& outArgs = forwardOutput_;
if (config_->getOptConfig().use_sparse_remote_updater()) { if (config_->getOptConfig().use_sparse_remote_updater()) {
......
paddle/api/Util.cpp
浏览文件 @ 2a21d8b3
...@@ -37,13 +37,15 @@ FloatArray::FloatArray(const float* b, const size_t l) ...@@ -37,13 +37,15 @@ FloatArray::FloatArray(const float* b, const size_t l)
IntArray::IntArray(const int* b, const size_t l, bool f) IntArray::IntArray(const int* b, const size_t l, bool f)
: buf(b), length(l), needFree(f) {} : buf(b), length(l), needFree(f) {}
IntWithFloatArray::IntWithFloatArray(const float* v, const int* i, size_t l, IntWithFloatArray::IntWithFloatArray(const float* v,
const int* i,
size_t l,
bool f) bool f)
: valBuf(v), idxBuf(i), length(l), needFree(f) {} : valBuf(v), idxBuf(i), length(l), needFree(f) {}
bool isUsingGpu() {return FLAGS_use_gpu;} bool isUsingGpu() { return FLAGS_use_gpu; }
void setUseGpu(bool useGpu) {FLAGS_use_gpu = useGpu;} void setUseGpu(bool useGpu) { FLAGS_use_gpu = useGpu; }
bool isGpuVersion() { bool isGpuVersion() {
#ifdef PADDLE_ONLY_CPU #ifdef PADDLE_ONLY_CPU
......
paddle/api/Vector.cpp
浏览文件 @ 2a21d8b3
...@@ -12,7 +12,6 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ...@@ -12,7 +12,6 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and See the License for the specific language governing permissions and
limitations under the License. */ limitations under the License. */
#include "PaddleAPI.h" #include "PaddleAPI.h"
#include "paddle/math/Vector.h" #include "paddle/math/Vector.h"
...@@ -39,8 +38,10 @@ IVector* IVector::create(const std::vector<int>& data, bool useGpu) { ...@@ -39,8 +38,10 @@ IVector* IVector::create(const std::vector<int>& data, bool useGpu) {
return v; return v;
} }
IVector* IVector::createVectorFromNumpy(int* data, int dim, bool copy, IVector* IVector::createVectorFromNumpy(int* data,
bool useGpu) throw (UnsupportError){ int dim,
bool copy,
bool useGpu) throw(UnsupportError) {
if (useGpu) { if (useGpu) {
/// if use gpu only copy=true is supported /// if use gpu only copy=true is supported
if (!copy) { if (!copy) {
...@@ -137,8 +138,8 @@ void IVector::copyToNumpyArray(int** view_m_data, int* dim1) { ...@@ -137,8 +138,8 @@ void IVector::copyToNumpyArray(int** view_m_data, int* dim1) {
if (auto cpuVec = dynamic_cast<paddle::CpuIVector*>(m->vec.get())) { if (auto cpuVec = dynamic_cast<paddle::CpuIVector*>(m->vec.get())) {
std::memcpy(*view_m_data, cpuVec->getData(), sizeof(int) * (*dim1)); std::memcpy(*view_m_data, cpuVec->getData(), sizeof(int) * (*dim1));
} else if (auto gpuVec = dynamic_cast<paddle::GpuIVector*>(m->vec.get())) { } else if (auto gpuVec = dynamic_cast<paddle::GpuIVector*>(m->vec.get())) {
hl_memcpy_device2host(*view_m_data, gpuVec->getData(), hl_memcpy_device2host(
sizeof(int) * (*dim1)); *view_m_data, gpuVec->getData(), sizeof(int) * (*dim1));
} else { } else {
LOG(INFO) << "Unexpected situation"; LOG(INFO) << "Unexpected situation";
} }
...@@ -201,8 +202,10 @@ Vector* Vector::createByPaddleVectorPtr(void* ptr) { ...@@ -201,8 +202,10 @@ Vector* Vector::createByPaddleVectorPtr(void* ptr) {
} }
} }
Vector* Vector::createVectorFromNumpy(float* data, int dim, bool copy, Vector* Vector::createVectorFromNumpy(float* data,
bool useGpu) throw (UnsupportError){ int dim,
bool copy,
bool useGpu) throw(UnsupportError) {
if (useGpu) { if (useGpu) {
/// if use gpu only copy=True is supported /// if use gpu only copy=True is supported
if (!copy) { if (!copy) {
...@@ -251,8 +254,8 @@ void Vector::copyToNumpyArray(float** view_m_data, int* dim1) { ...@@ -251,8 +254,8 @@ void Vector::copyToNumpyArray(float** view_m_data, int* dim1) {
if (auto cpuVec = dynamic_cast<paddle::CpuVector*>(m->vec.get())) { if (auto cpuVec = dynamic_cast<paddle::CpuVector*>(m->vec.get())) {
std::memcpy(*view_m_data, cpuVec->getData(), sizeof(float) * (*dim1)); std::memcpy(*view_m_data, cpuVec->getData(), sizeof(float) * (*dim1));
} else if (auto gpuVec = dynamic_cast<paddle::CpuVector*>(m->vec.get())) { } else if (auto gpuVec = dynamic_cast<paddle::CpuVector*>(m->vec.get())) {
hl_memcpy_device2host(*view_m_data, gpuVec->getData(), hl_memcpy_device2host(
sizeof(float) * (*dim1)); *view_m_data, gpuVec->getData(), sizeof(float) * (*dim1));
} else { } else {
LOG(INFO) << "Unexpected situation"; LOG(INFO) << "Unexpected situation";
} }
......
paddle/cuda/include/hl_activation_functions.h
浏览文件 @ 2a21d8b3
...@@ -12,7 +12,6 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ...@@ -12,7 +12,6 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and See the License for the specific language governing permissions and
limitations under the License. */ limitations under the License. */
#ifndef HL_ACTIVATION_FUNCTIONS_H_ #ifndef HL_ACTIVATION_FUNCTIONS_H_
#define HL_ACTIVATION_FUNCTIONS_H_ #define HL_ACTIVATION_FUNCTIONS_H_
...@@ -21,11 +20,8 @@ limitations under the License. */ ...@@ -21,11 +20,8 @@ limitations under the License. */
/** /**
* Active functions: sigmoid, relu, tanh and linear. * Active functions: sigmoid, relu, tanh and linear.
*/ */
#define HPPL_ACTIVE_FUNCTION {hppl::sigmoid, \ #define HPPL_ACTIVE_FUNCTION \
hppl::relu, \ { hppl::sigmoid, hppl::relu, hppl::tanh, hppl::linear }
hppl::tanh, \
hppl::linear \
}
namespace hppl { namespace hppl {
......
paddle/cuda/include/hl_aggregate.h
浏览文件 @ 2a21d8b3
...@@ -12,7 +12,6 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ...@@ -12,7 +12,6 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and See the License for the specific language governing permissions and
limitations under the License. */ limitations under the License. */
#ifndef HL_AGGREGATE_H_ #ifndef HL_AGGREGATE_H_
#define HL_AGGREGATE_H_ #define HL_AGGREGATE_H_
......
paddle/cuda/include/hl_avx_functions.h
浏览文件 @ 2a21d8b3
...@@ -12,22 +12,21 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ...@@ -12,22 +12,21 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and See the License for the specific language governing permissions and
limitations under the License. */ limitations under the License. */
#ifndef HL_AVX_FUNCTIONS_H_ #ifndef HL_AVX_FUNCTIONS_H_
#define HL_AVX_FUNCTIONS_H_ #define HL_AVX_FUNCTIONS_H_
#include <immintrin.h> #include <immintrin.h>
namespace hppl { namespace hppl {
__m256 relu(const __m256 a); __m256 relu(const __m256 a);
__m256 sigmoid(const __m256 a); __m256 sigmoid(const __m256 a);
__m256 tanh(const __m256 a); __m256 tanh(const __m256 a);
__m256 linear(const __m256 a); __m256 linear(const __m256 a);
__m256 relu(const __m256 a, const __m256 b); __m256 relu(const __m256 a, const __m256 b);
__m256 sigmoid(const __m256 a, const __m256 b); __m256 sigmoid(const __m256 a, const __m256 b);
__m256 tanh(const __m256 a, const __m256 b); __m256 tanh(const __m256 a, const __m256 b);
__m256 linear(const __m256 a, const __m256 b); __m256 linear(const __m256 a, const __m256 b);
} // namespace hppl } // namespace hppl
#endif // HL_AVX_FUNCTIONS_H_ #endif // HL_AVX_FUNCTIONS_H_
paddle/cuda/include/hl_base.h
浏览文件 @ 2a21d8b3
...@@ -12,8 +12,6 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ...@@ -12,8 +12,6 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and See the License for the specific language governing permissions and
limitations under the License. */ limitations under the License. */
#ifndef HL_BASE_H_ #ifndef HL_BASE_H_
#define HL_BASE_H_ #define HL_BASE_H_
...@@ -153,7 +151,6 @@ typedef enum { ...@@ -153,7 +151,6 @@ typedef enum {
HL_VALUE_END HL_VALUE_END
} hl_matrix_value_t; } hl_matrix_value_t;
/** /**
* @brief HPPL matrix format. * @brief HPPL matrix format.
*/ */
...@@ -163,8 +160,7 @@ typedef enum { ...@@ -163,8 +160,7 @@ typedef enum {
HL_SPARSE_END HL_SPARSE_END
} hl_matrix_format_t; } hl_matrix_format_t;
typedef struct _hl_matrix_s *hl_matrix_s;
typedef struct _hl_matrix_s * hl_matrix_s;
/** /**
* @brief HPPL sparse matrix. * @brief HPPL sparse matrix.
...@@ -209,7 +205,6 @@ typedef struct { ...@@ -209,7 +205,6 @@ typedef struct {
#define HL_FLOAT_MIN 2.2250738585072014e-308 #define HL_FLOAT_MIN 2.2250738585072014e-308
#endif #endif
/** /**
* The maximum input value for exp, used to avoid overflow problem. * The maximum input value for exp, used to avoid overflow problem.
* *
...@@ -217,14 +212,13 @@ typedef struct { ...@@ -217,14 +212,13 @@ typedef struct {
*/ */
#define EXP_MAX_INPUT 40.0 #define EXP_MAX_INPUT 40.0
/** /**
* @brief DIVUP(x, y) is similar to ceil(x / y). * @brief DIVUP(x, y) is similar to ceil(x / y).
* @note For CUDA, DIVUP will be used to specify * @note For CUDA, DIVUP will be used to specify
* the size of blockDim. * the size of blockDim.
*/ */
#ifndef DIVUP #ifndef DIVUP
#define DIVUP(x, y) (((x) + (y) - 1) / (y)) #define DIVUP(x, y) (((x) + (y)-1) / (y))
#endif #endif
#ifdef __NVCC__ #ifdef __NVCC__
...@@ -244,11 +238,10 @@ extern __thread cudaStream_t default_stream; ...@@ -244,11 +238,10 @@ extern __thread cudaStream_t default_stream;
#define CHECK_SYNC(msg) \ #define CHECK_SYNC(msg) \
if (true == g_sync_flag) { \ if (true == g_sync_flag) { \
hl_stream_synchronize(HPPL_STREAM_DEFAULT); \ hl_stream_synchronize(HPPL_STREAM_DEFAULT); \
cudaError_t err \ cudaError_t err = (cudaError_t)hl_get_device_last_error(); \
= (cudaError_t)hl_get_device_last_error(); \ CHECK_EQ(cudaSuccess, err) \
CHECK_EQ(cudaSuccess, err) << "[" << msg << "] " \ << "[" << msg << "] " \
<< "CUDA error: " \ << "CUDA error: " << hl_get_device_error_string((size_t)err); \
<< hl_get_device_error_string((size_t)err); \
} }
#endif /* __NVCC__ */ #endif /* __NVCC__ */
......
paddle/cuda/include/hl_batch_transpose.h
浏览文件 @ 2a21d8b3
...@@ -12,7 +12,6 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ...@@ -12,7 +12,6 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and See the License for the specific language governing permissions and
limitations under the License. */ limitations under the License. */
#ifndef HL_BATCH_TRANSPOSE_H_ #ifndef HL_BATCH_TRANSPOSE_H_
#define HL_BATCH_TRANSPOSE_H_ #define HL_BATCH_TRANSPOSE_H_
...@@ -31,10 +30,7 @@ limitations under the License. */ ...@@ -31,10 +30,7 @@ limitations under the License. */
* order. Each batch has height * width data, which are * order. Each batch has height * width data, which are
* arranged in height-first (or row-first) manner. * arranged in height-first (or row-first) manner.
*/ */
extern void batchTranspose(const real* input, extern void batchTranspose(
real* output, const real* input, real* output, int width, int height, int batchSize);
int width,
int height,
int batchSize);
#endif // HL_BATCH_TRANSPOSE_H_ #endif // HL_BATCH_TRANSPOSE_H_
paddle/cuda/include/hl_cnn.h
浏览文件 @ 2a21d8b3
...@@ -12,7 +12,6 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ...@@ -12,7 +12,6 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and See the License for the specific language governing permissions and
limitations under the License. */ limitations under the License. */
#ifndef HL_CNN_H_ #ifndef HL_CNN_H_
#define HL_CNN_H_ #define HL_CNN_H_
...@@ -37,15 +36,21 @@ limitations under the License. */ ...@@ -37,15 +36,21 @@ limitations under the License. */
* @param[in] alpha * @param[in] alpha
* @param[in] beta * @param[in] beta
*/ */
extern void hl_shrink_col2feature( extern void hl_shrink_col2feature(const real* dataCol,
const real * dataCol, size_t channels, size_t channels,
size_t height, size_t width, size_t height,
size_t blockH, size_t blockW, size_t width,
size_t strideH, size_t strideW, size_t blockH,
size_t paddingH, size_t paddingW, size_t blockW,
size_t outputH, size_t outputW, size_t strideH,
size_t strideW,
size_t paddingH,
size_t paddingW,
size_t outputH,
size_t outputW,
real* dataIm, real* dataIm,
real alpha = 1.0f, real beta = 0.0f); real alpha = 1.0f,
real beta = 0.0f);
/** /**
* @brief Expand feature to column. * @brief Expand feature to column.
...@@ -65,13 +70,18 @@ extern void hl_shrink_col2feature( ...@@ -65,13 +70,18 @@ extern void hl_shrink_col2feature(
* @param[out] dataCol expand data. * @param[out] dataCol expand data.
* *
*/ */
extern void hl_expand_feature2col( extern void hl_expand_feature2col(const real* dataIm,
const real* dataIm, size_t channels, size_t channels,
size_t height, size_t width, size_t height,
size_t blockH, size_t blockW, size_t width,
size_t strideH, size_t strideW, size_t blockH,
size_t paddingH, size_t paddingW, size_t blockW,
size_t outputH, size_t outputW, size_t strideH,
size_t strideW,
size_t paddingH,
size_t paddingW,
size_t outputH,
size_t outputW,
real* dataCol); real* dataCol);
/** /**
...@@ -94,15 +104,21 @@ extern void hl_expand_feature2col( ...@@ -94,15 +104,21 @@ extern void hl_expand_feature2col(
* @param[in] tgtStride stride between output data samples. * @param[in] tgtStride stride between output data samples.
* *
*/ */
extern void hl_maxpool_forward( extern void hl_maxpool_forward(const int frameCnt,
const int frameCnt, const real* inputData, const real* inputData,
const int channels, const int channels,
const int height, const int width, const int height,
const int pooledH, const int pooledW, const int width,
const int sizeX, const int sizeY, const int pooledH,
const int strideH, const int strideW, const int pooledW,
const int paddingH, const int paddingW, const int sizeX,
real* tgtData, const int tgtStride); const int sizeY,
const int strideH,
const int strideW,
const int paddingH,
const int paddingW,
real* tgtData,
const int tgtStride);
/** /**
* @brief Maximum pool backward. * @brief Maximum pool backward.
...@@ -128,17 +144,25 @@ extern void hl_maxpool_forward( ...@@ -128,17 +144,25 @@ extern void hl_maxpool_forward(
* @param[in] outStride stride between output data samples. * @param[in] outStride stride between output data samples.
* *
*/ */
extern void hl_maxpool_backward( extern void hl_maxpool_backward(const int frameCnt,
const int frameCnt, const real* inputData, const real* inputData,
const real* outData, const real* outGrad, const real* outData,
const int channels, const int height, const real* outGrad,
const int channels,
const int height,
const int width, const int width,
const int pooledH, const int pooledW, const int pooledH,
const int sizeX, const int sizeY, const int pooledW,
const int strideH, const int strideW, const int sizeX,
const int paddingH, const int paddingW, const int sizeY,
real scaleA, real scaleB, const int strideH,
real* targetGrad, const int outStride); const int strideW,
const int paddingH,
const int paddingW,
real scaleA,
real scaleB,
real* targetGrad,
const int outStride);
/** /**
* @brief Averge pool forward. * @brief Averge pool forward.
...@@ -160,15 +184,21 @@ extern void hl_maxpool_backward( ...@@ -160,15 +184,21 @@ extern void hl_maxpool_backward(
* @param[in] tgtStride stride between output data samples. * @param[in] tgtStride stride between output data samples.
* *
*/ */
extern void hl_avgpool_forward( extern void hl_avgpool_forward(const int frameCnt,
const int frameCnt, const real* inputData, const real* inputData,
const int channels, const int channels,
const int height, const int width, const int height,
const int pooledH, const int pooledW, const int width,
const int sizeX, const int sizeY, const int pooledH,
const int strideH, const int strideW, const int pooledW,
const int paddingH, const int paddingW, const int sizeX,
real* tgtData, const int tgtStride); const int sizeY,
const int strideH,
const int strideW,
const int paddingH,
const int paddingW,
real* tgtData,
const int tgtStride);
/** /**
* @brief Maximum pool backward. * @brief Maximum pool backward.
...@@ -192,16 +222,23 @@ extern void hl_avgpool_forward( ...@@ -192,16 +222,23 @@ extern void hl_avgpool_forward(
* @param[in] outStride stride between output data samples. * @param[in] outStride stride between output data samples.
* *
*/ */
extern void hl_avgpool_backward( extern void hl_avgpool_backward(const int frameCnt,
const int frameCnt, const real* outGrad, const real* outGrad,
const int channels, const int height, const int channels,
const int height,
const int width, const int width,
const int pooledH, const int pooledW, const int pooledH,
const int sizeX, const int sizeY, const int pooledW,
const int strideH, const int strideW, const int sizeX,
int paddingH, int paddingW, const int sizeY,
real scaleA, real scaleB, const int strideH,
real* backGrad, const int outStride); const int strideW,
int paddingH,
int paddingW,
real scaleA,
real scaleB,
real* backGrad,
const int outStride);
/** /**
* @brief Cross-map-respose normalize forward. * @brief Cross-map-respose normalize forward.
...@@ -218,10 +255,16 @@ extern void hl_avgpool_backward( ...@@ -218,10 +255,16 @@ extern void hl_avgpool_backward(
* @param[in] beta scale. * @param[in] beta scale.
* *
*/ */
extern void hl_CMRNorm_forward( extern void hl_CMRNorm_forward(size_t frameCnt,
size_t frameCnt, const real* in, real* scale, real* out, const real* in,
size_t channels, size_t height, size_t width, size_t sizeX, real* scale,
real alpha, real beta); real* out,
size_t channels,
size_t height,
size_t width,
size_t sizeX,
real alpha,
real beta);
/** /**
* @brief Cross-map-respose normalize backward. * @brief Cross-map-respose normalize backward.
...@@ -240,11 +283,18 @@ extern void hl_CMRNorm_forward( ...@@ -240,11 +283,18 @@ extern void hl_CMRNorm_forward(
* @param[in] beta scale. * @param[in] beta scale.
* *
*/ */
extern void hl_CMRNorm_backward( extern void hl_CMRNorm_backward(size_t frameCnt,
size_t frameCnt, const real* inV, const real* scale, const real* inV,
const real* outV, const real* outDiff, real *inDiff, const real* scale,
size_t channels, size_t height, size_t width, size_t sizeX, const real* outV,
real alpha, real beta); const real* outDiff,
real* inDiff,
size_t channels,
size_t height,
size_t width,
size_t sizeX,
real alpha,
real beta);
/** /**
* @brief Bilinear interpolation forward. * @brief Bilinear interpolation forward.
...@@ -278,24 +328,24 @@ extern void hl_bilinear_forward(const real* inData, ...@@ -278,24 +328,24 @@ extern void hl_bilinear_forward(const real* inData,
const real ratioH, const real ratioH,
const real ratioW); const real ratioW);
/** /**
* @brief Bilinear interpolation backward. * @brief Bilinear interpolation backward.
* *
* @param[out] inGrad input gradient. * @param[out] inGrad input gradient.
* @param[in] inImgH input image height. * @param[in] inImgH input image height.
* @param[in] inImgW input image width. * @param[in] inImgW input image width.
* @param[in] inputH input batchSize. * @param[in] inputH input batchSize.
* @param[in] inputW input image data dim. * @param[in] inputW input image data dim.
* @param[in] outGrad output gradient. * @param[in] outGrad output gradient.
* @param[in] outImgH output image height. * @param[in] outImgH output image height.
* @param[in] outImgW output image width. * @param[in] outImgW output image width.
* @param[in] outputH output batchSize. * @param[in] outputH output batchSize.
* @param[in] outputW output image data dim. * @param[in] outputW output image data dim.
* @param[in] numChannels number of channels. * @param[in] numChannels number of channels.
* @param[in] ratioH inImgH / outImgH. * @param[in] ratioH inImgH / outImgH.
* @param[in] ratioW inImgW / outImgW. * @param[in] ratioW inImgW / outImgW.
* *
*/ */
extern void hl_bilinear_backward(real* inGrad, extern void hl_bilinear_backward(real* inGrad,
const size_t inImgH, const size_t inImgH,
const size_t inImgW, const size_t inImgW,
...@@ -321,9 +371,13 @@ extern void hl_bilinear_backward(real* inGrad, ...@@ -321,9 +371,13 @@ extern void hl_bilinear_backward(real* inGrad,
* @param[in] featLen feature length = image height * image width. * @param[in] featLen feature length = image height * image width.
* @param[in] groups number of groups. * @param[in] groups number of groups.
*/ */
extern void hl_maxout_forward( extern void hl_maxout_forward(const real* inData,
const real* inData, real* outData, int* idData, real* outData,
size_t batchSize, size_t size, size_t featLen, size_t groups); int* idData,
size_t batchSize,
size_t size,
size_t featLen,
size_t groups);
/** /**
* @brief MaxOut backward. * @brief MaxOut backward.
...@@ -336,8 +390,12 @@ extern void hl_maxout_forward( ...@@ -336,8 +390,12 @@ extern void hl_maxout_forward(
* @param[in] featLen feature length = image height * image width. * @param[in] featLen feature length = image height * image width.
* @param[in] groups number of groups. * @param[in] groups number of groups.
*/ */
extern void hl_maxout_backward( extern void hl_maxout_backward(real* inGrad,
real* inGrad, const real* outGrad, const int* idData, const real* outGrad,
size_t batchSize, size_t size, size_t featLen, size_t groups); const int* idData,
size_t batchSize,
size_t size,
size_t featLen,
size_t groups);
#endif /* HL_CNN_H_ */ #endif /* HL_CNN_H_ */
paddle/cuda/include/hl_cuda.h
浏览文件 @ 2a21d8b3
...@@ -12,7 +12,6 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ...@@ -12,7 +12,6 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and See the License for the specific language governing permissions and
limitations under the License. */ limitations under the License. */
#ifndef HL_CUDA_H_ #ifndef HL_CUDA_H_
#define HL_CUDA_H_ #define HL_CUDA_H_
...@@ -22,8 +21,7 @@ limitations under the License. */ ...@@ -22,8 +21,7 @@ limitations under the License. */
/** /**
* @brief HPPL event. * @brief HPPL event.
*/ */
typedef struct _hl_event_st * hl_event_t; typedef struct _hl_event_st *hl_event_t;
/** /**
* @brief return cuda runtime api version. * @brief return cuda runtime api version.
...@@ -42,7 +40,7 @@ extern void hl_start(); ...@@ -42,7 +40,7 @@ extern void hl_start();
* if device is NULL, will start all GPU. * if device is NULL, will start all GPU.
* @param[in] number number of devices. * @param[in] number number of devices.
*/ */
extern void hl_specify_devices_start(int* device, int number); extern void hl_specify_devices_start(int *device, int number);
/** /**
* @brief Queries if a device may directly access a peer device's memory. * @brief Queries if a device may directly access a peer device's memory.
...@@ -126,7 +124,7 @@ extern int hl_get_device(); ...@@ -126,7 +124,7 @@ extern int hl_get_device();
* *
* @return dest_d pointer to device memory. * @return dest_d pointer to device memory.
*/ */
extern void* hl_malloc_device(size_t size); extern void *hl_malloc_device(size_t size);
/** /**
* @brief Free device memory. * @brief Free device memory.
...@@ -143,7 +141,7 @@ extern void hl_free_mem_device(void *dest_d); ...@@ -143,7 +141,7 @@ extern void hl_free_mem_device(void *dest_d);
* *
* @return dest_h pointer to host memory. * @return dest_h pointer to host memory.
*/ */
extern void* hl_malloc_host(size_t size); extern void *hl_malloc_host(size_t size);
/** /**
* @brief Free host page-lock memory. * @brief Free host page-lock memory.
...@@ -261,8 +259,7 @@ extern void hl_destroy_event(hl_event_t event); ...@@ -261,8 +259,7 @@ extern void hl_destroy_event(hl_event_t event);
* *
* @return time Time between start and end in ms. * @return time Time between start and end in ms.
*/ */
extern float hl_event_elapsed_time(hl_event_t start, extern float hl_event_elapsed_time(hl_event_t start, hl_event_t end);
hl_event_t end);
/** /**
* @brief Records an event. * @brief Records an event.
...@@ -300,7 +297,7 @@ extern void hl_set_device_flags_block(); ...@@ -300,7 +297,7 @@ extern void hl_set_device_flags_block();
/** /**
* @brief Returns the last error string from a cuda runtime call. * @brief Returns the last error string from a cuda runtime call.
*/ */
extern const char* hl_get_device_error_string(); extern const char *hl_get_device_error_string();
/** /**
* @brief Returns the last error string from a cuda runtime call. * @brief Returns the last error string from a cuda runtime call.
...@@ -309,7 +306,7 @@ extern const char* hl_get_device_error_string(); ...@@ -309,7 +306,7 @@ extern const char* hl_get_device_error_string();
* *
* @see hl_get_device_last_error() * @see hl_get_device_last_error()
*/ */
extern const char* hl_get_device_error_string(size_t err); extern const char *hl_get_device_error_string(size_t err);
/** /**
* @brief Returns the last error number. * @brief Returns the last error number.
......
paddle/cuda/include/hl_cuda_cublas.h
浏览文件 @ 2a21d8b3
...@@ -12,7 +12,6 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ...@@ -12,7 +12,6 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and See the License for the specific language governing permissions and
limitations under the License. */ limitations under the License. */
#ifndef HL_CUDA_CUBLAS_H_ #ifndef HL_CUDA_CUBLAS_H_
#define HL_CUDA_CUBLAS_H_ #define HL_CUDA_CUBLAS_H_
...@@ -29,12 +28,8 @@ limitations under the License. */ ...@@ -29,12 +28,8 @@ limitations under the License. */
* @param[in] ldc the first dimension of C_d. * @param[in] ldc the first dimension of C_d.
* *
*/ */
extern void hl_matrix_transpose(real *A_d, extern void hl_matrix_transpose(
real *C_d, real *A_d, real *C_d, int dimM, int dimN, int lda, int ldc);
int dimM,
int dimN,
int lda,
int ldc);
/* /*
* @brief Matrix transpose, while lda = dimN, ldc = dimM. * @brief Matrix transpose, while lda = dimN, ldc = dimM.
...@@ -45,10 +40,7 @@ extern void hl_matrix_transpose(real *A_d, ...@@ -45,10 +40,7 @@ extern void hl_matrix_transpose(real *A_d,
* @param[in] dimN matrix width. * @param[in] dimN matrix width.
* *
*/ */
extern void hl_matrix_transpose(real *A_d, extern void hl_matrix_transpose(real *A_d, real *C_d, int dimM, int dimN);
real *C_d,
int dimM,
int dimN);
/* /*
* @brief Matrix inverse * @brief Matrix inverse
...@@ -60,11 +52,7 @@ extern void hl_matrix_transpose(real *A_d, ...@@ -60,11 +52,7 @@ extern void hl_matrix_transpose(real *A_d,
* @param[in] ldc the first dimension of C_d * @param[in] ldc the first dimension of C_d
* *
*/ */
extern void hl_matrix_inverse(real *A_d, extern void hl_matrix_inverse(real *A_d, real *C_d, int dimN, int lda, int ldc);
real *C_d,
int dimN,
int lda,
int ldc);
/** /**
* @brief C_d = alpha*(op(A_d) * op(B_d)) + beta*C_d * @brief C_d = alpha*(op(A_d) * op(B_d)) + beta*C_d
...@@ -84,12 +72,19 @@ extern void hl_matrix_inverse(real *A_d, ...@@ -84,12 +72,19 @@ extern void hl_matrix_inverse(real *A_d,
* @param[in] ldc the first dimension of C_d. * @param[in] ldc the first dimension of C_d.
* *
*/ */
extern void hl_matrix_mul(real *A_d, hl_trans_op_t transa, extern void hl_matrix_mul(real *A_d,
real *B_d, hl_trans_op_t transb, hl_trans_op_t transa,
real *B_d,
hl_trans_op_t transb,
real *C_d, real *C_d,
int dimM, int dimN, int dimK, int dimM,
real alpha, real beta, int dimN,
int lda, int ldb, int ldc); int dimK,
real alpha,
real beta,
int lda,
int ldb,
int ldc);
/** /**
* @brief C_d = alpha*(op(A_d) * op(B_d)) + beta*C_d * @brief C_d = alpha*(op(A_d) * op(B_d)) + beta*C_d
...@@ -106,11 +101,16 @@ extern void hl_matrix_mul(real *A_d, hl_trans_op_t transa, ...@@ -106,11 +101,16 @@ extern void hl_matrix_mul(real *A_d, hl_trans_op_t transa,
* @param[in] beta scalar used for multiplication. * @param[in] beta scalar used for multiplication.
* *
*/ */
extern void hl_matrix_mul(real *A_d, hl_trans_op_t transa, extern void hl_matrix_mul(real *A_d,
real *B_d, hl_trans_op_t transb, hl_trans_op_t transa,
real *B_d,
hl_trans_op_t transb,
real *C_d, real *C_d,
int dimM, int dimN, int dimK, int dimM,
real alpha, real beta); int dimN,
int dimK,
real alpha,
real beta);
/** /**
* @brief This function performs the matrix-vector multiplication. * @brief This function performs the matrix-vector multiplication.
...@@ -132,11 +132,17 @@ extern void hl_matrix_mul(real *A_d, hl_trans_op_t transa, ...@@ -132,11 +132,17 @@ extern void hl_matrix_mul(real *A_d, hl_trans_op_t transa,
* *
*/ */
extern void hl_matrix_mul_vector(real *A_d, hl_trans_op_t trans, extern void hl_matrix_mul_vector(real *A_d,
real *B_d, real *C_d, hl_trans_op_t trans,
int dimM, int dimN, real *B_d,
real alpha, real beta, real *C_d,
int lda, int incb, int incc); int dimM,
int dimN,
real alpha,
real beta,
int lda,
int incb,
int incc);
/** /**
* @brief This function performs the matrix-vector multiplication. * @brief This function performs the matrix-vector multiplication.
...@@ -154,9 +160,13 @@ extern void hl_matrix_mul_vector(real *A_d, hl_trans_op_t trans, ...@@ -154,9 +160,13 @@ extern void hl_matrix_mul_vector(real *A_d, hl_trans_op_t trans,
* @param[in] beta scalar used for multiplication. * @param[in] beta scalar used for multiplication.
* *
*/ */
extern void hl_matrix_mul_vector(real *A_d, hl_trans_op_t trans, extern void hl_matrix_mul_vector(real *A_d,
real *B_d, real *C_d, hl_trans_op_t trans,
int dimM, int dimN, real *B_d,
real alpha, real beta); real *C_d,
int dimM,
int dimN,
real alpha,
real beta);
#endif /* HL_CUDA_CUBLAS_H_ */ #endif /* HL_CUDA_CUBLAS_H_ */
paddle/cuda/include/hl_cuda_cudnn.h
浏览文件 @ 2a21d8b3
...@@ -12,7 +12,6 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ...@@ -12,7 +12,6 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and See the License for the specific language governing permissions and
limitations under the License. */ limitations under the License. */
#ifndef HL_CUDA_CUDNN_H_ #ifndef HL_CUDA_CUDNN_H_
#define HL_CUDA_CUDNN_H_ #define HL_CUDA_CUDNN_H_
...@@ -324,8 +323,7 @@ extern void hl_convolution_forward_add_bias(hl_tensor_descriptor bias, ...@@ -324,8 +323,7 @@ extern void hl_convolution_forward_add_bias(hl_tensor_descriptor bias,
* @param[in] sizeInBytes gpu workspace size (bytes). * @param[in] sizeInBytes gpu workspace size (bytes).
* @param[in] convBwdFilterAlgo backward filter algorithm. * @param[in] convBwdFilterAlgo backward filter algorithm.
*/ */
extern void hl_convolution_backward_filter( extern void hl_convolution_backward_filter(hl_tensor_descriptor input,
hl_tensor_descriptor input,
real* input_data, real* input_data,
hl_tensor_descriptor output, hl_tensor_descriptor output,
real* output_grad_data, real* output_grad_data,
...@@ -350,8 +348,7 @@ extern void hl_convolution_backward_filter( ...@@ -350,8 +348,7 @@ extern void hl_convolution_backward_filter(
* @param[in] sizeInBytes gpu workspace size (bytes). * @param[in] sizeInBytes gpu workspace size (bytes).
* @param[in] convBwdDataAlgo backward data algorithm. * @param[in] convBwdDataAlgo backward data algorithm.
*/ */
extern void hl_convolution_backward_data( extern void hl_convolution_backward_data(hl_tensor_descriptor input,
hl_tensor_descriptor input,
real* input_data_grad, real* input_data_grad,
hl_tensor_descriptor output, hl_tensor_descriptor output,
real* output_grad_data, real* output_grad_data,
...@@ -383,8 +380,8 @@ extern void hl_convolution_backward_bias(hl_tensor_descriptor bias, ...@@ -383,8 +380,8 @@ extern void hl_convolution_backward_bias(hl_tensor_descriptor bias,
* @param[in] height matrix height. * @param[in] height matrix height.
* @param[in] width matrix width. * @param[in] width matrix width.
*/ */
extern void hl_softmax_forward(real *input, extern void hl_softmax_forward(real* input,
real *output, real* output,
int height, int height,
int width); int width);
...@@ -396,8 +393,8 @@ extern void hl_softmax_forward(real *input, ...@@ -396,8 +393,8 @@ extern void hl_softmax_forward(real *input,
* @param[in] height matrix height. * @param[in] height matrix height.
* @param[in] width matrix width. * @param[in] width matrix width.
*/ */
extern void hl_softmax_backward(real *output_value, extern void hl_softmax_backward(real* output_value,
real *output_grad, real* output_grad,
int height, int height,
int width); int width);
...@@ -426,18 +423,18 @@ extern void hl_softmax_backward(real *output_value, ...@@ -426,18 +423,18 @@ extern void hl_softmax_backward(real *output_value,
* *
*/ */
extern void hl_batch_norm_forward_training(hl_tensor_descriptor inputDesc, extern void hl_batch_norm_forward_training(hl_tensor_descriptor inputDesc,
real *input, real* input,
hl_tensor_descriptor outputDesc, hl_tensor_descriptor outputDesc,
real *output, real* output,
hl_tensor_descriptor bnParamDesc, hl_tensor_descriptor bnParamDesc,
real *scale, real* scale,
real *bias, real* bias,
double factor, double factor,
real *runningMean, real* runningMean,
real *runningInvVar, real* runningInvVar,
double epsilon, double epsilon,
real *savedMean, real* savedMean,
real *savedVar); real* savedVar);
/** /**
* @brief cudnn batch norm forward. * @brief cudnn batch norm forward.
...@@ -463,14 +460,14 @@ extern void hl_batch_norm_forward_training(hl_tensor_descriptor inputDesc, ...@@ -463,14 +460,14 @@ extern void hl_batch_norm_forward_training(hl_tensor_descriptor inputDesc,
* *
*/ */
extern void hl_batch_norm_forward_inference(hl_tensor_descriptor inputDesc, extern void hl_batch_norm_forward_inference(hl_tensor_descriptor inputDesc,
real *input, real* input,
hl_tensor_descriptor outputDesc, hl_tensor_descriptor outputDesc,
real *output, real* output,
hl_tensor_descriptor bnParamDesc, hl_tensor_descriptor bnParamDesc,
real *scale, real* scale,
real *bias, real* bias,
real *estimatedMean, real* estimatedMean,
real *estimatedVar, real* estimatedVar,
double epsilon); double epsilon);
/** /**
...@@ -483,7 +480,8 @@ extern void hl_batch_norm_forward_inference(hl_tensor_descriptor inputDesc, ...@@ -483,7 +480,8 @@ extern void hl_batch_norm_forward_inference(hl_tensor_descriptor inputDesc,
* @param[in] inGradDesc input tensor descriptor desc. * @param[in] inGradDesc input tensor descriptor desc.
* @param[in] inGrad input data. * @param[in] inGrad input data.
* @param[in] dBnParamDesc tensor descriptor desc. * @param[in] dBnParamDesc tensor descriptor desc.
* bnScale, bnBias, running mean/var, save_mean/var. * bnScale, bnBias, running mean/var,
* save_mean/var.
* @param[in] scale batch normalization scale parameter (in original * @param[in] scale batch normalization scale parameter (in original
* paper scale is referred to as gamma). * paper scale is referred to as gamma).
* @param[in] scaleGrad batch normalization scale parameter (in original * @param[in] scaleGrad batch normalization scale parameter (in original
...@@ -497,17 +495,17 @@ extern void hl_batch_norm_forward_inference(hl_tensor_descriptor inputDesc, ...@@ -497,17 +495,17 @@ extern void hl_batch_norm_forward_inference(hl_tensor_descriptor inputDesc,
* *
*/ */
extern void hl_batch_norm_backward(hl_tensor_descriptor inputDesc, extern void hl_batch_norm_backward(hl_tensor_descriptor inputDesc,
real *input, real* input,
hl_tensor_descriptor outGradDesc, hl_tensor_descriptor outGradDesc,
real *outGrad, real* outGrad,
hl_tensor_descriptor inGradDesc, hl_tensor_descriptor inGradDesc,
real *inGrad, real* inGrad,
hl_tensor_descriptor dBnParamDesc, hl_tensor_descriptor dBnParamDesc,
real *scale, real* scale,
real *scaleGrad, real* scaleGrad,
real *biasGrad, real* biasGrad,
double epsilon, double epsilon,
real *savedMean, real* savedMean,
real *savedInvVar); real* savedInvVar);
#endif // HL_CUDA_CUDNN_H_ #endif // HL_CUDA_CUDNN_H_
paddle/cuda/include/hl_dso_loader.h
浏览文件 @ 2a21d8b3
...@@ -12,7 +12,6 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ...@@ -12,7 +12,6 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and See the License for the specific language governing permissions and
limitations under the License. */ limitations under the License. */
#ifndef HL_DSO_LOADER_H_ #ifndef HL_DSO_LOADER_H_
#define HL_DSO_LOADER_H_ #define HL_DSO_LOADER_H_
......
paddle/cuda/include/hl_functions.h
浏览文件 @ 2a21d8b3
...@@ -12,7 +12,6 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ...@@ -12,7 +12,6 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and See the License for the specific language governing permissions and
limitations under the License. */ limitations under the License. */
#ifndef HL_FUNCTIONS_H_ #ifndef HL_FUNCTIONS_H_
#define HL_FUNCTIONS_H_ #define HL_FUNCTIONS_H_
...@@ -30,21 +29,21 @@ limitations under the License. */ ...@@ -30,21 +29,21 @@ limitations under the License. */
#ifndef __NVCC__ #ifndef __NVCC__
namespace hppl { namespace hppl {
/* /*
* forward activation * forward activation
*/ */
real relu(const real a); real relu(const real a);
real sigmoid(const real a); real sigmoid(const real a);
real tanh(const real a); real tanh(const real a);
real linear(const real a); real linear(const real a);
/* /*
* backward activation * backward activation
*/ */
real relu(const real a, const real b); real relu(const real a, const real b);
real sigmoid(const real a, const real b); real sigmoid(const real a, const real b);
real tanh(const real a, const real b); real tanh(const real a, const real b);
real linear(const real a, const real b); real linear(const real a, const real b);
} // namespace hppl } // namespace hppl
#ifdef __AVX__ #ifdef __AVX__
......
paddle/cuda/include/hl_gpu.h
浏览文件 @ 2a21d8b3
...@@ -12,7 +12,6 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ...@@ -12,7 +12,6 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and See the License for the specific language governing permissions and
limitations under the License. */ limitations under the License. */
#ifndef HL_GPU_H_ #ifndef HL_GPU_H_
#define HL_GPU_H_ #define HL_GPU_H_
......
paddle/cuda/include/hl_lstm.h
浏览文件 @ 2a21d8b3
...@@ -12,7 +12,6 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ...@@ -12,7 +12,6 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and See the License for the specific language governing permissions and
limitations under the License. */ limitations under the License. */
#ifndef HL_LSTM_H_ #ifndef HL_LSTM_H_
#define HL_LSTM_H_ #define HL_LSTM_H_
......
paddle/cuda/include/hl_matrix.h
浏览文件 @ 2a21d8b3
...@@ -12,7 +12,6 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ...@@ -12,7 +12,6 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and See the License for the specific language governing permissions and
limitations under the License. */ limitations under the License. */
#ifndef HL_MATRIX_H_ #ifndef HL_MATRIX_H_
#define HL_MATRIX_H_ #define HL_MATRIX_H_
...@@ -30,13 +29,8 @@ limitations under the License. */ ...@@ -30,13 +29,8 @@ limitations under the License. */
* @param[in] beta scalar used for addition. * @param[in] beta scalar used for addition.
* *
*/ */
extern void hl_matrix_add(real* A_d, extern void hl_matrix_add(
real* B_d, real* A_d, real* B_d, real* C_d, int dimM, int dimN, real alpha, real beta);
real* C_d,
int dimM,
int dimN,
real alpha,
real beta);
/** /**
* @brief Matrix Softmax. * @brief Matrix Softmax.
* *
...@@ -46,7 +40,7 @@ extern void hl_matrix_add(real* A_d, ...@@ -46,7 +40,7 @@ extern void hl_matrix_add(real* A_d,
* @param[in] dimN matrix width. * @param[in] dimN matrix width.
* *
*/ */
extern void hl_matrix_softmax(real *A_d, real *C_d, int dimM, int dimN); extern void hl_matrix_softmax(real* A_d, real* C_d, int dimM, int dimN);
/** /**
* @brief Matrix softmax derivative. * @brief Matrix softmax derivative.
...@@ -58,11 +52,8 @@ extern void hl_matrix_softmax(real *A_d, real *C_d, int dimM, int dimN); ...@@ -58,11 +52,8 @@ extern void hl_matrix_softmax(real *A_d, real *C_d, int dimM, int dimN);
* @param[in] dimN matrix width. * @param[in] dimN matrix width.
* *
*/ */
extern void hl_matrix_softmax_derivative(real* grad_d, extern void hl_matrix_softmax_derivative(
real* output_d, real* grad_d, real* output_d, real* sftmaxSum_d, int dimM, int dimN);
real* sftmaxSum_d,
int dimM,
int dimN);
/** /**
* @brief Sequence softmax. * @brief Sequence softmax.
...@@ -73,8 +64,8 @@ extern void hl_matrix_softmax_derivative(real* grad_d, ...@@ -73,8 +64,8 @@ extern void hl_matrix_softmax_derivative(real* grad_d,
* @param[in] numSequence sequence number. * @param[in] numSequence sequence number.
* *
*/ */
extern void hl_sequence_softmax_forward(real *A_d, extern void hl_sequence_softmax_forward(real* A_d,
real *C_d, real* C_d,
const int* index, const int* index,
int numSequence); int numSequence);
...@@ -88,11 +79,8 @@ extern void hl_sequence_softmax_forward(real *A_d, ...@@ -88,11 +79,8 @@ extern void hl_sequence_softmax_forward(real *A_d,
* @param[in] dimN matrix width. * @param[in] dimN matrix width.
* *
*/ */
extern void hl_matrix_classification_error(real* A_d, extern void hl_matrix_classification_error(
int* B_d, real* A_d, int* B_d, real* C_d, int dimM, int dimN);
real* C_d,
int dimM,
int dimN);
/** /**
* @brief Matrix cross entropy. * @brief Matrix cross entropy.
...@@ -104,11 +92,8 @@ extern void hl_matrix_classification_error(real* A_d, ...@@ -104,11 +92,8 @@ extern void hl_matrix_classification_error(real* A_d,
* @param[in] dimN matrix width. * @param[in] dimN matrix width.
* *
*/ */
extern void hl_matrix_cross_entropy(real* A_d, extern void hl_matrix_cross_entropy(
real* C_d, real* A_d, real* C_d, int* label_d, int dimM, int dimN);
int* label_d,
int dimM,
int dimN);
/** /**
* @brief Matrix cross entropy back propagation. * @brief Matrix cross entropy back propagation.
...@@ -120,11 +105,8 @@ extern void hl_matrix_cross_entropy(real* A_d, ...@@ -120,11 +105,8 @@ extern void hl_matrix_cross_entropy(real* A_d,
* @param[in] dimN matrix width. * @param[in] dimN matrix width.
* *
*/ */
extern void hl_matrix_cross_entropy_bp(real* grad_d, extern void hl_matrix_cross_entropy_bp(
real* output_d, real* grad_d, real* output_d, int* label_d, int dimM, int dimN);
int* label_d,
int dimM,
int dimN);
/** /**
* @brief Matrix multi-binary label cross entropy * @brief Matrix multi-binary label cross entropy
...@@ -135,11 +117,8 @@ extern void hl_matrix_cross_entropy_bp(real* grad_d, ...@@ -135,11 +117,8 @@ extern void hl_matrix_cross_entropy_bp(real* grad_d,
* @param[in] dimM matrix height. * @param[in] dimM matrix height.
* @param[in] dimN matrix width. * @param[in] dimN matrix width.
*/ */
extern void hl_matrix_multi_binary_cross_entropy(real* output, extern void hl_matrix_multi_binary_cross_entropy(
real* entropy, real* output, real* entropy, hl_sparse_matrix_s mat, int dimM, int dimN);
hl_sparse_matrix_s mat,
int dimM,
int dimN);
/** /**
* @brief Matrix multi-binary label cross entropy backprop * @brief Matrix multi-binary label cross entropy backprop
...@@ -150,11 +129,8 @@ extern void hl_matrix_multi_binary_cross_entropy(real* output, ...@@ -150,11 +129,8 @@ extern void hl_matrix_multi_binary_cross_entropy(real* output,
* @param[in] dimM matrix height. * @param[in] dimM matrix height.
* @param[in] dimN matrix width. * @param[in] dimN matrix width.
*/ */
extern void hl_matrix_multi_binary_cross_entropy_bp(real* output, extern void hl_matrix_multi_binary_cross_entropy_bp(
real* grad, real* output, real* grad, hl_sparse_matrix_s mat, int dimM, int dimN);
hl_sparse_matrix_s mat,
int dimM,
int dimN);
/** /**
* @brief Matrix zero memory. * @brief Matrix zero memory.
...@@ -176,12 +152,8 @@ extern void hl_matrix_zero_mem(real* data, int num); ...@@ -176,12 +152,8 @@ extern void hl_matrix_zero_mem(real* data, int num);
* @param[in] partial_sum * @param[in] partial_sum
*/ */
extern void hl_param_relu_forward(real* output, extern void hl_param_relu_forward(
real* input, real* output, real* input, real* w, int width, int height, int partial_sum);
real* w,
int width,
int height,
int partial_sum);
/** /**
* @brief parameter relu backward w * @brief parameter relu backward w
* *
......
paddle/cuda/include/hl_sequence.h
浏览文件 @ 2a21d8b3
...@@ -12,7 +12,6 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ...@@ -12,7 +12,6 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and See the License for the specific language governing permissions and
limitations under the License. */ limitations under the License. */
#ifndef HL_SEQUENCE_H_ #ifndef HL_SEQUENCE_H_
#define HL_SEQUENCE_H_ #define HL_SEQUENCE_H_
...@@ -32,7 +31,7 @@ limitations under the License. */ ...@@ -32,7 +31,7 @@ limitations under the License. */
extern void hl_max_sequence_forward(real* input, extern void hl_max_sequence_forward(real* input,
const int* sequence, const int* sequence,
real* output, real* output,
int *index, int* index,
int numSequences, int numSequences,
int dim); int dim);
...@@ -46,11 +45,8 @@ extern void hl_max_sequence_forward(real* input, ...@@ -46,11 +45,8 @@ extern void hl_max_sequence_forward(real* input,
* @param[in] dim input dimension. * @param[in] dim input dimension.
* *
*/ */
extern void hl_max_sequence_backward(real* outputGrad, extern void hl_max_sequence_backward(
int *index, real* outputGrad, int* index, real* inputGrad, int numSequences, int dim);
real* inputGrad,
int numSequences,
int dim);
/** /**
* @brief Context projection forward. * @brief Context projection forward.
...@@ -63,7 +59,8 @@ extern void hl_max_sequence_backward(real* outputGrad, ...@@ -63,7 +59,8 @@ extern void hl_max_sequence_backward(real* outputGrad,
* @param[in] inputDim input sequence dimension. * @param[in] inputDim input sequence dimension.
* @param[in] contextLength context length. * @param[in] contextLength context length.
* @param[in] contextStart context start. * @param[in] contextStart context start.
* @param[in] beginPad number of extra timesteps added at the beginning. * @param[in] beginPad number of extra timesteps added at the
* beginning.
* @param[in] isPadding trainable padding. * @param[in] isPadding trainable padding.
* *
*/ */
...@@ -109,7 +106,8 @@ extern void hl_context_projection_backward_data(real* outputGrad, ...@@ -109,7 +106,8 @@ extern void hl_context_projection_backward_data(real* outputGrad,
* @param[in] totalPad number of extra timesteps. * @param[in] totalPad number of extra timesteps.
* @param[in] contextLength context length. * @param[in] contextLength context length.
* @param[in] contextStart context start. * @param[in] contextStart context start.
* @param[in] beginPad number of extra timesteps added at the beginning. * @param[in] beginPad number of extra timesteps added at the
* beginning.
* *
*/ */
extern void hl_context_projection_backward_weight(real* outputGrad, extern void hl_context_projection_backward_weight(real* outputGrad,
...@@ -141,9 +139,9 @@ extern void hl_context_projection_backward_weight(real* outputGrad, ...@@ -141,9 +139,9 @@ extern void hl_context_projection_backward_weight(real* outputGrad,
* @param[in] seq2batch copy direction. * @param[in] seq2batch copy direction.
* *
*/ */
extern void hl_sequence2batch_copy(real *batch, extern void hl_sequence2batch_copy(real* batch,
real *sequence, real* sequence,
const int *batchIndex, const int* batchIndex,
int seqWidth, int seqWidth,
int batchCount, int batchCount,
bool seq2batch); bool seq2batch);
...@@ -167,9 +165,9 @@ extern void hl_sequence2batch_copy(real *batch, ...@@ -167,9 +165,9 @@ extern void hl_sequence2batch_copy(real *batch,
* @param[in] seq2batch copy direction. * @param[in] seq2batch copy direction.
* *
*/ */
extern void hl_sequence2batch_add(real *batch, extern void hl_sequence2batch_add(real* batch,
real *sequence, real* sequence,
int *batchIndex, int* batchIndex,
int seqWidth, int seqWidth,
int batchCount, int batchCount,
bool seq2batch); bool seq2batch);
......
paddle/cuda/include/hl_sparse.h
浏览文件 @ 2a21d8b3
...@@ -12,7 +12,6 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ...@@ -12,7 +12,6 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and See the License for the specific language governing permissions and
limitations under the License. */ limitations under the License. */
#ifndef HL_SPARSE_H_ #ifndef HL_SPARSE_H_
#define HL_SPARSE_H_ #define HL_SPARSE_H_
...@@ -60,7 +59,7 @@ extern void hl_free_sparse_matrix(hl_sparse_matrix_s A_d); ...@@ -60,7 +59,7 @@ extern void hl_free_sparse_matrix(hl_sparse_matrix_s A_d);
* *
*/ */
extern void hl_construct_sparse_matrix(hl_sparse_matrix_s *A_d, extern void hl_construct_sparse_matrix(hl_sparse_matrix_s *A_d,
void * dest_d, void *dest_d,
size_t size, size_t size,
hl_matrix_format_t format, hl_matrix_format_t format,
hl_matrix_value_t value_type, hl_matrix_value_t value_type,
...@@ -94,9 +93,9 @@ extern void hl_construct_sparse_matrix(hl_sparse_matrix_s *A_d, ...@@ -94,9 +93,9 @@ extern void hl_construct_sparse_matrix(hl_sparse_matrix_s *A_d,
* *
*/ */
extern void hl_construct_sparse_matrix(hl_sparse_matrix_s *A_d, extern void hl_construct_sparse_matrix(hl_sparse_matrix_s *A_d,
real* value_d, real *value_d,
int* rows_d, int *rows_d,
int* cols_d, int *cols_d,
hl_matrix_format_t format, hl_matrix_format_t format,
hl_matrix_value_t value_type, hl_matrix_value_t value_type,
int dimM, int dimM,
...@@ -259,10 +258,14 @@ extern void hl_matrix_csr_mul_dense(hl_sparse_matrix_s A_d, ...@@ -259,10 +258,14 @@ extern void hl_matrix_csr_mul_dense(hl_sparse_matrix_s A_d,
*/ */
extern void hl_matrix_csc_mul_dense(hl_sparse_matrix_s A_d, extern void hl_matrix_csc_mul_dense(hl_sparse_matrix_s A_d,
hl_trans_op_t transa, hl_trans_op_t transa,
real *B_d, hl_trans_op_t transb, real *B_d,
hl_trans_op_t transb,
real *C_d, real *C_d,
int dimM, int dimN, int dimK, int dimM,
real alpha, real beta); int dimN,
int dimK,
real alpha,
real beta);
/** /**
* @brief C_d = alpha*(op(A_d) * op(B_d)) + beta*C_d. * @brief C_d = alpha*(op(A_d) * op(B_d)) + beta*C_d.
...@@ -311,11 +314,16 @@ extern void hl_matrix_dense_mul_csc(real *A_d, ...@@ -311,11 +314,16 @@ extern void hl_matrix_dense_mul_csc(real *A_d,
* @note transb is not support HPPL_OP_T. * @note transb is not support HPPL_OP_T.
* *
*/ */
extern void hl_sparse_matrix_mul(real* A_d, hl_trans_op_t transa, extern void hl_sparse_matrix_mul(real *A_d,
real *B_d, hl_trans_op_t transb, hl_trans_op_t transa,
real *B_d,
hl_trans_op_t transb,
hl_sparse_matrix_s C_d, hl_sparse_matrix_s C_d,
int dimM, int dimN, int dimK, int dimM,
real alpha, real beta); int dimN,
int dimK,
real alpha,
real beta);
/** /**
* @brief C_d = alpha*(op(A_d) * op(B_d)) + beta*C_d * @brief C_d = alpha*(op(A_d) * op(B_d)) + beta*C_d
...@@ -336,12 +344,16 @@ extern void hl_sparse_matrix_mul(real* A_d, hl_trans_op_t transa, ...@@ -336,12 +344,16 @@ extern void hl_sparse_matrix_mul(real* A_d, hl_trans_op_t transa,
* @note transa is not support HPPL_OP_T. * @note transa is not support HPPL_OP_T.
* *
*/ */
extern void hl_matrix_dense_mul_csr(real *A_d, hl_trans_op_t transa, extern void hl_matrix_dense_mul_csr(real *A_d,
hl_trans_op_t transa,
hl_sparse_matrix_s B_d, hl_sparse_matrix_s B_d,
hl_trans_op_t transb, hl_trans_op_t transb,
real *C_d, real *C_d,
int dimM, int dimN, int dimK, int dimM,
real alpha, real beta); int dimN,
int dimK,
real alpha,
real beta);
/** /**
* @brief Memcpy csc_matrix to host. * @brief Memcpy csc_matrix to host.
...@@ -412,7 +424,6 @@ extern void hl_memcpy_from_csr_matrix(real *csr_val, ...@@ -412,7 +424,6 @@ extern void hl_memcpy_from_csr_matrix(real *csr_val,
hl_sparse_matrix_s csr_matrix, hl_sparse_matrix_s csr_matrix,
hl_stream_t stream); hl_stream_t stream);
/** /**
* @brief A_d[j] += B_d[i,j] for i in range(height) * @brief A_d[j] += B_d[i,j] for i in range(height)
* *
...@@ -423,19 +434,13 @@ extern void hl_memcpy_from_csr_matrix(real *csr_val, ...@@ -423,19 +434,13 @@ extern void hl_memcpy_from_csr_matrix(real *csr_val,
* @param[in] scale scale of B_d * @param[in] scale scale of B_d
* *
*/ */
extern void hl_sparse_matrix_column_sum(real* A_d, extern void hl_sparse_matrix_column_sum(
hl_sparse_matrix_s B_d, real *A_d, hl_sparse_matrix_s B_d, int dimM, int dimN, real scale);
int dimM,
int dimN,
real scale);
/** /**
* @brief implementation of csr sparse matrix in hl_sparse_matirx_column_sum * @brief implementation of csr sparse matrix in hl_sparse_matirx_column_sum
*/ */
extern void hl_matrix_csr_column_sum(real* A_d, extern void hl_matrix_csr_column_sum(
hl_sparse_matrix_s B_d, real *A_d, hl_sparse_matrix_s B_d, int dimM, int dimN, real scale);
int dimM,
int dimN,
real scale);
/** /**
* @brief A_d[i,j] += B_d[j] * @brief A_d[i,j] += B_d[j]
...@@ -446,13 +451,13 @@ extern void hl_matrix_csr_column_sum(real* A_d, ...@@ -446,13 +451,13 @@ extern void hl_matrix_csr_column_sum(real* A_d,
* *
*/ */
extern void hl_sparse_matrix_add_bias(hl_sparse_matrix_s A_d, extern void hl_sparse_matrix_add_bias(hl_sparse_matrix_s A_d,
real* B_d, real *B_d,
real scale); real scale);
/** /**
* @brief implementation of csr sparse matrix in hl_sparse_matrix_add_bias * @brief implementation of csr sparse matrix in hl_sparse_matrix_add_bias
*/ */
extern void hl_matrix_csr_add_bias(hl_sparse_matrix_s A_d, extern void hl_matrix_csr_add_bias(hl_sparse_matrix_s A_d,
real* B_d, real *B_d,
real scale); real scale);
/** /**
...@@ -470,7 +475,7 @@ extern void hl_matrix_csr_add_bias(hl_sparse_matrix_s A_d, ...@@ -470,7 +475,7 @@ extern void hl_matrix_csr_add_bias(hl_sparse_matrix_s A_d,
* *
*/ */
extern void hl_sparse_matrix_add_dense(hl_sparse_matrix_s A_d, extern void hl_sparse_matrix_add_dense(hl_sparse_matrix_s A_d,
real* B_d, real *B_d,
int dimM, int dimM,
int dimN, int dimN,
real alpha, real alpha,
...@@ -479,7 +484,7 @@ extern void hl_sparse_matrix_add_dense(hl_sparse_matrix_s A_d, ...@@ -479,7 +484,7 @@ extern void hl_sparse_matrix_add_dense(hl_sparse_matrix_s A_d,
* @brief implementation of csr sparse matrix in hl_sparse_matrix_add_dense * @brief implementation of csr sparse matrix in hl_sparse_matrix_add_dense
*/ */
extern void hl_matrix_csr_add_dense(hl_sparse_matrix_s A_d, extern void hl_matrix_csr_add_dense(hl_sparse_matrix_s A_d,
real* B_d, real *B_d,
int dimM, int dimM,
int dimN, int dimN,
real alpha, real alpha,
...@@ -493,7 +498,7 @@ extern void hl_matrix_csr_add_dense(hl_sparse_matrix_s A_d, ...@@ -493,7 +498,7 @@ extern void hl_matrix_csr_add_dense(hl_sparse_matrix_s A_d,
* @return return rows pointer, which is gpu address * @return return rows pointer, which is gpu address
* *
*/ */
extern int* hl_sparse_matrix_get_rows(hl_sparse_matrix_s sMat); extern int *hl_sparse_matrix_get_rows(hl_sparse_matrix_s sMat);
/** /**
* @brief get cols pionter of GpuSparseMatrix * @brief get cols pionter of GpuSparseMatrix
...@@ -503,7 +508,7 @@ extern int* hl_sparse_matrix_get_rows(hl_sparse_matrix_s sMat); ...@@ -503,7 +508,7 @@ extern int* hl_sparse_matrix_get_rows(hl_sparse_matrix_s sMat);
* @return return cols pointer, which is gpu address * @return return cols pointer, which is gpu address
* *
*/ */
extern int* hl_sparse_matrix_get_cols(hl_sparse_matrix_s sMat); extern int *hl_sparse_matrix_get_cols(hl_sparse_matrix_s sMat);
/** /**
* @brief get value pionter of GpuSparseMatrix * @brief get value pionter of GpuSparseMatrix
...@@ -513,7 +518,6 @@ extern int* hl_sparse_matrix_get_cols(hl_sparse_matrix_s sMat); ...@@ -513,7 +518,6 @@ extern int* hl_sparse_matrix_get_cols(hl_sparse_matrix_s sMat);
* @return return value pointer, which is gpu address * @return return value pointer, which is gpu address
* *
*/ */
extern real* hl_sparse_matrix_get_value(hl_sparse_matrix_s sMat); extern real *hl_sparse_matrix_get_value(hl_sparse_matrix_s sMat);
#endif /* HL_SPARSE_H_ */ #endif /* HL_SPARSE_H_ */
paddle/cuda/include/hl_table_apply.h
浏览文件 @ 2a21d8b3
...@@ -12,7 +12,6 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ...@@ -12,7 +12,6 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and See the License for the specific language governing permissions and
limitations under the License. */ limitations under the License. */
#ifndef HL_TABLE_APPLY_H_ #ifndef HL_TABLE_APPLY_H_
#define HL_TABLE_APPLY_H_ #define HL_TABLE_APPLY_H_
...@@ -31,8 +30,10 @@ limitations under the License. */ ...@@ -31,8 +30,10 @@ limitations under the License. */
* @param[in] dim width of table. * @param[in] dim width of table.
* *
*/ */
extern void hl_matrix_select_rows(real* output, int ldo, extern void hl_matrix_select_rows(real* output,
real* table, int ldt, int ldo,
real* table,
int ldt,
int* ids, int* ids,
int numSamples, int numSamples,
int tableSize, int tableSize,
...@@ -53,8 +54,10 @@ extern void hl_matrix_select_rows(real* output, int ldo, ...@@ -53,8 +54,10 @@ extern void hl_matrix_select_rows(real* output, int ldo,
* @param[in] dim width of table. * @param[in] dim width of table.
* *
*/ */
extern void hl_matrix_add_to_rows(real* table, int ldt, extern void hl_matrix_add_to_rows(real* table,
real* input, int ldi, int ldt,
real* input,
int ldi,
int* ids, int* ids,
int numSamples, int numSamples,
int tableSize, int tableSize,
...@@ -72,8 +75,7 @@ extern void hl_matrix_add_to_rows(real* table, int ldt, ...@@ -72,8 +75,7 @@ extern void hl_matrix_add_to_rows(real* table, int ldt,
* *
*/ */
template <class T> template <class T>
extern void hl_vector_select_from(T* dst, int sized, extern void hl_vector_select_from(
const T* src, int sizes, T* dst, int sized, const T* src, int sizes, const int* ids, int sizei);
const int* ids, int sizei);
#endif /* HL_TABLE_APPLY_H_ */ #endif /* HL_TABLE_APPLY_H_ */
paddle/cuda/include/hl_time.h
浏览文件 @ 2a21d8b3
...@@ -12,7 +12,6 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ...@@ -12,7 +12,6 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and See the License for the specific language governing permissions and
limitations under the License. */ limitations under the License. */
#ifndef HL_TIME_H_ #ifndef HL_TIME_H_
#define HL_TIME_H_ #define HL_TIME_H_
......
paddle/cuda/include/hl_top_k.h
浏览文件 @ 2a21d8b3
...@@ -12,7 +12,6 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ...@@ -12,7 +12,6 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and See the License for the specific language governing permissions and
limitations under the License. */ limitations under the License. */
#ifndef HL_TOP_K_H_ #ifndef HL_TOP_K_H_
#define HL_TOP_K_H_ #define HL_TOP_K_H_
...@@ -31,9 +30,11 @@ limitations under the License. */ ...@@ -31,9 +30,11 @@ limitations under the License. */
* @param[in] numSamples height of input value. * @param[in] numSamples height of input value.
* *
*/ */
extern void hl_matrix_top_k(real* topVal, int ldv, extern void hl_matrix_top_k(real* topVal,
int * topIds, int ldv,
real* src, int lds, int* topIds,
real* src,
int lds,
int dim, int dim,
int beamSize, int beamSize,
int numSamples); int numSamples);
...@@ -50,8 +51,9 @@ extern void hl_matrix_top_k(real* topVal, int ldv, ...@@ -50,8 +51,9 @@ extern void hl_matrix_top_k(real* topVal, int ldv,
* *
* @note Only support HL_SPARSE_CSR format. * @note Only support HL_SPARSE_CSR format.
*/ */
extern void hl_sparse_matrix_top_k(real* topVal, int ldv, extern void hl_sparse_matrix_top_k(real* topVal,
int * topIds, int ldv,
int* topIds,
hl_sparse_matrix_s src, hl_sparse_matrix_s src,
int beamSize, int beamSize,
int numSamples); int numSamples);
......
paddle/cuda/include/stub/hl_aggregate_stub.h
浏览文件 @ 2a21d8b3
...@@ -12,29 +12,22 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ...@@ -12,29 +12,22 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and See the License for the specific language governing permissions and
limitations under the License. */ limitations under the License. */
#ifndef HL_AGGREGATE_STUB_H_ #ifndef HL_AGGREGATE_STUB_H_
#define HL_AGGREGATE_STUB_H_ #define HL_AGGREGATE_STUB_H_
#include "hl_aggregate.h" #include "hl_aggregate.h"
inline void hl_matrix_row_sum(real *A_d, real *C_d, inline void hl_matrix_row_sum(real *A_d, real *C_d, int dimM, int dimN) {}
int dimM, int dimN) {}
inline void hl_matrix_row_max(real *A_d, real *C_d, inline void hl_matrix_row_max(real *A_d, real *C_d, int dimM, int dimN) {}
int dimM, int dimN) {}
inline void hl_matrix_row_min(real *A_d, real *C_d, inline void hl_matrix_row_min(real *A_d, real *C_d, int dimM, int dimN) {}
int dimM, int dimN) {}
inline void hl_matrix_column_sum(real *A_d, real *C_d, inline void hl_matrix_column_sum(real *A_d, real *C_d, int dimM, int dimN) {}
int dimM, int dimN) {}
inline void hl_matrix_column_max(real *A_d, real *C_d, inline void hl_matrix_column_max(real *A_d, real *C_d, int dimM, int dimN) {}
int dimM, int dimN) {}
inline void hl_matrix_column_min(real *A_d, real *C_d, inline void hl_matrix_column_min(real *A_d, real *C_d, int dimM, int dimN) {}
int dimM, int dimN) {}
inline void hl_vector_sum(real *A_d, real *C_h, int dimM) {} inline void hl_vector_sum(real *A_d, real *C_h, int dimM) {}
......
paddle/cuda/include/stub/hl_cnn_stub.h
浏览文件 @ 2a21d8b3
...@@ -12,84 +12,134 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ...@@ -12,84 +12,134 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and See the License for the specific language governing permissions and
limitations under the License. */ limitations under the License. */
#ifndef HL_CNN_STUB_H_ #ifndef HL_CNN_STUB_H_
#define HL_CNN_STUB_H_ #define HL_CNN_STUB_H_
#include "hl_cnn.h" #include "hl_cnn.h"
inline void hl_shrink_col2feature( inline void hl_shrink_col2feature(const real* dataCol,
const real * dataCol, size_t channels, size_t channels,
size_t height, size_t width, size_t height,
size_t blockH, size_t blockW, size_t width,
size_t strideH, size_t strideW, size_t blockH,
size_t paddingH, size_t paddingW, size_t blockW,
size_t outputH, size_t outputW, size_t strideH,
size_t strideW,
size_t paddingH,
size_t paddingW,
size_t outputH,
size_t outputW,
real* dataIm, real* dataIm,
real alpha, real beta) {} real alpha,
real beta) {}
inline void hl_expand_feature2col(
const real* dataIm, size_t channels, inline void hl_expand_feature2col(const real* dataIm,
size_t height, size_t width, size_t channels,
size_t blockH, size_t blockW, size_t height,
size_t strideH, size_t strideW, size_t width,
size_t paddingH, size_t paddingW, size_t blockH,
size_t outputH, size_t outputW, size_t blockW,
size_t strideH,
size_t strideW,
size_t paddingH,
size_t paddingW,
size_t outputH,
size_t outputW,
real* dataCol) {} real* dataCol) {}
inline void hl_maxpool_forward( inline void hl_maxpool_forward(const int frameCnt,
const int frameCnt, const real* inputData, const real* inputData,
const int channels, const int channels,
const int height, const int width, const int height,
const int pooledH, const int pooledW,
const int sizeX, const int sizeY,
const int strideH, const int strideW,
const int paddingH, const int paddingW,
real* tgtData, const int tgtStride) {}
inline void hl_maxpool_backward(
const int frameCnt, const real* inputData,
const real* outData, const real* outGrad,
const int channels, const int height,
const int width, const int width,
const int pooledH, const int pooledW, const int pooledH,
const int sizeX, const int sizeY, const int pooledW,
const int strideH, const int strideW, const int sizeX,
const int paddingH, const int paddingW, const int sizeY,
real scaleA, real scaleB, const int strideH,
real* targetGrad, const int outStride) {} const int strideW,
const int paddingH,
inline void hl_avgpool_forward( const int paddingW,
const int frameCnt, const real* inputData, real* tgtData,
const int tgtStride) {}
inline void hl_maxpool_backward(const int frameCnt,
const real* inputData,
const real* outData,
const real* outGrad,
const int channels, const int channels,
const int height, const int width, const int height,
const int pooledH, const int pooledW,
const int sizeX, const int sizeY,
const int strideH, const int strideW,
const int paddingH, const int paddingW,
real* tgtData, const int tgtStride) {}
inline void hl_avgpool_backward(
const int frameCnt, const real* outGrad,
const int channels, const int height,
const int width, const int width,
const int pooledH, const int pooledW, const int pooledH,
const int sizeX, const int sizeY, const int pooledW,
const int strideH, const int strideW, const int sizeX,
int paddingH, int paddingW, const int sizeY,
real scaleA, real scaleB, const int strideH,
real* backGrad, const int outStride) {} const int strideW,
const int paddingH,
inline void hl_CMRNorm_forward( const int paddingW,
size_t frameCnt, const real* in, real* scale, real* out, real scaleA,
size_t channels, size_t height, size_t width, size_t sizeX, real scaleB,
real alpha, real beta) {} real* targetGrad,
const int outStride) {}
inline void hl_CMRNorm_backward(
size_t frameCnt, const real* inV, const real* scale, inline void hl_avgpool_forward(const int frameCnt,
const real* outV, const real* outDiff, real *inDiff, const real* inputData,
size_t channels, size_t height, size_t width, size_t sizeX, const int channels,
real alpha, real beta) {} const int height,
const int width,
const int pooledH,
const int pooledW,
const int sizeX,
const int sizeY,
const int strideH,
const int strideW,
const int paddingH,
const int paddingW,
real* tgtData,
const int tgtStride) {}
inline void hl_avgpool_backward(const int frameCnt,
const real* outGrad,
const int channels,
const int height,
const int width,
const int pooledH,
const int pooledW,
const int sizeX,
const int sizeY,
const int strideH,
const int strideW,
int paddingH,
int paddingW,
real scaleA,
real scaleB,
real* backGrad,
const int outStride) {}
inline void hl_CMRNorm_forward(size_t frameCnt,
const real* in,
real* scale,
real* out,
size_t channels,
size_t height,
size_t width,
size_t sizeX,
real alpha,
real beta) {}
inline void hl_CMRNorm_backward(size_t frameCnt,
const real* inV,
const real* scale,
const real* outV,
const real* outDiff,
real* inDiff,
size_t channels,
size_t height,
size_t width,
size_t sizeX,
real alpha,
real beta) {}
inline void hl_bilinear_forward(const real* inData, inline void hl_bilinear_forward(const real* inData,
const size_t inImgH, const size_t inImgH,
...@@ -119,12 +169,20 @@ inline void hl_bilinear_backward(real* inGrad, ...@@ -119,12 +169,20 @@ inline void hl_bilinear_backward(real* inGrad,
const real ratioH, const real ratioH,
const real ratioW) {} const real ratioW) {}
inline void hl_maxout_forward( inline void hl_maxout_forward(const real* inData,
const real* inData, real* outData, int* idData, real* outData,
size_t batchSize, size_t size, size_t featLen, size_t group) {} int* idData,
size_t batchSize,
size_t size,
size_t featLen,
size_t group) {}
inline void hl_maxout_backward( inline void hl_maxout_backward(real* inGrad,
real* inGrad, const real* outGrad, const int* idData, const real* outGrad,
size_t batchSize, size_t size, size_t featLen, size_t group) {} const int* idData,
size_t batchSize,
size_t size,
size_t featLen,
size_t group) {}
#endif // HL_CNN_STUB_H_ #endif // HL_CNN_STUB_H_
paddle/cuda/include/stub/hl_cuda_cublas_stub.h
浏览文件 @ 2a21d8b3
...@@ -12,41 +12,42 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ...@@ -12,41 +12,42 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and See the License for the specific language governing permissions and
limitations under the License. */ limitations under the License. */
#ifndef HL_CUDA_CUBLAS_STUB_H_ #ifndef HL_CUDA_CUBLAS_STUB_H_
#define HL_CUDA_CUBLAS_STUB_H_ #define HL_CUDA_CUBLAS_STUB_H_
#include "hl_cuda_cublas.h" #include "hl_cuda_cublas.h"
inline void hl_matrix_transpose(real *A_d, inline void hl_matrix_transpose(
real *A_d, real *C_d, int dimM, int dimN, int lda, int ldc) {}
inline void hl_matrix_transpose(real *A_d, real *C_d, int dimM, int dimN) {}
inline void hl_matrix_inverse(
real *A_d, real *C_d, int dimN, int lda, int ldc) {}
inline void hl_matrix_mul(real *A_d,
hl_trans_op_t transa,
real *B_d,
hl_trans_op_t transb,
real *C_d, real *C_d,
int dimM, int dimM,
int dimN, int dimN,
int dimK,
real alpha,
real beta,
int lda, int lda,
int ldb,
int ldc) {} int ldc) {}
inline void hl_matrix_transpose(real *A_d, inline void hl_matrix_mul(real *A_d,
hl_trans_op_t transa,
real *B_d,
hl_trans_op_t transb,
real *C_d, real *C_d,
int dimM, int dimM,
int dimN) {}
inline void hl_matrix_inverse(real *A_d,
real *C_d,
int dimN, int dimN,
int lda, int dimK,
int ldc) {} real alpha,
real beta) {}
inline void hl_matrix_mul(real *A_d, hl_trans_op_t transa,
real *B_d, hl_trans_op_t transb,
real *C_d,
int dimM, int dimN, int dimK,
real alpha, real beta,
int lda, int ldb, int ldc) {}
inline void hl_matrix_mul(real *A_d, hl_trans_op_t transa,
real *B_d, hl_trans_op_t transb,
real *C_d,
int dimM, int dimN, int dimK,
real alpha, real beta) {}
#endif // HL_CUDA_CUBLAS_STUB_H_ #endif // HL_CUDA_CUBLAS_STUB_H_
paddle/cuda/include/stub/hl_cuda_cudnn_stub.h
浏览文件 @ 2a21d8b3
...@@ -12,15 +12,12 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ...@@ -12,15 +12,12 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and See the License for the specific language governing permissions and
limitations under the License. */ limitations under the License. */
#ifndef HL_CUDA_CUDNN_STUB_H_ #ifndef HL_CUDA_CUDNN_STUB_H_
#define HL_CUDA_CUDNN_STUB_H_ #define HL_CUDA_CUDNN_STUB_H_
#include "hl_cuda_cudnn.h" #include "hl_cuda_cudnn.h"
inline int hl_get_cudnn_lib_version() { inline int hl_get_cudnn_lib_version() { return 0; }
return 0;
}
inline void hl_create_tensor_descriptor(hl_tensor_descriptor* image_desc) {} inline void hl_create_tensor_descriptor(hl_tensor_descriptor* image_desc) {}
...@@ -120,8 +117,7 @@ inline void hl_convolution_forward_add_bias(hl_tensor_descriptor bias, ...@@ -120,8 +117,7 @@ inline void hl_convolution_forward_add_bias(hl_tensor_descriptor bias,
hl_tensor_descriptor output, hl_tensor_descriptor output,
real* output_data) {} real* output_data) {}
inline void hl_convolution_backward_filter( inline void hl_convolution_backward_filter(hl_tensor_descriptor input,
hl_tensor_descriptor input,
real* input_data, real* input_data,
hl_tensor_descriptor output, hl_tensor_descriptor output,
real* output_grad_data, real* output_grad_data,
...@@ -132,8 +128,7 @@ inline void hl_convolution_backward_filter( ...@@ -132,8 +128,7 @@ inline void hl_convolution_backward_filter(
size_t sizeInBytes, size_t sizeInBytes,
int convBwdFilterAlgo) {} int convBwdFilterAlgo) {}
inline void hl_convolution_backward_data( inline void hl_convolution_backward_data(hl_tensor_descriptor input,
hl_tensor_descriptor input,
real* input_data_grad, real* input_data_grad,
hl_tensor_descriptor output, hl_tensor_descriptor output,
real* output_grad_data, real* output_grad_data,
...@@ -149,53 +144,53 @@ inline void hl_convolution_backward_bias(hl_tensor_descriptor bias, ...@@ -149,53 +144,53 @@ inline void hl_convolution_backward_bias(hl_tensor_descriptor bias,
hl_tensor_descriptor output, hl_tensor_descriptor output,
real* output_grad_data) {} real* output_grad_data) {}
inline void hl_softmax_forward(real *input, inline void hl_softmax_forward(real* input,
real *output, real* output,
int height, int height,
int width) {} int width) {}
inline void hl_softmax_backward(real *output_value, inline void hl_softmax_backward(real* output_value,
real *output_grad, real* output_grad,
int height, int height,
int width) {} int width) {}
inline void hl_batch_norm_forward_training(hl_tensor_descriptor inputDesc, inline void hl_batch_norm_forward_training(hl_tensor_descriptor inputDesc,
real *input, real* input,
hl_tensor_descriptor outputDesc, hl_tensor_descriptor outputDesc,
real *output, real* output,
hl_tensor_descriptor bnParamDesc, hl_tensor_descriptor bnParamDesc,
real *scale, real* scale,
real *bias, real* bias,
double factor, double factor,
real *runningMean, real* runningMean,
real *runningInvVar, real* runningInvVar,
double epsilon, double epsilon,
real *savedMean, real* savedMean,
real *savedVar) {} real* savedVar) {}
inline void hl_batch_norm_forward_inference(hl_tensor_descriptor inputDesc, inline void hl_batch_norm_forward_inference(hl_tensor_descriptor inputDesc,
real *input, real* input,
hl_tensor_descriptor outputDesc, hl_tensor_descriptor outputDesc,
real *output, real* output,
hl_tensor_descriptor bnParamDesc, hl_tensor_descriptor bnParamDesc,
real *scale, real* scale,
real *bias, real* bias,
real *estimatedMean, real* estimatedMean,
real *estimatedVar, real* estimatedVar,
double epsilon) {} double epsilon) {}
inline void hl_batch_norm_backward(hl_tensor_descriptor inputDesc, inline void hl_batch_norm_backward(hl_tensor_descriptor inputDesc,
real *input, real* input,
hl_tensor_descriptor outGradDesc, hl_tensor_descriptor outGradDesc,
real *outGrad, real* outGrad,
hl_tensor_descriptor inGradDesc, hl_tensor_descriptor inGradDesc,
real *inGrad, real* inGrad,
hl_tensor_descriptor dBnParamDesc, hl_tensor_descriptor dBnParamDesc,
real *scale, real* scale,
real *scaleGrad, real* scaleGrad,
real *biasGrad, real* biasGrad,
double epsilon, double epsilon,
real *savedMean, real* savedMean,
real *savedInvVar) {} real* savedInvVar) {}
#endif // HL_CUDA_CUDNN_STUB_H_ #endif // HL_CUDA_CUDNN_STUB_H_
paddle/cuda/include/stub/hl_cuda_stub.h
浏览文件 @ 2a21d8b3
...@@ -12,7 +12,6 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ...@@ -12,7 +12,6 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and See the License for the specific language governing permissions and
limitations under the License. */ limitations under the License. */
#ifndef HL_CUDA_STUB_H_ #ifndef HL_CUDA_STUB_H_
#define HL_CUDA_STUB_H_ #define HL_CUDA_STUB_H_
...@@ -24,17 +23,13 @@ inline void hl_specify_devices_start(int *device, int number) {} ...@@ -24,17 +23,13 @@ inline void hl_specify_devices_start(int *device, int number) {}
inline void hl_init(int device) {} inline void hl_init(int device) {}
inline int hl_get_cuda_lib_version(int device) { inline int hl_get_cuda_lib_version(int device) { return 0; }
return 0;
}
inline void hl_fini() {} inline void hl_fini() {}
inline void hl_set_sync_flag(bool flag) {} inline void hl_set_sync_flag(bool flag) {}
inline bool hl_get_sync_flag() { inline bool hl_get_sync_flag() { return false; }
return false;
}
inline int hl_get_device_count() { return 0; } inline int hl_get_device_count() { return 0; }
...@@ -42,11 +37,11 @@ inline void hl_set_device(int device) {} ...@@ -42,11 +37,11 @@ inline void hl_set_device(int device) {}
inline int hl_get_device() { return 0; } inline int hl_get_device() { return 0; }
inline void* hl_malloc_device(size_t size) { return NULL; } inline void *hl_malloc_device(size_t size) { return NULL; }
inline void hl_free_mem_device(void *dest_d) {} inline void hl_free_mem_device(void *dest_d) {}
inline void* hl_malloc_host(size_t size) { return NULL; } inline void *hl_malloc_host(size_t size) { return NULL; }
inline void hl_free_mem_host(void *dest_h) {} inline void hl_free_mem_host(void *dest_h) {}
...@@ -64,7 +59,9 @@ inline void hl_rand(real *dest_d, size_t num) {} ...@@ -64,7 +59,9 @@ inline void hl_rand(real *dest_d, size_t num) {}
inline void hl_srand(unsigned int seed) {} inline void hl_srand(unsigned int seed) {}
inline void hl_memcpy_async(void *dst, void *src, size_t size, inline void hl_memcpy_async(void *dst,
void *src,
size_t size,
hl_stream_t stream) {} hl_stream_t stream) {}
inline void hl_stream_synchronize(hl_stream_t stream) {} inline void hl_stream_synchronize(hl_stream_t stream) {}
...@@ -85,9 +82,9 @@ inline void hl_event_synchronize(hl_event_t event) {} ...@@ -85,9 +82,9 @@ inline void hl_event_synchronize(hl_event_t event) {}
inline int hl_get_device_last_error() { return 0; } inline int hl_get_device_last_error() { return 0; }
inline const char* hl_get_device_error_string() { return NULL; } inline const char *hl_get_device_error_string() { return NULL; }
inline const char* hl_get_device_error_string(size_t err) { return NULL; } inline const char *hl_get_device_error_string(size_t err) { return NULL; }
inline bool hl_cuda_event_is_ready(hl_event_t event) { return true; } inline bool hl_cuda_event_is_ready(hl_event_t event) { return true; }
......
paddle/cuda/include/stub/hl_lstm_stub.h
浏览文件 @ 2a21d8b3
...@@ -12,7 +12,6 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ...@@ -12,7 +12,6 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and See the License for the specific language governing permissions and
limitations under the License. */ limitations under the License. */
#ifndef HL_LSTM_STUB_H_ #ifndef HL_LSTM_STUB_H_
#define HL_LSTM_STUB_H_ #define HL_LSTM_STUB_H_
......
paddle/cuda/include/stub/hl_matrix_stub.h
浏览文件 @ 2a21d8b3
...@@ -12,7 +12,6 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ...@@ -12,7 +12,6 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and See the License for the specific language governing permissions and
limitations under the License. */ limitations under the License. */
#ifndef HL_MATRIX_STUB_H_ #ifndef HL_MATRIX_STUB_H_
#define HL_MATRIX_STUB_H_ #define HL_MATRIX_STUB_H_
...@@ -26,48 +25,30 @@ inline void hl_matrix_add(real* A_d, ...@@ -26,48 +25,30 @@ inline void hl_matrix_add(real* A_d,
real alpha, real alpha,
real beta) {} real beta) {}
inline void hl_matrix_softmax(real *A_d, real *C_d, int dimM, int dimN) {} inline void hl_matrix_softmax(real* A_d, real* C_d, int dimM, int dimN) {}
inline void hl_sequence_softmax_forward(real *A_d, inline void hl_sequence_softmax_forward(real* A_d,
real *C_d, real* C_d,
const int* index, const int* index,
int numSequence) {} int numSequence) {}
inline void hl_matrix_softmax_derivative(real* grad_d, inline void hl_matrix_softmax_derivative(
real* output_d, real* grad_d, real* output_d, real* sftmaxSum_d, int dimM, int dimN) {}
real* sftmaxSum_d,
int dimM,
int dimN) {}
inline void hl_matrix_classification_error(real* A_d, inline void hl_matrix_classification_error(
int* B_d, real* A_d, int* B_d, real* C_d, int dimM, int dimN) {}
real* C_d,
int dimM,
int dimN) {}
inline void hl_matrix_cross_entropy(real* A_d, inline void hl_matrix_cross_entropy(
real* C_d, real* A_d, real* C_d, int* label_d, int dimM, int dimN) {}
int* label_d,
int dimM,
int dimN) {}
inline void hl_matrix_cross_entropy_bp(real* grad_d, inline void hl_matrix_cross_entropy_bp(
real* output_d, real* grad_d, real* output_d, int* label_d, int dimM, int dimN) {}
int* label_d,
int dimM,
int dimN) {}
inline void hl_matrix_multi_binary_cross_entropy(real* output, inline void hl_matrix_multi_binary_cross_entropy(
real* entropy, real* output, real* entropy, hl_sparse_matrix_s mat, int dimM, int dimN) {}
hl_sparse_matrix_s mat,
int dimM,
int dimN) {}
inline void hl_matrix_multi_binary_cross_entropy_bp(real* output, inline void hl_matrix_multi_binary_cross_entropy_bp(
real* grad, real* output, real* grad, hl_sparse_matrix_s mat, int dimM, int dimN) {}
hl_sparse_matrix_s mat,
int dimM,
int dimN) {}
inline void hl_matrix_zero_mem(real* data, int num) {} inline void hl_matrix_zero_mem(real* data, int num) {}
...@@ -101,7 +82,6 @@ inline void hl_cossim(real* output, ...@@ -101,7 +82,6 @@ inline void hl_cossim(real* output,
int input2_height, int input2_height,
real scale) {} real scale) {}
inline void hl_cossim_derivative(real* grad, inline void hl_cossim_derivative(real* grad,
real* output, real* output,
real* prevOutX, real* prevOutX,
......
paddle/cuda/include/stub/hl_sequence_stub.h
浏览文件 @ 2a21d8b3
...@@ -12,7 +12,6 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ...@@ -12,7 +12,6 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and See the License for the specific language governing permissions and
limitations under the License. */ limitations under the License. */
#ifndef HL_SEQUENCE_STUB_H_ #ifndef HL_SEQUENCE_STUB_H_
#define HL_SEQUENCE_STUB_H_ #define HL_SEQUENCE_STUB_H_
...@@ -21,15 +20,12 @@ limitations under the License. */ ...@@ -21,15 +20,12 @@ limitations under the License. */
inline void hl_max_sequence_forward(real* input, inline void hl_max_sequence_forward(real* input,
const int* sequence, const int* sequence,
real* output, real* output,
int *index, int* index,
int numSequences, int numSequences,
int dim) {} int dim) {}
inline void hl_max_sequence_backward(real* outputGrad, inline void hl_max_sequence_backward(
int *index, real* outputGrad, int* index, real* inputGrad, int numSequences, int dim) {}
real* inputGrad,
int numSequences,
int dim) {}
inline void hl_context_projection_forward(real* input, inline void hl_context_projection_forward(real* input,
const int* sequence, const int* sequence,
...@@ -60,16 +56,16 @@ inline void hl_context_projection_backward_weight(real* outputGrad, ...@@ -60,16 +56,16 @@ inline void hl_context_projection_backward_weight(real* outputGrad,
int contextStart, int contextStart,
int beginPad) {} int beginPad) {}
inline void hl_sequence2batch_copy(real *batch, inline void hl_sequence2batch_copy(real* batch,
real *sequence, real* sequence,
const int *batchIndex, const int* batchIndex,
int seqWidth, int seqWidth,
int batchCount, int batchCount,
bool seq2batch) {} bool seq2batch) {}
inline void hl_sequence2batch_add(real *batch, inline void hl_sequence2batch_add(real* batch,
real *sequence, real* sequence,
int *batchIndex, int* batchIndex,
int seqWidth, int seqWidth,
int batchCount, int batchCount,
bool seq2batch) {} bool seq2batch) {}
......
paddle/cuda/include/stub/hl_sparse_stub.h
浏览文件 @ 2a21d8b3
...@@ -12,7 +12,6 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ...@@ -12,7 +12,6 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and See the License for the specific language governing permissions and
limitations under the License. */ limitations under the License. */
#ifndef HL_SPARSE_STUB_H_ #ifndef HL_SPARSE_STUB_H_
#define HL_SPARSE_STUB_H_ #define HL_SPARSE_STUB_H_
...@@ -28,7 +27,7 @@ inline void hl_malloc_sparse_matrix(hl_sparse_matrix_s *A_d, ...@@ -28,7 +27,7 @@ inline void hl_malloc_sparse_matrix(hl_sparse_matrix_s *A_d,
inline void hl_free_sparse_matrix(hl_sparse_matrix_s A_d) {} inline void hl_free_sparse_matrix(hl_sparse_matrix_s A_d) {}
inline void hl_construct_sparse_matrix(hl_sparse_matrix_s *A_d, inline void hl_construct_sparse_matrix(hl_sparse_matrix_s *A_d,
void * dest_d, void *dest_d,
size_t size, size_t size,
hl_matrix_format_t format, hl_matrix_format_t format,
hl_matrix_value_t value_type, hl_matrix_value_t value_type,
...@@ -37,9 +36,9 @@ inline void hl_construct_sparse_matrix(hl_sparse_matrix_s *A_d, ...@@ -37,9 +36,9 @@ inline void hl_construct_sparse_matrix(hl_sparse_matrix_s *A_d,
int nnz) {} int nnz) {}
inline void hl_construct_sparse_matrix(hl_sparse_matrix_s *A_d, inline void hl_construct_sparse_matrix(hl_sparse_matrix_s *A_d,
real* value_d, real *value_d,
int* rows_d, int *rows_d,
int* cols_d, int *cols_d,
hl_matrix_format_t format, hl_matrix_format_t format,
hl_matrix_value_t value_type, hl_matrix_value_t value_type,
int dimM, int dimM,
...@@ -87,10 +86,14 @@ inline void hl_matrix_csr_mul_dense(hl_sparse_matrix_s A_d, ...@@ -87,10 +86,14 @@ inline void hl_matrix_csr_mul_dense(hl_sparse_matrix_s A_d,
inline void hl_matrix_csc_mul_dense(hl_sparse_matrix_s A_d, inline void hl_matrix_csc_mul_dense(hl_sparse_matrix_s A_d,
hl_trans_op_t transa, hl_trans_op_t transa,
real *B_d, hl_trans_op_t transb, real *B_d,
hl_trans_op_t transb,
real *C_d, real *C_d,
int dimM, int dimN, int dimK, int dimM,
real alpha, real beta) {} int dimN,
int dimK,
real alpha,
real beta) {}
inline void hl_matrix_dense_mul_csc(real *A_d, inline void hl_matrix_dense_mul_csc(real *A_d,
hl_trans_op_t transa, hl_trans_op_t transa,
...@@ -103,18 +106,27 @@ inline void hl_matrix_dense_mul_csc(real *A_d, ...@@ -103,18 +106,27 @@ inline void hl_matrix_dense_mul_csc(real *A_d,
real alpha, real alpha,
real beta) {} real beta) {}
inline void hl_sparse_matrix_mul(real* A_d, hl_trans_op_t transa, inline void hl_sparse_matrix_mul(real *A_d,
real *B_d, hl_trans_op_t transb, hl_trans_op_t transa,
real *B_d,
hl_trans_op_t transb,
hl_sparse_matrix_s C_d, hl_sparse_matrix_s C_d,
int dimM, int dimN, int dimK, int dimM,
real alpha, real beta) {} int dimN,
int dimK,
real alpha,
real beta) {}
inline void hl_matrix_dense_mul_csr(real *A_d, hl_trans_op_t transa, inline void hl_matrix_dense_mul_csr(real *A_d,
hl_trans_op_t transa,
hl_sparse_matrix_s B_d, hl_sparse_matrix_s B_d,
hl_trans_op_t transb, hl_trans_op_t transb,
real *C_d, real *C_d,
int dimM, int dimN, int dimK, int dimM,
real alpha, real beta) {} int dimN,
int dimK,
real alpha,
real beta) {}
inline void hl_memcpy_from_csc_matrix(real *csc_val, inline void hl_memcpy_from_csc_matrix(real *csc_val,
size_t val_size, size_t val_size,
...@@ -134,49 +146,39 @@ inline void hl_memcpy_from_csr_matrix(real *csr_val, ...@@ -134,49 +146,39 @@ inline void hl_memcpy_from_csr_matrix(real *csr_val,
hl_sparse_matrix_s csr_matrix, hl_sparse_matrix_s csr_matrix,
hl_stream_t stream) {} hl_stream_t stream) {}
inline void hl_sparse_matrix_column_sum(real* A_d, inline void hl_sparse_matrix_column_sum(
hl_sparse_matrix_s B_d, real *A_d, hl_sparse_matrix_s B_d, int dimM, int dimN, real scale) {}
int dimM,
int dimN,
real scale) {}
inline void hl_matrix_csr_column_sum(real* A_d, inline void hl_matrix_csr_column_sum(
hl_sparse_matrix_s B_d, real *A_d, hl_sparse_matrix_s B_d, int dimM, int dimN, real scale) {}
int dimM,
int dimN,
real scale) {}
inline void hl_sparse_matrix_add_bias(hl_sparse_matrix_s A_d, inline void hl_sparse_matrix_add_bias(hl_sparse_matrix_s A_d,
real* B_d, real *B_d,
real scale) {} real scale) {}
inline void hl_matrix_csr_add_bias(hl_sparse_matrix_s A_d, inline void hl_matrix_csr_add_bias(hl_sparse_matrix_s A_d,
real* B_d, real *B_d,
real scale) {} real scale) {}
inline void hl_sparse_matrix_add_dense(hl_sparse_matrix_s A_d, inline void hl_sparse_matrix_add_dense(hl_sparse_matrix_s A_d,
real* B_d, real *B_d,
int dimM, int dimM,
int dimN, int dimN,
real alpha, real alpha,
real beta) {} real beta) {}
inline void hl_matrix_csr_add_dense(hl_sparse_matrix_s A_d, inline void hl_matrix_csr_add_dense(hl_sparse_matrix_s A_d,
real* B_d, real *B_d,
int dimM, int dimM,
int dimN, int dimN,
real alpha, real alpha,
real beta) {} real beta) {}
inline int* hl_sparse_matrix_get_rows(hl_sparse_matrix_s sMat) { inline int *hl_sparse_matrix_get_rows(hl_sparse_matrix_s sMat) { return NULL; }
return NULL;
}
inline int* hl_sparse_matrix_get_cols(hl_sparse_matrix_s sMat) { inline int *hl_sparse_matrix_get_cols(hl_sparse_matrix_s sMat) { return NULL; }
return NULL;
}
inline real* hl_sparse_matrix_get_value(hl_sparse_matrix_s sMat) { inline real *hl_sparse_matrix_get_value(hl_sparse_matrix_s sMat) {
return NULL; return NULL;
} }
......
paddle/cuda/src/avx_mathfun.h
浏览文件 @ 2a21d8b3
此差异已折叠。
paddle/cuda/src/hl_avx_functions.cc
浏览文件 @ 2a21d8b3
...@@ -12,20 +12,19 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ...@@ -12,20 +12,19 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and See the License for the specific language governing permissions and
limitations under the License. */ limitations under the License. */
#include <immintrin.h> #include <immintrin.h>
#include "hl_functions.h" #include "hl_functions.h"
namespace hppl { namespace hppl {
extern __m256 exp(__m256 a); extern __m256 exp(__m256 a);
__m256 relu(const __m256 a) { __m256 relu(const __m256 a) {
__m256 tmp = _mm256_set1_ps(0.0f); __m256 tmp = _mm256_set1_ps(0.0f);
return _mm256_max_ps(a, tmp); return _mm256_max_ps(a, tmp);
} }
__m256 sigmoid(const __m256 a) { __m256 sigmoid(const __m256 a) {
__m256 max = _mm256_set1_ps(SIGMOID_THRESHOLD_MAX); __m256 max = _mm256_set1_ps(SIGMOID_THRESHOLD_MAX);
__m256 min = _mm256_set1_ps(SIGMOID_THRESHOLD_MIN); __m256 min = _mm256_set1_ps(SIGMOID_THRESHOLD_MIN);
__m256 tmp = _mm256_max_ps(a, min); __m256 tmp = _mm256_max_ps(a, min);
...@@ -35,39 +34,36 @@ namespace hppl { ...@@ -35,39 +34,36 @@ namespace hppl {
tmp = _mm256_add_ps(_mm256_set1_ps(1.0f), tmp); tmp = _mm256_add_ps(_mm256_set1_ps(1.0f), tmp);
tmp = _mm256_div_ps(_mm256_set1_ps(1.0f), tmp); tmp = _mm256_div_ps(_mm256_set1_ps(1.0f), tmp);
return tmp; return tmp;
} }
__m256 tanh(const __m256 a) { __m256 tanh(const __m256 a) {
__m256 max = _mm256_set1_ps(EXP_MAX_INPUT); __m256 max = _mm256_set1_ps(EXP_MAX_INPUT);
__m256 tmp = _mm256_mul_ps(_mm256_set1_ps(-2.0f), a); __m256 tmp = _mm256_mul_ps(_mm256_set1_ps(-2.0f), a);
tmp = _mm256_min_ps(tmp, max); tmp = _mm256_min_ps(tmp, max);
tmp = exp(tmp); tmp = exp(tmp);
return _mm256_sub_ps( return _mm256_sub_ps(_mm256_div_ps(_mm256_set1_ps(2.0f),
_mm256_div_ps(_mm256_set1_ps(2.0f), _mm256_add_ps(_mm256_set1_ps(1.0f), tmp)),
_mm256_add_ps(_mm256_set1_ps(1.0f), tmp)), _mm256_set1_ps(1.0f)); _mm256_set1_ps(1.0f));
} }
__m256 linear(const __m256 a) { __m256 linear(const __m256 a) { return a; }
return a;
}
__m256 relu(const __m256 a, const __m256 b) { __m256 relu(const __m256 a, const __m256 b) {
return _mm256_mul_ps(a, return _mm256_mul_ps(
a,
_mm256_and_ps(_mm256_cmp_ps(b, _mm256_set1_ps(0.0f), _CMP_GT_OS), _mm256_and_ps(_mm256_cmp_ps(b, _mm256_set1_ps(0.0f), _CMP_GT_OS),
_mm256_set1_ps(1.0f))); _mm256_set1_ps(1.0f)));
} }
__m256 sigmoid(const __m256 a, const __m256 b) { __m256 sigmoid(const __m256 a, const __m256 b) {
return _mm256_mul_ps(_mm256_mul_ps(a, b), return _mm256_mul_ps(_mm256_mul_ps(a, b),
_mm256_sub_ps(_mm256_set1_ps(1.0f), b)); _mm256_sub_ps(_mm256_set1_ps(1.0f), b));
} }
__m256 tanh(const __m256 a, const __m256 b) { __m256 tanh(const __m256 a, const __m256 b) {
return _mm256_mul_ps(a, return _mm256_mul_ps(
_mm256_sub_ps(_mm256_set1_ps(1.0f), _mm256_mul_ps(b, b))); a, _mm256_sub_ps(_mm256_set1_ps(1.0f), _mm256_mul_ps(b, b)));
} }
__m256 linear(const __m256 a, const __m256 b) { __m256 linear(const __m256 a, const __m256 b) { return a; }
return a;
}
} // namespace hppl } // namespace hppl
paddle/cuda/src/hl_cpu_functions.cc
浏览文件 @ 2a21d8b3
...@@ -12,46 +12,33 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ...@@ -12,46 +12,33 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and See the License for the specific language governing permissions and
limitations under the License. */ limitations under the License. */
#include <math.h> #include <math.h>
#include "hl_functions.h" #include "hl_functions.h"
namespace hppl { namespace hppl {
real relu(const real a) { real relu(const real a) { return a > 0.0f ? a : 0.0f; }
return a > 0.0f ? a : 0.0f;
}
real sigmoid(const real a) { real sigmoid(const real a) {
const real min = SIGMOID_THRESHOLD_MIN; const real min = SIGMOID_THRESHOLD_MIN;
const real max = SIGMOID_THRESHOLD_MAX; const real max = SIGMOID_THRESHOLD_MAX;
real tmp = (a < min) ? min : ((a > max) ? max : a); real tmp = (a < min) ? min : ((a > max) ? max : a);
return 1.0 / (1.0 + exp(-tmp)); return 1.0 / (1.0 + exp(-tmp));
} }
real tanh(const real a) { real tanh(const real a) {
real tmp = -2.0 * a; real tmp = -2.0 * a;
tmp = (tmp > EXP_MAX_INPUT) ? EXP_MAX_INPUT : tmp; tmp = (tmp > EXP_MAX_INPUT) ? EXP_MAX_INPUT : tmp;
return (2.0 / (1.0 + exp(tmp))) - 1.0; return (2.0 / (1.0 + exp(tmp))) - 1.0;
} }
real linear(const real a) { real linear(const real a) { return a; }
return a;
}
real relu(const real a, const real b) { real relu(const real a, const real b) { return a * (b > 0.0f ? 1.0f : 0.0f); }
return a * (b > 0.0f ? 1.0f : 0.0f);
}
real sigmoid(const real a, const real b) { real sigmoid(const real a, const real b) { return a * b * (1 - b); }
return a * b * (1 - b);
}
real tanh(const real a, const real b) { real tanh(const real a, const real b) { return a * (1.0f - b * b); }
return a * (1.0f - b * b);
}
real linear(const real a, const real b) { real linear(const real a, const real b) { return a; }
return a;
}
} // namespace hppl } // namespace hppl
paddle/cuda/src/hl_cuda_cublas.cc
浏览文件 @ 2a21d8b3
...@@ -12,7 +12,6 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ...@@ -12,7 +12,6 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and See the License for the specific language governing permissions and
limitations under the License. */ limitations under the License. */
#include <sys/time.h> #include <sys/time.h>
#include <mutex> #include <mutex>
#include "hl_cuda.h" #include "hl_cuda.h"
...@@ -24,7 +23,7 @@ limitations under the License. */ ...@@ -24,7 +23,7 @@ limitations under the License. */
namespace dynload { namespace dynload {
std::once_flag cublas_dso_flag; std::once_flag cublas_dso_flag;
void* cublas_dso_handle = nullptr; void *cublas_dso_handle = nullptr;
/** /**
* The following macro definition can generate structs * The following macro definition can generate structs
...@@ -39,9 +38,8 @@ void* cublas_dso_handle = nullptr; ...@@ -39,9 +38,8 @@ void* cublas_dso_handle = nullptr;
template <typename... Args> \ template <typename... Args> \
cublasStatus_t operator()(Args... args) { \ cublasStatus_t operator()(Args... args) { \
typedef cublasStatus_t (*cublasFunc)(Args...); \ typedef cublasStatus_t (*cublasFunc)(Args...); \
std::call_once(cublas_dso_flag, GetCublasDsoHandle, \ std::call_once(cublas_dso_flag, GetCublasDsoHandle, &cublas_dso_handle); \
&cublas_dso_handle); \ void *p_##__name = dlsym(cublas_dso_handle, #__name); \
void* p_##__name = dlsym(cublas_dso_handle, #__name); \
return reinterpret_cast<cublasFunc>(p_##__name)(args...); \ return reinterpret_cast<cublasFunc>(p_##__name)(args...); \
} \ } \
} __name; // struct DynLoad__##__name } __name; // struct DynLoad__##__name
...@@ -55,10 +53,10 @@ void* cublas_dso_handle = nullptr; ...@@ -55,10 +53,10 @@ void* cublas_dso_handle = nullptr;
} __name; // struct DynLoad__##__name } __name; // struct DynLoad__##__name
#endif #endif
#define DYNAMIC_LOAD_CUBLAS_V2_WRAP(__name) \ #define DYNAMIC_LOAD_CUBLAS_V2_WRAP(__name) DYNAMIC_LOAD_CUBLAS_WRAP(__name)
DYNAMIC_LOAD_CUBLAS_WRAP(__name)
// include all needed cublas functions in HPPL // include all needed cublas functions in HPPL
// clang-format off
#define CUBLAS_BLAS_ROUTINE_EACH(__macro) \ #define CUBLAS_BLAS_ROUTINE_EACH(__macro) \
__macro(cublasSgemv) \ __macro(cublasSgemv) \
__macro(cublasDgemv) \ __macro(cublasDgemv) \
...@@ -88,7 +86,7 @@ CUBLAS_BLAS_ROUTINE_EACH(DYNAMIC_LOAD_CUBLAS_V2_WRAP) ...@@ -88,7 +86,7 @@ CUBLAS_BLAS_ROUTINE_EACH(DYNAMIC_LOAD_CUBLAS_V2_WRAP)
} /* namespace dynload */ } /* namespace dynload */
// clang-format on
#ifndef PADDLE_TYPE_DOUBLE #ifndef PADDLE_TYPE_DOUBLE
#define CUBLAS_GEAM dynload::cublasSgeam #define CUBLAS_GEAM dynload::cublasSgeam
#define CUBLAS_GEMV dynload::cublasSgemv #define CUBLAS_GEMV dynload::cublasSgemv
...@@ -103,7 +101,7 @@ CUBLAS_BLAS_ROUTINE_EACH(DYNAMIC_LOAD_CUBLAS_V2_WRAP) ...@@ -103,7 +101,7 @@ CUBLAS_BLAS_ROUTINE_EACH(DYNAMIC_LOAD_CUBLAS_V2_WRAP)
#define CUBLAS_GETRI dynload::cublasDgetriBatched #define CUBLAS_GETRI dynload::cublasDgetriBatched
#endif #endif
const char* hl_cublas_get_error_string(cublasStatus_t status) { const char *hl_cublas_get_error_string(cublasStatus_t status) {
switch (status) { switch (status) {
case CUBLAS_STATUS_NOT_INITIALIZED: case CUBLAS_STATUS_NOT_INITIALIZED:
return "[cublas status]: not initialized"; return "[cublas status]: not initialized";
...@@ -134,9 +132,7 @@ cublasStatus_t g_cublasStat; ...@@ -134,9 +132,7 @@ cublasStatus_t g_cublasStat;
#define CHECK_CUBLAS(cublas_func) \ #define CHECK_CUBLAS(cublas_func) \
g_cublasStat = cublas_func; \ g_cublasStat = cublas_func; \
CHECK_EQ(CUBLAS_STATUS_SUCCESS, g_cublasStat) \ CHECK_EQ(CUBLAS_STATUS_SUCCESS, g_cublasStat) \
<< "Cublas Error: " \ << "Cublas Error: " << hl_cublas_get_error_string(g_cublasStat) << " "
<< hl_cublas_get_error_string(g_cublasStat) \
<< " "
void hl_cublas_init(cublasHandle_t *cublas_handle, cudaStream_t stream) { void hl_cublas_init(cublasHandle_t *cublas_handle, cudaStream_t stream) {
CHECK_CUBLAS(dynload::cublasCreate(cublas_handle)) CHECK_CUBLAS(dynload::cublasCreate(cublas_handle))
...@@ -146,12 +142,8 @@ void hl_cublas_init(cublasHandle_t *cublas_handle, cudaStream_t stream) { ...@@ -146,12 +142,8 @@ void hl_cublas_init(cublasHandle_t *cublas_handle, cudaStream_t stream) {
<< "[cublas init] Cublas set stream faild!"; << "[cublas init] Cublas set stream faild!";
} }
void hl_matrix_transpose(real *A_d, void hl_matrix_transpose(
real *C_d, real *A_d, real *C_d, int dimM, int dimN, int lda, int ldc) {
int dimM,
int dimN,
int lda,
int ldc) {
real alpha = 1.0; real alpha = 1.0;
real beta = 0.0; real beta = 0.0;
...@@ -159,11 +151,18 @@ void hl_matrix_transpose(real *A_d, ...@@ -159,11 +151,18 @@ void hl_matrix_transpose(real *A_d,
CHECK_NOTNULL(C_d); CHECK_NOTNULL(C_d);
CHECK_CUBLAS(CUBLAS_GEAM(t_resource.handle, CHECK_CUBLAS(CUBLAS_GEAM(t_resource.handle,
CUBLAS_OP_T, CUBLAS_OP_N, CUBLAS_OP_T,
dimM, dimN, CUBLAS_OP_N,
&alpha, A_d, lda, dimM,
&beta, nullptr, dimM, dimN,
C_d, ldc)); &alpha,
A_d,
lda,
&beta,
nullptr,
dimM,
C_d,
ldc));
CHECK_SYNC("hl_matrix_transpose failed"); CHECK_SYNC("hl_matrix_transpose failed");
} }
...@@ -188,8 +187,8 @@ void hl_matrix_inverse(real *A_d, real *C_d, int dimN, int lda, int ldc) { ...@@ -188,8 +187,8 @@ void hl_matrix_inverse(real *A_d, real *C_d, int dimN, int lda, int ldc) {
small-sized matrices. There may be a better way to reconstruct small-sized matrices. There may be a better way to reconstruct
the API for better performance. the API for better performance.
*/ */
CHECK_CUBLAS(CUBLAS_GETRF(t_resource.handle, CHECK_CUBLAS(
dimN, inout_d, lda, pivot_d, info_d, 1)); CUBLAS_GETRF(t_resource.handle, dimN, inout_d, lda, pivot_d, info_d, 1));
int info_h; int info_h;
hl_memcpy(&info_h, info_d, sizeof(int)); hl_memcpy(&info_h, info_d, sizeof(int));
...@@ -203,8 +202,14 @@ void hl_matrix_inverse(real *A_d, real *C_d, int dimN, int lda, int ldc) { ...@@ -203,8 +202,14 @@ void hl_matrix_inverse(real *A_d, real *C_d, int dimN, int lda, int ldc) {
hl_memcpy(out_d, out_h, sizeof(real *)); hl_memcpy(out_d, out_h, sizeof(real *));
CHECK_CUBLAS(CUBLAS_GETRI(t_resource.handle, CHECK_CUBLAS(CUBLAS_GETRI(t_resource.handle,
dimN, (const real **)inout_d, lda, pivot_d, dimN,
out_d, ldc, info_d, 1)); (const real **)inout_d,
lda,
pivot_d,
out_d,
ldc,
info_d,
1));
hl_memcpy(&info_h, info_d, sizeof(int)); hl_memcpy(&info_h, info_d, sizeof(int));
if (info_h != 0) { if (info_h != 0) {
...@@ -218,12 +223,19 @@ void hl_matrix_inverse(real *A_d, real *C_d, int dimN, int lda, int ldc) { ...@@ -218,12 +223,19 @@ void hl_matrix_inverse(real *A_d, real *C_d, int dimN, int lda, int ldc) {
CHECK_SYNC("hl_matrix_inverse failed"); CHECK_SYNC("hl_matrix_inverse failed");
} }
void hl_matrix_mul(real *A_d, hl_trans_op_t transa, void hl_matrix_mul(real *A_d,
real *B_d, hl_trans_op_t transb, hl_trans_op_t transa,
real *B_d,
hl_trans_op_t transb,
real *C_d, real *C_d,
int dimM, int dimN, int dimK, int dimM,
real alpha, real beta, int dimN,
int lda, int ldb, int ldc) { int dimK,
real alpha,
real beta,
int lda,
int ldb,
int ldc) {
CHECK_NOTNULL(A_d); CHECK_NOTNULL(A_d);
CHECK_NOTNULL(B_d); CHECK_NOTNULL(B_d);
CHECK_NOTNULL(C_d); CHECK_NOTNULL(C_d);
...@@ -231,8 +243,8 @@ void hl_matrix_mul(real *A_d, hl_trans_op_t transa, ...@@ -231,8 +243,8 @@ void hl_matrix_mul(real *A_d, hl_trans_op_t transa,
if (dimN == 1 && dimM != 1 && dimK != 1 && transb == HPPL_OP_N) { if (dimN == 1 && dimM != 1 && dimK != 1 && transb == HPPL_OP_N) {
int m = (transa == HPPL_OP_N) ? dimM : dimK; int m = (transa == HPPL_OP_N) ? dimM : dimK;
int n = (transa == HPPL_OP_N) ? dimK : dimM; int n = (transa == HPPL_OP_N) ? dimK : dimM;
hl_matrix_mul_vector(A_d, transa, B_d, C_d, m, n, hl_matrix_mul_vector(
alpha, beta, lda, ldb, ldc); A_d, transa, B_d, C_d, m, n, alpha, beta, lda, ldb, ldc);
return; return;
} }
...@@ -240,8 +252,7 @@ void hl_matrix_mul(real *A_d, hl_trans_op_t transa, ...@@ -240,8 +252,7 @@ void hl_matrix_mul(real *A_d, hl_trans_op_t transa,
int m = (transb == HPPL_OP_N) ? dimK : dimN; int m = (transb == HPPL_OP_N) ? dimK : dimN;
int n = (transb == HPPL_OP_N) ? dimN : dimK; int n = (transb == HPPL_OP_N) ? dimN : dimK;
hl_trans_op_t trans = (transb == HPPL_OP_N) ? HPPL_OP_T : HPPL_OP_N; hl_trans_op_t trans = (transb == HPPL_OP_N) ? HPPL_OP_T : HPPL_OP_N;
hl_matrix_mul_vector(B_d, trans, A_d, C_d, m, n, hl_matrix_mul_vector(B_d, trans, A_d, C_d, m, n, alpha, beta, ldb, 1, 1);
alpha, beta, ldb, 1, 1);
return; return;
} }
...@@ -250,26 +261,47 @@ void hl_matrix_mul(real *A_d, hl_trans_op_t transa, ...@@ -250,26 +261,47 @@ void hl_matrix_mul(real *A_d, hl_trans_op_t transa,
stat = CUBLAS_GEMM(t_resource.handle, stat = CUBLAS_GEMM(t_resource.handle,
CUBLAS_OP_N, CUBLAS_OP_N,
CUBLAS_OP_N, CUBLAS_OP_N,
dimN, dimM, dimK, dimN,
&alpha, B_d, ldb, dimM,
A_d, lda, dimK,
&beta, C_d, ldc); &alpha,
B_d,
ldb,
A_d,
lda,
&beta,
C_d,
ldc);
} else if ((HPPL_OP_T == transa) && (HPPL_OP_N == transb)) { } else if ((HPPL_OP_T == transa) && (HPPL_OP_N == transb)) {
stat = CUBLAS_GEMM(t_resource.handle, stat = CUBLAS_GEMM(t_resource.handle,
CUBLAS_OP_N, CUBLAS_OP_N,
CUBLAS_OP_T, CUBLAS_OP_T,
dimN, dimM, dimK, dimN,
&alpha, B_d, ldb, dimM,
A_d, lda, dimK,
&beta, C_d, ldc); &alpha,
B_d,
ldb,
A_d,
lda,
&beta,
C_d,
ldc);
} else if ((HPPL_OP_N == transa) && (HPPL_OP_T == transb)) { } else if ((HPPL_OP_N == transa) && (HPPL_OP_T == transb)) {
stat = CUBLAS_GEMM(t_resource.handle, stat = CUBLAS_GEMM(t_resource.handle,
CUBLAS_OP_T, CUBLAS_OP_T,
CUBLAS_OP_N, CUBLAS_OP_N,
dimN, dimM, dimK, dimN,
&alpha, B_d, ldb, dimM,
A_d, lda, dimK,
&beta, C_d, ldc); &alpha,
B_d,
ldb,
A_d,
lda,
&beta,
C_d,
ldc);
} else { } else {
LOG(FATAL) << "parameter transa error!"; LOG(FATAL) << "parameter transa error!";
} }
...@@ -277,24 +309,46 @@ void hl_matrix_mul(real *A_d, hl_trans_op_t transa, ...@@ -277,24 +309,46 @@ void hl_matrix_mul(real *A_d, hl_trans_op_t transa,
CHECK_SYNC("hl_matrix_mul failed"); CHECK_SYNC("hl_matrix_mul failed");
} }
void hl_matrix_mul(real *A_d, hl_trans_op_t transa, void hl_matrix_mul(real *A_d,
real *B_d, hl_trans_op_t transb, hl_trans_op_t transa,
real *B_d,
hl_trans_op_t transb,
real *C_d, real *C_d,
int dimM, int dimN, int dimK, int dimM,
real alpha, real beta) { int dimN,
int dimK,
real alpha,
real beta) {
int lda = (HPPL_OP_N == transa) ? dimK : dimM; int lda = (HPPL_OP_N == transa) ? dimK : dimM;
int ldb = (HPPL_OP_N == transb) ? dimN : dimK; int ldb = (HPPL_OP_N == transb) ? dimN : dimK;
int ldc = dimN; int ldc = dimN;
hl_matrix_mul(A_d, transa, B_d, transb, C_d, dimM, dimN, hl_matrix_mul(A_d,
dimK, alpha, beta, lda, ldb, ldc); transa,
B_d,
transb,
C_d,
dimM,
dimN,
dimK,
alpha,
beta,
lda,
ldb,
ldc);
} }
void hl_matrix_mul_vector(real *A_d, hl_trans_op_t trans, void hl_matrix_mul_vector(real *A_d,
real *B_d, real *C_d, hl_trans_op_t trans,
int dimM, int dimN, real *B_d,
real alpha, real beta, real *C_d,
int lda, int incb, int incc) { int dimM,
int dimN,
real alpha,
real beta,
int lda,
int incb,
int incc) {
CHECK_NOTNULL(A_d); CHECK_NOTNULL(A_d);
CHECK_NOTNULL(B_d); CHECK_NOTNULL(B_d);
CHECK_NOTNULL(C_d); CHECK_NOTNULL(C_d);
...@@ -303,21 +357,29 @@ void hl_matrix_mul_vector(real *A_d, hl_trans_op_t trans, ...@@ -303,21 +357,29 @@ void hl_matrix_mul_vector(real *A_d, hl_trans_op_t trans,
if (HPPL_OP_N == trans) { if (HPPL_OP_N == trans) {
stat = CUBLAS_GEMV(t_resource.handle, stat = CUBLAS_GEMV(t_resource.handle,
CUBLAS_OP_T, CUBLAS_OP_T,
dimN, dimM, dimN,
dimM,
&alpha, &alpha,
A_d, lda, A_d,
B_d, incb, lda,
B_d,
incb,
&beta, &beta,
C_d, incc); C_d,
incc);
} else if (HPPL_OP_T == trans) { } else if (HPPL_OP_T == trans) {
stat = CUBLAS_GEMV(t_resource.handle, stat = CUBLAS_GEMV(t_resource.handle,
CUBLAS_OP_N, CUBLAS_OP_N,
dimN, dimM, dimN,
dimM,
&alpha, &alpha,
A_d, lda, A_d,
B_d, incb, lda,
B_d,
incb,
&beta, &beta,
C_d, incc); C_d,
incc);
} else { } else {
LOG(FATAL) << "parameter transa error!"; LOG(FATAL) << "parameter transa error!";
} }
...@@ -326,10 +388,14 @@ void hl_matrix_mul_vector(real *A_d, hl_trans_op_t trans, ...@@ -326,10 +388,14 @@ void hl_matrix_mul_vector(real *A_d, hl_trans_op_t trans,
CHECK_SYNC("hl_matrix_mul_vector"); CHECK_SYNC("hl_matrix_mul_vector");
} }
void hl_matrix_mul_vector(real *A_d, hl_trans_op_t trans, void hl_matrix_mul_vector(real *A_d,
real *B_d, real *C_d, hl_trans_op_t trans,
int dimM, int dimN, real *B_d,
real alpha, real beta) { real *C_d,
hl_matrix_mul_vector(A_d, trans, B_d, C_d, dimM, dimN, int dimM,
alpha, beta, dimN, 1, 1); int dimN,
real alpha,
real beta) {
hl_matrix_mul_vector(
A_d, trans, B_d, C_d, dimM, dimN, alpha, beta, dimN, 1, 1);
} }
paddle/cuda/src/hl_cuda_cudnn.cc
浏览文件 @ 2a21d8b3
此差异已折叠。
paddle/cuda/src/hl_cuda_device.cc
浏览文件 @ 2a21d8b3
此差异已折叠。
paddle/cuda/src/hl_cudart_wrap.cc
浏览文件 @ 2a21d8b3
...@@ -12,7 +12,6 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ...@@ -12,7 +12,6 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and See the License for the specific language governing permissions and
limitations under the License. */ limitations under the License. */
#ifdef PADDLE_USE_DSO #ifdef PADDLE_USE_DSO
#include <mutex> #include <mutex>
...@@ -29,7 +28,7 @@ limitations under the License. */ ...@@ -29,7 +28,7 @@ limitations under the License. */
namespace dynload { namespace dynload {
extern std::once_flag cudart_dso_flag; extern std::once_flag cudart_dso_flag;
extern void* cudart_dso_handle; extern void *cudart_dso_handle;
/** /**
* The following macro definition can generate structs * The following macro definition can generate structs
...@@ -41,14 +40,14 @@ extern void* cudart_dso_handle; ...@@ -41,14 +40,14 @@ extern void* cudart_dso_handle;
template <typename... Args> \ template <typename... Args> \
__type operator()(Args... args) { \ __type operator()(Args... args) { \
typedef __type (*cudartFunc)(Args...); \ typedef __type (*cudartFunc)(Args...); \
std::call_once(cudart_dso_flag, GetCudartDsoHandle, \ std::call_once(cudart_dso_flag, GetCudartDsoHandle, &cudart_dso_handle); \
&cudart_dso_handle); \ void *p_##__name = dlsym(cudart_dso_handle, #__name); \
void* p_##__name = dlsym(cudart_dso_handle, #__name); \
return reinterpret_cast<cudartFunc>(p_##__name)(args...); \ return reinterpret_cast<cudartFunc>(p_##__name)(args...); \
} \ } \
} __name; /* struct DynLoad__##__name */ } __name; /* struct DynLoad__##__name */
/* include all needed cuda functions in HPPL */ /* include all needed cuda functions in HPPL */
// clang-format off
#define CUDA_ROUTINE_EACH(__macro) \ #define CUDA_ROUTINE_EACH(__macro) \
__macro(cudaLaunch, cudaError_t) \ __macro(cudaLaunch, cudaError_t) \
__macro(cudaSetupArgument, cudaError_t) \ __macro(cudaSetupArgument, cudaError_t) \
...@@ -61,11 +60,12 @@ extern void* cudart_dso_handle; ...@@ -61,11 +60,12 @@ extern void* cudart_dso_handle;
__macro(__cudaInitModule, char) \ __macro(__cudaInitModule, char) \
__macro(__cudaRegisterTexture, void) \ __macro(__cudaRegisterTexture, void) \
__macro(__cudaRegisterSurface, void) __macro(__cudaRegisterSurface, void)
// clang-format on
CUDA_ROUTINE_EACH(DYNAMIC_LOAD_CUDART_WRAP) CUDA_ROUTINE_EACH(DYNAMIC_LOAD_CUDART_WRAP)
#if CUDART_VERSION >= 7000 #if CUDART_VERSION >= 7000
DYNAMIC_LOAD_CUDART_WRAP(cudaLaunchKernel, cudaError_t) DYNAMIC_LOAD_CUDART_WRAP(cudaLaunchKernel, cudaError_t)
#endif #endif
#undef CUDA_ROUNTINE_EACH #undef CUDA_ROUNTINE_EACH
...@@ -79,12 +79,11 @@ __host__ cudaError_t CUDARTAPI cudaLaunchKernel(const void *func, ...@@ -79,12 +79,11 @@ __host__ cudaError_t CUDARTAPI cudaLaunchKernel(const void *func,
void **args, void **args,
size_t sharedMem, size_t sharedMem,
cudaStream_t stream) { cudaStream_t stream) {
return dynload::cudaLaunchKernel(func, gridDim, blockDim, return dynload::cudaLaunchKernel(
args, sharedMem, stream); func, gridDim, blockDim, args, sharedMem, stream);
} }
#endif /* CUDART_VERSION >= 7000 */ #endif /* CUDART_VERSION >= 7000 */
__host__ cudaError_t CUDARTAPI cudaLaunch(const void *func) { __host__ cudaError_t CUDARTAPI cudaLaunch(const void *func) {
return dynload::cudaLaunch(func); return dynload::cudaLaunch(func);
} }
...@@ -99,13 +98,12 @@ __host__ cudaError_t CUDARTAPI cudaConfigureCall(dim3 gridDim, ...@@ -99,13 +98,12 @@ __host__ cudaError_t CUDARTAPI cudaConfigureCall(dim3 gridDim,
dim3 blockDim, dim3 blockDim,
size_t sharedMem, size_t sharedMem,
cudaStream_t stream) { cudaStream_t stream) {
return dynload::cudaConfigureCall(gridDim, blockDim, return dynload::cudaConfigureCall(gridDim, blockDim, sharedMem, stream);
sharedMem, stream);
} }
extern "C" { extern "C" {
void** CUDARTAPI __cudaRegisterFatBinary(void *fatCubin) { void **CUDARTAPI __cudaRegisterFatBinary(void *fatCubin) {
return dynload::__cudaRegisterFatBinary(fatCubin); return dynload::__cudaRegisterFatBinary(fatCubin);
} }
...@@ -113,8 +111,7 @@ void CUDARTAPI __cudaUnregisterFatBinary(void **fatCubinHandle) { ...@@ -113,8 +111,7 @@ void CUDARTAPI __cudaUnregisterFatBinary(void **fatCubinHandle) {
return dynload::__cudaUnregisterFatBinary(fatCubinHandle); return dynload::__cudaUnregisterFatBinary(fatCubinHandle);
} }
void CUDARTAPI __cudaRegisterFunction( void CUDARTAPI __cudaRegisterFunction(void **fatCubinHandle,
void **fatCubinHandle,
const char *hostFun, const char *hostFun,
char *deviceFun, char *deviceFun,
const char *deviceName, const char *deviceName,
...@@ -123,76 +120,78 @@ void CUDARTAPI __cudaRegisterFunction( ...@@ -123,76 +120,78 @@ void CUDARTAPI __cudaRegisterFunction(
uint3 *bid, uint3 *bid,
dim3 *bDim, dim3 *bDim,
dim3 *gDim, dim3 *gDim,
int *wSize int *wSize) {
) { return dynload::__cudaRegisterFunction(fatCubinHandle,
return dynload::__cudaRegisterFunction( hostFun,
fatCubinHandle, hostFun, deviceFun, deviceName, deviceFun,
thread_limit, tid, bid, bDim, gDim, wSize); deviceName,
thread_limit,
tid,
bid,
bDim,
gDim,
wSize);
} }
void CUDARTAPI __cudaRegisterVar( void CUDARTAPI __cudaRegisterVar(void **fatCubinHandle,
void **fatCubinHandle,
char *hostVar, char *hostVar,
char *deviceAddress, char *deviceAddress,
const char *deviceName, const char *deviceName,
int ext, int ext,
int size, int size,
int constant, int constant,
int global int global) {
) { return dynload::__cudaRegisterVar(fatCubinHandle,
return dynload::__cudaRegisterVar( hostVar,
fatCubinHandle, hostVar, deviceAddress, deviceAddress,
deviceName, ext, size, constant, global); deviceName,
ext,
size,
constant,
global);
} }
extern void CUDARTAPI __cudaRegisterManagedVar(void **fatCubinHandle,
extern void CUDARTAPI __cudaRegisterManagedVar(
void **fatCubinHandle,
void **hostVarPtrAddress, void **hostVarPtrAddress,
char *deviceAddress, char *deviceAddress,
const char *deviceName, const char *deviceName,
int ext, int ext,
int size, int size,
int constant, int constant,
int global int global) {
) { return dynload::__cudaRegisterManagedVar(fatCubinHandle,
return dynload::__cudaRegisterManagedVar( hostVarPtrAddress,
fatCubinHandle, hostVarPtrAddress, deviceAddress, deviceAddress,
deviceName, ext, size, constant, global); deviceName,
ext,
size,
constant,
global);
} }
char CUDARTAPI __cudaInitModule( char CUDARTAPI __cudaInitModule(void **fatCubinHandle) {
void **fatCubinHandle
) {
return dynload::__cudaInitModule(fatCubinHandle); return dynload::__cudaInitModule(fatCubinHandle);
} }
void CUDARTAPI __cudaRegisterTexture( void CUDARTAPI __cudaRegisterTexture(void **fatCubinHandle,
void **fatCubinHandle,
const struct textureReference *hostVar, const struct textureReference *hostVar,
const void **deviceAddress, const void **deviceAddress,
const char *deviceName, const char *deviceName,
int dim, int dim,
int norm, int norm,
int ext int ext) {
) {
return dynload::__cudaRegisterTexture( return dynload::__cudaRegisterTexture(
fatCubinHandle, hostVar, deviceAddress, fatCubinHandle, hostVar, deviceAddress, deviceName, dim, norm, ext);
deviceName, dim, norm, ext);
} }
void CUDARTAPI __cudaRegisterSurface( void CUDARTAPI __cudaRegisterSurface(void **fatCubinHandle,
void **fatCubinHandle,
const struct surfaceReference *hostVar, const struct surfaceReference *hostVar,
const void **deviceAddress, const void **deviceAddress,
const char *deviceName, const char *deviceName,
int dim, int dim,
int ext int ext) {
) {
return dynload::__cudaRegisterSurface( return dynload::__cudaRegisterSurface(
fatCubinHandle, hostVar, deviceAddress, fatCubinHandle, hostVar, deviceAddress, deviceName, dim, ext);
deviceName, dim, ext);
} }
} /* extern "C" */ } /* extern "C" */
......
paddle/cuda/src/hl_dso_loader.cc
浏览文件 @ 2a21d8b3
...@@ -12,17 +12,18 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ...@@ -12,17 +12,18 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and See the License for the specific language governing permissions and
limitations under the License. */ limitations under the License. */
#include "hl_dso_loader.h" #include "hl_dso_loader.h"
#include "paddle/utils/Logging.h"
#include "paddle/utils/CommandLineParser.h" #include "paddle/utils/CommandLineParser.h"
#include "paddle/utils/Logging.h"
P_DEFINE_string(cudnn_dir, "", P_DEFINE_string(cudnn_dir,
"",
"Specify path for loading libcudnn.so. For instance, " "Specify path for loading libcudnn.so. For instance, "
"/usr/local/cudnn/lib64. If empty [default], dlopen " "/usr/local/cudnn/lib. If empty [default], dlopen "
"will search cudnn from LD_LIBRARY_PATH"); "will search cudnn from LD_LIBRARY_PATH");
P_DEFINE_string(cuda_dir, "", P_DEFINE_string(cuda_dir,
"",
"Specify path for loading cuda library, such as libcublas, " "Specify path for loading cuda library, such as libcublas, "
"libcurand. For instance, /usr/local/cuda/lib64. (Note: " "libcurand. For instance, /usr/local/cuda/lib64. (Note: "
"libcudart can not be specified by cuda_dir, since some " "libcudart can not be specified by cuda_dir, since some "
...@@ -33,7 +34,6 @@ static inline std::string join(const std::string& part1, ...@@ -33,7 +34,6 @@ static inline std::string join(const std::string& part1,
const std::string& part2) { const std::string& part2) {
// directory separator // directory separator
const char sep = '/'; const char sep = '/';
if (!part2.empty() && part2.front() == sep) { if (!part2.empty() && part2.front() == sep) {
return part2; return part2;
} }
...@@ -47,34 +47,37 @@ static inline std::string join(const std::string& part1, ...@@ -47,34 +47,37 @@ static inline std::string join(const std::string& part1,
return ret; return ret;
} }
static inline void GetDsoHandleFromDefaultPath( static inline void GetDsoHandleFromDefaultPath(std::string& dso_path,
std::string& dso_path, void** dso_handle, int dynload_flags) { void** dso_handle,
int dynload_flags) {
VLOG(3) << "Try to find cuda library: " << dso_path VLOG(3) << "Try to find cuda library: " << dso_path
<< " from default system path."; << " from default system path.";
// default search from LD_LIBRARY_PATH/DYLD_LIBRARY_PATH // default search from LD_LIBRARY_PATH/DYLD_LIBRARY_PATH
*dso_handle = dlopen(dso_path.c_str(), dynload_flags); *dso_handle = dlopen(dso_path.c_str(), dynload_flags);
// DYLD_LIBRARY_PATH is disabled after Mac OS 10.11 to // DYLD_LIBRARY_PATH is disabled after Mac OS 10.11 to
// bring System Integrity Projection (SIP), if dso_handle // bring System Integrity Projection (SIP), if dso_handle
// is null, search from default package path in Mac OS. // is null, search from default package path in Mac OS.
#if defined(__APPLE__) || defined(__OSX__) #if defined(__APPLE__) || defined(__OSX__)
if (nullptr == *dso_handle) { if (nullptr == *dso_handle) {
dso_path = join("/usr/local/cuda/lib/", dso_path); dso_path = join("/usr/local/cuda/lib/", dso_path);
*dso_handle = dlopen(dso_path.c_str(), dynload_flags); *dso_handle = dlopen(dso_path.c_str(), dynload_flags);
if (nullptr == *dso_handle) { if (nullptr == *dso_handle) {
if (dso_path == "libcudnn.dylib") { if (dso_path == "libcudnn.dylib") {
LOG(FATAL) << "Note: [Recommend] copy cudnn into /usr/local/cuda/ \n" // NOLINT LOG(FATAL)
<< "For instance, sudo tar -xzf cudnn-7.5-osx-x64-v5.0-ga.tgz -C " // NOLINT << "Note: [Recommend] copy cudnn into /usr/local/cuda/ \n" // NOLINT
<< "/usr/local \n sudo chmod a+r /usr/local/cuda/include/cudnn.h " // NOLINT << "For instance, sudo tar -xzf "
"cudnn-7.5-osx-x64-v5.0-ga.tgz -C " // NOLINT
<< "/usr/local \n sudo chmod a+r "
"/usr/local/cuda/include/cudnn.h " // NOLINT
<< "/usr/local/cuda/lib/libcudnn*"; << "/usr/local/cuda/lib/libcudnn*";
} }
} }
} }
#endif #endif
} }
static inline void GetDsoHandleFromSearchPath( static inline void GetDsoHandleFromSearchPath(const std::string& search_root,
const std::string& search_root,
const std::string& dso_name, const std::string& dso_name,
void** dso_handle) { void** dso_handle) {
int dynload_flags = RTLD_LAZY | RTLD_LOCAL; int dynload_flags = RTLD_LAZY | RTLD_LOCAL;
...@@ -88,28 +91,40 @@ static inline void GetDsoHandleFromSearchPath( ...@@ -88,28 +91,40 @@ static inline void GetDsoHandleFromSearchPath(
dlPath = join(search_root, dso_name); dlPath = join(search_root, dso_name);
*dso_handle = dlopen(dlPath.c_str(), dynload_flags); *dso_handle = dlopen(dlPath.c_str(), dynload_flags);
// if not found, search from default path // if not found, search from default path
if (nullptr == dso_handle) { if (nullptr == *dso_handle) {
LOG(WARNING) << "Failed to find cuda library: " << dlPath; LOG(WARNING) << "Failed to find cuda library: " << dlPath;
dlPath = dso_name; dlPath = dso_name;
GetDsoHandleFromDefaultPath(dlPath, dso_handle, dynload_flags); GetDsoHandleFromDefaultPath(dlPath, dso_handle, dynload_flags);
} }
} }
CHECK(nullptr != *dso_handle) CHECK(nullptr != *dso_handle) << "Failed to find cuda library: " << dlPath
<< "Failed to find cuda library: " << dlPath << std::endl << std::endl
<< "Please specify its path correctly using one of the following ways: \n" // NOLINT << "Please specify its path correctly using "
"one of the following ways: \n" // NOLINT
<< "Method 1. set cuda and cudnn lib path at runtime. "
<< "http://www.paddlepaddle.org/doc/ui/cmd_argument/argument_outline.html \n" // NOLINT << "Method 1. set cuda and cudnn lib path at "
<< "For instance, issue command: paddle train --use_gpu=1 " "runtime. "
<< "--cuda_dir=/usr/local/cuda/lib64 --cudnn_dir=/usr/local/cudnn/lib ...\n" // NOLINT << "http://www.paddlepaddle.org/doc/ui/"
"cmd_argument/"
<< "Method 2. set environment variable LD_LIBRARY_PATH on Linux or " "argument_outline.html \n" // NOLINT
<< "For instance, issue command: paddle train "
"--use_gpu=1 "
<< "--cuda_dir=/usr/local/cuda/lib64 "
"--cudnn_dir=/usr/local/cudnn/lib "
"...\n" // NOLINT
<< "Method 2. set environment variable "
"LD_LIBRARY_PATH on Linux or "
<< "DYLD_LIBRARY_PATH on Mac OS. \n" << "DYLD_LIBRARY_PATH on Mac OS. \n"
<< "For instance, issue command: export LD_LIBRARY_PATH=... \n" << "For instance, issue command: export "
"LD_LIBRARY_PATH=... \n"
<< "Note: After Mac OS 10.11, using the DYLD_LIBRARY_PATH is impossible "
<< "unless System Integrity Protection (SIP) is disabled. However, method 1 " // NOLINT << "Note: After Mac OS 10.11, using the "
"DYLD_LIBRARY_PATH is impossible "
<< "unless System Integrity Protection (SIP) "
"is disabled. However, "
"method 1 " // NOLINT
<< "always work well."; << "always work well.";
} }
......
paddle/cuda/src/hl_math.cc
浏览文件 @ 2a21d8b3
...@@ -12,24 +12,15 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ...@@ -12,24 +12,15 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and See the License for the specific language governing permissions and
limitations under the License. */ limitations under the License. */
#include "avx_mathfun.h" #include "avx_mathfun.h"
namespace hppl { namespace hppl {
__m256 exp(__m256 a) { __m256 exp(__m256 a) { return exp256_ps(a); }
return exp256_ps(a);
}
__m256 log(__m256 a) { __m256 log(__m256 a) { return log256_ps(a); }
return log256_ps(a);
}
__m256 sin(__m256 a) { __m256 sin(__m256 a) { return sin256_ps(a); }
return sin256_ps(a);
}
__m256 cos(__m256 a) { __m256 cos(__m256 a) { return cos256_ps(a); }
return cos256_ps(a);
}
} // namespace hppl } // namespace hppl
paddle/cuda/src/hl_time.cc
浏览文件 @ 2a21d8b3
...@@ -12,7 +12,6 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ...@@ -12,7 +12,6 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and See the License for the specific language governing permissions and
limitations under the License. */ limitations under the License. */
#include <chrono> #include <chrono>
#include <stdlib.h> #include <stdlib.h>
#include <iostream> #include <iostream>
...@@ -25,4 +24,3 @@ int64_t getCurrentTimeStick() { ...@@ -25,4 +24,3 @@ int64_t getCurrentTimeStick() {
high_resolution_clock::duration dtn = tp.time_since_epoch(); high_resolution_clock::duration dtn = tp.time_since_epoch();
return dtn.count(); return dtn.count();
} }
paddle/gserver/activations/ActivationFunction.h
浏览文件 @ 2a21d8b3
...@@ -12,7 +12,6 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ...@@ -12,7 +12,6 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and See the License for the specific language governing permissions and
limitations under the License. */ limitations under the License. */
#pragma once #pragma once
#include <string> #include <string>
#include <vector> #include <vector>
......
paddle/gserver/dataproviders/DataProviderGroup.h
浏览文件 @ 2a21d8b3
...@@ -12,7 +12,6 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ...@@ -12,7 +12,6 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and See the License for the specific language governing permissions and
limitations under the License. */ limitations under the License. */
#pragma once #pragma once
#include "DataProvider.h" #include "DataProvider.h"
...@@ -65,8 +64,8 @@ void DataProviderGroup<T>::reset() { ...@@ -65,8 +64,8 @@ void DataProviderGroup<T>::reset() {
provider_ = nullptr; provider_ = nullptr;
// shuffle file list // shuffle file list
std::shuffle(fileList_.begin(), fileList_.end(), std::shuffle(
ThreadLocalRandomEngine::get()); fileList_.begin(), fileList_.end(), ThreadLocalRandomEngine::get());
startLoader(); startLoader();
DataProvider::reset(); DataProvider::reset();
...@@ -113,8 +112,9 @@ void DataProviderGroup<T>::startLoader() { ...@@ -113,8 +112,9 @@ void DataProviderGroup<T>::startLoader() {
size_t endPos = std::min(fileList_.size(), startPos + loadFileCount); size_t endPos = std::min(fileList_.size(), startPos + loadFileCount);
std::vector<std::string> fileVec(fileList_.begin() + startPos, std::vector<std::string> fileVec(fileList_.begin() + startPos,
fileList_.begin() + endPos); fileList_.begin() + endPos);
loader_->addJob([this, fileVec]() loader_->addJob([this, fileVec]() -> ProviderPtrType {
-> ProviderPtrType { return this->loadFile(fileVec); }); return this->loadFile(fileVec);
});
} }
loader_->stopAddJob(); loader_->stopAddJob();
} }
......
paddle/gserver/dataproviders/MultiDataProvider.h
浏览文件 @ 2a21d8b3
...@@ -12,7 +12,6 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ...@@ -12,7 +12,6 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and See the License for the specific language governing permissions and
limitations under the License. */ limitations under the License. */
#pragma once #pragma once
#include "DataProvider.h" #include "DataProvider.h"
......
paddle/gserver/layers/AddtoLayer.h
浏览文件 @ 2a21d8b3
此差异已折叠。
paddle/gserver/layers/AgentLayer.h
浏览文件 @ 2a21d8b3
此差异已折叠。
paddle/gserver/layers/CRFLayer.cpp
浏览文件 @ 2a21d8b3
此差异已折叠。
paddle/gserver/layers/CRFLayer.h
浏览文件 @ 2a21d8b3
此差异已折叠。
paddle/gserver/layers/CTCLayer.cpp
浏览文件 @ 2a21d8b3
此差异已折叠。
paddle/gserver/layers/CTCLayer.h
浏览文件 @ 2a21d8b3
此差异已折叠。
paddle/gserver/layers/CosSimLayer.h
浏览文件 @ 2a21d8b3
此差异已折叠。
paddle/gserver/layers/CostLayer.cpp
浏览文件 @ 2a21d8b3
此差异已折叠。
paddle/gserver/layers/CostLayer.h
浏览文件 @ 2a21d8b3
此差异已折叠。
paddle/gserver/layers/DataLayer.cpp
浏览文件 @ 2a21d8b3
此差异已折叠。
paddle/gserver/layers/DataLayer.h
浏览文件 @ 2a21d8b3
此差异已折叠。
paddle/gserver/layers/GruCompute.h
浏览文件 @ 2a21d8b3
此差异已折叠。
paddle/gserver/layers/Layer.cpp
浏览文件 @ 2a21d8b3
此差异已折叠。
paddle/gserver/layers/Layer.h
浏览文件 @ 2a21d8b3
此差异已折叠。
paddle/gserver/layers/LstmCompute.h
浏览文件 @ 2a21d8b3
此差异已折叠。
paddle/gserver/layers/LstmLayer.cpp
浏览文件 @ 2a21d8b3
此差异已折叠。
paddle/gserver/layers/LstmLayer.h
浏览文件 @ 2a21d8b3
此差异已折叠。
paddle/gserver/layers/MaxLayer.cpp
浏览文件 @ 2a21d8b3
此差异已折叠。
paddle/gserver/layers/MaxLayer.h
浏览文件 @ 2a21d8b3
此差异已折叠。
paddle/gserver/layers/MixedLayer.h
浏览文件 @ 2a21d8b3
此差异已折叠。
paddle/gserver/layers/NCELayer.cpp
浏览文件 @ 2a21d8b3
此差异已折叠。
paddle/gserver/layers/NormLayer.cpp
浏览文件 @ 2a21d8b3
此差异已折叠。
paddle/gserver/layers/NormLayer.h
浏览文件 @ 2a21d8b3
此差异已折叠。
paddle/gserver/layers/Operator.cpp
浏览文件 @ 2a21d8b3
此差异已折叠。
paddle/gserver/layers/Operator.h
浏览文件 @ 2a21d8b3
此差异已折叠。
paddle/gserver/layers/PoolLayer.cpp
浏览文件 @ 2a21d8b3
此差异已折叠。
paddle/gserver/layers/PoolLayer.h
浏览文件 @ 2a21d8b3
此差异已折叠。
paddle/gserver/layers/Projection.h
浏览文件 @ 2a21d8b3
此差异已折叠。
paddle/gserver/layers/TensorLayer.h
浏览文件 @ 2a21d8b3
此差异已折叠。
paddle/gserver/layers/TransLayer.h
浏览文件 @ 2a21d8b3
此差异已折叠。
paddle/gserver/tests/TestUtil.cpp
浏览文件 @ 2a21d8b3
此差异已折叠。
paddle/gserver/tests/TestUtil.h
浏览文件 @ 2a21d8b3
此差异已折叠。
paddle/math/Allocator.h
浏览文件 @ 2a21d8b3
此差异已折叠。
paddle/math/BaseMatrix.h
浏览文件 @ 2a21d8b3
此差异已折叠。
paddle/math/CpuSparseMatrix.cpp
浏览文件 @ 2a21d8b3
此差异已折叠。
paddle/math/CpuSparseMatrix.h
浏览文件 @ 2a21d8b3
此差异已折叠。
paddle/math/ExecViaCpu.h
浏览文件 @ 2a21d8b3
此差异已折叠。
paddle/math/MathFunctions.cpp
浏览文件 @ 2a21d8b3
此差异已折叠。
paddle/math/MathFunctions.h
浏览文件 @ 2a21d8b3
此差异已折叠。
paddle/math/MathUtils.cpp
浏览文件 @ 2a21d8b3
此差异已折叠。
paddle/math/MathUtils.h
浏览文件 @ 2a21d8b3
此差异已折叠。
paddle/math/Matrix.cpp
浏览文件 @ 2a21d8b3
此差异已折叠。
paddle/math/Matrix.h
浏览文件 @ 2a21d8b3
此差异已折叠。
paddle/math/MatrixBitCode.cpp
浏览文件 @ 2a21d8b3
此差异已折叠。
paddle/math/MemoryHandle.cpp
浏览文件 @ 2a21d8b3
此差异已折叠。
paddle/math/MemoryHandle.h
浏览文件 @ 2a21d8b3
此差异已折叠。
paddle/math/PoolAllocator.cpp
浏览文件 @ 2a21d8b3
此差异已折叠。
paddle/math/PoolAllocator.h
浏览文件 @ 2a21d8b3
此差异已折叠。
paddle/math/SIMDFunctions.cpp
浏览文件 @ 2a21d8b3
此差异已折叠。
paddle/math/SIMDFunctions.h
浏览文件 @ 2a21d8b3
此差异已折叠。
paddle/math/SparseMatrix.cpp
浏览文件 @ 2a21d8b3
此差异已折叠。
paddle/math/SparseMatrix.h
浏览文件 @ 2a21d8b3
此差异已折叠。
paddle/math/SparseRowMatrix.cpp
浏览文件 @ 2a21d8b3
此差异已折叠。
paddle/math/SparseRowMatrix.h
浏览文件 @ 2a21d8b3
此差异已折叠。
paddle/math/Storage.cpp
浏览文件 @ 2a21d8b3
此差异已折叠。
paddle/math/Vector.cpp
浏览文件 @ 2a21d8b3
此差异已折叠。
paddle/math/Vector.h
浏览文件 @ 2a21d8b3
此差异已折叠。
paddle/math/tests/test_matrix.cpp
浏览文件 @ 2a21d8b3
此差异已折叠。
paddle/math/tests/test_matrixUtil.h
浏览文件 @ 2a21d8b3
此差异已折叠。
paddle/parameter/Argument.cpp
浏览文件 @ 2a21d8b3
此差异已折叠。
paddle/parameter/Argument.h
浏览文件 @ 2a21d8b3
此差异已折叠。
paddle/parameter/AverageOptimizer.h
浏览文件 @ 2a21d8b3
此差异已折叠。
paddle/parameter/Parameter.cpp
浏览文件 @ 2a21d8b3
此差异已折叠。
paddle/parameter/Parameter.h
浏览文件 @ 2a21d8b3
此差异已折叠。
paddle/parameter/Regularizer.cpp
浏览文件 @ 2a21d8b3
此差异已折叠。
paddle/parameter/Regularizer.h
浏览文件 @ 2a21d8b3
此差异已折叠。
paddle/parameter/Weight.cpp
浏览文件 @ 2a21d8b3
此差异已折叠。
paddle/pserver/BaseClient.cpp
浏览文件 @ 2a21d8b3
此差异已折叠。
paddle/pserver/BaseClient.h
浏览文件 @ 2a21d8b3
此差异已折叠。
paddle/pserver/LightNetwork.cpp
浏览文件 @ 2a21d8b3
此差异已折叠。
paddle/pserver/LightNetwork.h
浏览文件 @ 2a21d8b3
此差异已折叠。
paddle/pserver/ParameterClient2.cpp
浏览文件 @ 2a21d8b3
此差异已折叠。
paddle/pserver/ParameterClient2.h
浏览文件 @ 2a21d8b3
此差异已折叠。
paddle/pserver/ParameterServer2.cpp
浏览文件 @ 2a21d8b3
此差异已折叠。
paddle/pserver/ParameterServer2.h
浏览文件 @ 2a21d8b3
此差异已折叠。
paddle/pserver/ProtoServer.cpp
浏览文件 @ 2a21d8b3
此差异已折叠。
paddle/pserver/ProtoServer.h
浏览文件 @ 2a21d8b3
此差异已折叠。
paddle/pserver/RDMANetwork.h
浏览文件 @ 2a21d8b3
此差异已折叠。
paddle/pserver/SocketChannel.cpp
浏览文件 @ 2a21d8b3
此差异已折叠。
paddle/pserver/SocketChannel.h
浏览文件 @ 2a21d8b3
此差异已折叠。
paddle/pserver/test/SocketTest.cpp
浏览文件 @ 2a21d8b3
此差异已折叠。
paddle/trainer/ParamUtil.cpp
浏览文件 @ 2a21d8b3
此差异已折叠。
paddle/trainer/ParamUtil.h
浏览文件 @ 2a21d8b3
此差异已折叠。
paddle/trainer/ParameterUpdater.cpp
浏览文件 @ 2a21d8b3
此差异已折叠。
paddle/trainer/ParameterUpdater.h
浏览文件 @ 2a21d8b3
此差异已折叠。
paddle/trainer/Tester.cpp
浏览文件 @ 2a21d8b3
此差异已折叠。
paddle/trainer/Tester.h
浏览文件 @ 2a21d8b3
此差异已折叠。
paddle/trainer/TesterConfig.h
浏览文件 @ 2a21d8b3
此差异已折叠。
paddle/trainer/Trainer.cpp
浏览文件 @ 2a21d8b3
此差异已折叠。
paddle/trainer/Trainer.h
浏览文件 @ 2a21d8b3
此差异已折叠。
paddle/trainer/TrainerInternal.cpp
浏览文件 @ 2a21d8b3
此差异已折叠。
paddle/trainer/TrainerInternal.h
浏览文件 @ 2a21d8b3
此差异已折叠。
paddle/trainer/TrainerMain.cpp
浏览文件 @ 2a21d8b3
此差异已折叠。
paddle/trainer/tests/picojson.h
浏览文件 @ 2a21d8b3
此差异已折叠。
paddle/utils/BarrierStat.cpp
浏览文件 @ 2a21d8b3
此差异已折叠。
paddle/utils/BarrierStat.h
浏览文件 @ 2a21d8b3
此差异已折叠。
paddle/utils/ClassRegistrar.h
浏览文件 @ 2a21d8b3
此差异已折叠。
paddle/utils/CommandLineParser.cpp
浏览文件 @ 2a21d8b3
此差异已折叠。
paddle/utils/CommandLineParser.h
浏览文件 @ 2a21d8b3
此差异已折叠。
paddle/utils/CustomStackTrace.cpp
浏览文件 @ 2a21d8b3
此差异已折叠。
paddle/utils/CustomStackTrace.h
浏览文件 @ 2a21d8b3
此差异已折叠。
paddle/utils/DisableCopy.h
浏览文件 @ 2a21d8b3
此差异已折叠。
paddle/utils/Excepts.cpp
浏览文件 @ 2a21d8b3
此差异已折叠。
paddle/utils/Flags.cpp
浏览文件 @ 2a21d8b3
此差异已折叠。
paddle/utils/Flags.h
浏览文件 @ 2a21d8b3
此差异已折叠。
paddle/utils/GlobalConstants.cpp
浏览文件 @ 2a21d8b3
此差异已折叠。
paddle/utils/GlobalConstants.h
浏览文件 @ 2a21d8b3
此差异已折叠。
paddle/utils/Locks.h
浏览文件 @ 2a21d8b3
此差异已折叠。
paddle/utils/Logging.cpp
浏览文件 @ 2a21d8b3
此差异已折叠。
paddle/utils/Logging.h
浏览文件 @ 2a21d8b3
此差异已折叠。
paddle/utils/PythonUtil.cpp
浏览文件 @ 2a21d8b3
此差异已折叠。
paddle/utils/PythonUtil.h
浏览文件 @ 2a21d8b3
此差异已折叠。
paddle/utils/Queue.h
浏览文件 @ 2a21d8b3
此差异已折叠。
paddle/utils/Stat.h
浏览文件 @ 2a21d8b3
此差异已折叠。
paddle/utils/StringUtil.h
浏览文件 @ 2a21d8b3
此差异已折叠。
paddle/utils/Thread.h
浏览文件 @ 2a21d8b3
此差异已折叠。
paddle/utils/ThreadLocal.cpp
浏览文件 @ 2a21d8b3
此差异已折叠。
paddle/utils/ThreadLocal.h
浏览文件 @ 2a21d8b3
此差异已折叠。
paddle/utils/TypeDefs.h
浏览文件 @ 2a21d8b3
此差异已折叠。
paddle/utils/Util.cpp
浏览文件 @ 2a21d8b3
此差异已折叠。
paddle/utils/Util.h
浏览文件 @ 2a21d8b3
此差异已折叠。
paddle/utils/Version.cpp
浏览文件 @ 2a21d8b3
此差异已折叠。
paddle/utils/Version.h
浏览文件 @ 2a21d8b3
此差异已折叠。
paddle/utils/arch/linux/Locks.cpp
浏览文件 @ 2a21d8b3
此差异已折叠。
paddle/utils/arch/osx/Locks.cpp
浏览文件 @ 2a21d8b3
此差异已折叠。
paddle/utils/tests/test_Logging.cpp
浏览文件 @ 2a21d8b3
此差异已折叠。
paddle/utils/tests/test_Thread.cpp
浏览文件 @ 2a21d8b3
此差异已折叠。
proto/ModelConfig.proto.m4
浏览文件 @ 2a21d8b3
此差异已折叠。
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或