Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into fix-3736
yangyaming
8 years ago
commit
e9cc32820d
@ -1,25 +0,0 @@
|
|||||||
Debian Package installation guide
|
|
||||||
=================================
|
|
||||||
|
|
||||||
PaddlePaddle supports :code:`deb` pacakge. The installation of this :code:`deb` package is tested in ubuntu 14.04, but it should be support other debian based linux, too.
|
|
||||||
|
|
||||||
There are four versions of debian package, :code:`cpu`, :code:`gpu`, :code:`cpu-noavx`, :code:`gpu-noavx`. And :code:`noavx` version is used to support CPU which does not contain :code:`AVX` instructions. The download url of :code:`deb` package is \: https://github.com/baidu/Paddle/releases/
|
|
||||||
|
|
||||||
|
|
||||||
After downloading PaddlePaddle deb packages, you can use :code:`gdebi` install.
|
|
||||||
|
|
||||||
.. code-block:: bash
|
|
||||||
|
|
||||||
gdebi paddle-*.deb
|
|
||||||
|
|
||||||
If :code:`gdebi` is not installed, you can use :code:`sudo apt-get install gdebi` to install it.
|
|
||||||
|
|
||||||
Or you can use following commands to install PaddlePaddle.
|
|
||||||
|
|
||||||
.. code-block:: bash
|
|
||||||
|
|
||||||
dpkg -i paddle-*.deb
|
|
||||||
apt-get install -f
|
|
||||||
|
|
||||||
And if you use GPU version deb package, you need to install CUDA toolkit and cuDNN, and set related environment variables(such as LD_LIBRARY_PATH) first. It is normal when `dpkg -i` get errors. `apt-get install -f` will continue install paddle, and install dependences.
|
|
||||||
|
|
||||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,47 @@
|
|||||||
|
/* Copyright (c) 2016 PaddlePaddle Authors. All Rights Reserve.
|
||||||
|
|
||||||
|
Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
you may not use this file except in compliance with the License.
|
||||||
|
You may obtain a copy of the License at
|
||||||
|
|
||||||
|
http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
|
||||||
|
Unless required by applicable law or agreed to in writing, software
|
||||||
|
distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
See the License for the specific language governing permissions and
|
||||||
|
limitations under the License. */
|
||||||
|
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
#if defined(__ARM_NEON__) || defined(__ARM_NEON)
|
||||||
|
|
||||||
|
#include <arm_neon.h>
|
||||||
|
|
||||||
|
namespace paddle {
|
||||||
|
|
||||||
|
namespace neon {
|
||||||
|
|
||||||
|
inline float32x4_t vld1q_f32_aligned(const float* p) {
|
||||||
|
return vld1q_f32(
|
||||||
|
(const float*)__builtin_assume_aligned(p, sizeof(float32x4_t)));
|
||||||
|
}
|
||||||
|
|
||||||
|
#ifndef __aarch64__
|
||||||
|
inline float32_t vaddvq_f32(float32x4_t a) {
|
||||||
|
float32x2_t v = vadd_f32(vget_high_f32(a), vget_low_f32(a));
|
||||||
|
return vget_lane_f32(vpadd_f32(v, v), 0);
|
||||||
|
}
|
||||||
|
|
||||||
|
inline float32x4_t vmlaq_laneq_f32(float32x4_t a,
|
||||||
|
float32x4_t b,
|
||||||
|
float32x4_t v,
|
||||||
|
const int lane) {
|
||||||
|
return vmlaq_n_f32(a, b, vgetq_lane_f32(v, lane));
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
} // namespace neon
|
||||||
|
} // namespace paddle
|
||||||
|
|
||||||
|
#endif
|
||||||
@ -0,0 +1,244 @@
|
|||||||
|
/* Copyright (c) 2016 Baidu, Inc. All Rights Reserve.
|
||||||
|
|
||||||
|
Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
you may not use this file except in compliance with the License.
|
||||||
|
You may obtain a copy of the License at
|
||||||
|
|
||||||
|
http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
|
||||||
|
Unless required by applicable law or agreed to in writing, software
|
||||||
|
distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
See the License for the specific language governing permissions and
|
||||||
|
limitations under the License. */
|
||||||
|
|
||||||
|
#include "Conv3DLayer.h"
|
||||||
|
#include "paddle/utils/Logging.h"
|
||||||
|
#include "paddle/utils/Stat.h"
|
||||||
|
|
||||||
|
namespace paddle {
|
||||||
|
|
||||||
|
REGISTER_LAYER(conv3d, Conv3DLayer);
|
||||||
|
|
||||||
|
bool Conv3DLayer::init(const LayerMap &layerMap,
|
||||||
|
const ParameterMap ¶meterMap) {
|
||||||
|
if (!ConvBaseLayer::init(layerMap, parameterMap)) return false;
|
||||||
|
int index = 0;
|
||||||
|
for (auto &inputConfig : config_.inputs()) {
|
||||||
|
const ConvConfig &conf = inputConfig.conv_conf();
|
||||||
|
M_.push_back(numFilters_ / conf.groups());
|
||||||
|
K_.push_back(filterPixels_[index] * filterChannels_[index]);
|
||||||
|
|
||||||
|
// create a new weight
|
||||||
|
size_t height, width;
|
||||||
|
width = filterPixels_[index] * filterChannels_[index];
|
||||||
|
height = numFilters_;
|
||||||
|
CHECK_EQ(parameters_[index]->getSize(), width * height);
|
||||||
|
Weight *w = new Weight(height, width, parameters_[index]);
|
||||||
|
weights_.emplace_back(w);
|
||||||
|
++index;
|
||||||
|
}
|
||||||
|
if (biasParameter_.get()) {
|
||||||
|
if (sharedBiases_) {
|
||||||
|
CHECK_EQ((size_t)numFilters_, biasParameter_->getSize());
|
||||||
|
biases_ =
|
||||||
|
std::unique_ptr<Weight>(new Weight(1, numFilters_, biasParameter_));
|
||||||
|
} else {
|
||||||
|
biases_ =
|
||||||
|
std::unique_ptr<Weight>(new Weight(1, getSize(), biasParameter_));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
size_t Conv3DLayer::getSize() {
|
||||||
|
CHECK_NE(inputLayers_.size(), 0UL);
|
||||||
|
outputH_.clear();
|
||||||
|
outputW_.clear();
|
||||||
|
outputD_.clear();
|
||||||
|
N_.clear();
|
||||||
|
size_t layerSize = 0;
|
||||||
|
for (size_t i = 0; i < inputLayers_.size(); ++i) {
|
||||||
|
outputW_.push_back(outputSize(
|
||||||
|
imgSizeW_[i], filterSize_[i], padding_[i], stride_[i], true));
|
||||||
|
outputH_.push_back(outputSize(
|
||||||
|
imgSizeH_[i], filterSizeY_[i], paddingY_[i], strideY_[i], true));
|
||||||
|
outputD_.push_back(outputSize(
|
||||||
|
imgSizeD_[i], filterSizeZ_[i], paddingZ_[i], strideZ_[i], true));
|
||||||
|
|
||||||
|
N_.push_back(outputD_[i] * outputH_[i] * outputW_[i]);
|
||||||
|
CHECK(layerSize == 0 || N_[i] * size_t(numFilters_) == layerSize);
|
||||||
|
layerSize += N_[i] * numFilters_;
|
||||||
|
}
|
||||||
|
getOutput().setFrameHeight(outputH_[0]);
|
||||||
|
getOutput().setFrameWidth(outputW_[0]);
|
||||||
|
getOutput().setFrameDepth(outputD_[0]);
|
||||||
|
return layerSize;
|
||||||
|
}
|
||||||
|
|
||||||
|
void Conv3DLayer::forward(PassType passType) {
|
||||||
|
Layer::forward(passType);
|
||||||
|
|
||||||
|
int batchSize = inputLayers_[0]->getOutputValue()->getHeight();
|
||||||
|
int outWidth = getSize();
|
||||||
|
resetOutput(batchSize, outWidth);
|
||||||
|
|
||||||
|
for (size_t i = 0; i != inputLayers_.size(); ++i) {
|
||||||
|
REGISTER_TIMER_INFO("FwdConv3D", getName().c_str());
|
||||||
|
const MatrixPtr &inMat = getInputValue(i);
|
||||||
|
const MatrixPtr &outMat = getOutputValue();
|
||||||
|
int M = M_[i];
|
||||||
|
int N = N_[i];
|
||||||
|
int K = K_[i];
|
||||||
|
Matrix::resizeOrCreate(colBuf_, K * groups_[i], N, false, useGpu_);
|
||||||
|
MatrixPtr wMat = weights_[i]->getW();
|
||||||
|
for (int n = 0; n < batchSize; ++n) {
|
||||||
|
colBuf_->vol2Col(inMat->getData() + n * inMat->getStride(),
|
||||||
|
channels_[i],
|
||||||
|
imgSizeD_[i],
|
||||||
|
imgSizeH_[i],
|
||||||
|
imgSizeW_[i],
|
||||||
|
filterSizeZ_[i],
|
||||||
|
filterSizeY_[i],
|
||||||
|
filterSize_[i],
|
||||||
|
strideZ_[i],
|
||||||
|
strideY_[i],
|
||||||
|
stride_[i],
|
||||||
|
paddingZ_[i],
|
||||||
|
paddingY_[i],
|
||||||
|
padding_[i]);
|
||||||
|
|
||||||
|
real *outData = outMat->getData() + n * outMat->getStride();
|
||||||
|
MatrixPtr outMatSub =
|
||||||
|
Matrix::create(outData, groups_[i] * M, N, false, useGpu_);
|
||||||
|
for (int g = 0; g < groups_[i]; g++) {
|
||||||
|
MatrixPtr wMatSub = wMat->subMatrix(g * M, M);
|
||||||
|
MatrixPtr in = colBuf_->subMatrix(g * K, K);
|
||||||
|
MatrixPtr out = outMatSub->subMatrix(g * M, M);
|
||||||
|
out->mul(*wMatSub, *in, 1.0, 1.0);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (nullptr != this->biasParameter_) {
|
||||||
|
REGISTER_TIMER_INFO("FwBiasTimer", getName().c_str());
|
||||||
|
this->addBias();
|
||||||
|
}
|
||||||
|
forwardActivation();
|
||||||
|
}
|
||||||
|
|
||||||
|
void Conv3DLayer::backward(const UpdateCallback &callback) {
|
||||||
|
backwardActivation();
|
||||||
|
|
||||||
|
if (biases_ && biases_->getWGrad()) {
|
||||||
|
bpropBiases();
|
||||||
|
biases_->getParameterPtr()->incUpdate(callback);
|
||||||
|
}
|
||||||
|
|
||||||
|
for (size_t i = 0; i != inputLayers_.size(); ++i) {
|
||||||
|
REGISTER_TIMER_INFO("BwdConv3D", getName().c_str());
|
||||||
|
if (weights_[i]->getWGrad()) {
|
||||||
|
bpropWeights(i);
|
||||||
|
}
|
||||||
|
if (getInputGrad(i)) {
|
||||||
|
bpropData(i);
|
||||||
|
}
|
||||||
|
REGISTER_TIMER_INFO("WeightUpdate", getName().c_str());
|
||||||
|
weights_[i]->getParameterPtr()->incUpdate(callback);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void Conv3DLayer::bpropWeights(int i) {
|
||||||
|
int M = M_[i];
|
||||||
|
int N = N_[i];
|
||||||
|
int K = K_[i];
|
||||||
|
const MatrixPtr &inMat = getInputValue(i);
|
||||||
|
Matrix::resizeOrCreate(colBuf_, K * groups_[i], N, false, useGpu_);
|
||||||
|
MatrixPtr wGradMat = weights_[i]->getWGrad();
|
||||||
|
int batchSize = inputLayers_[0]->getOutputValue()->getHeight();
|
||||||
|
for (int n = 0; n < batchSize; ++n) {
|
||||||
|
colBuf_->vol2Col(inMat->getData() + n * inMat->getStride(),
|
||||||
|
channels_[i],
|
||||||
|
imgSizeD_[i],
|
||||||
|
imgSizeH_[i],
|
||||||
|
imgSizeW_[i],
|
||||||
|
filterSizeZ_[i],
|
||||||
|
filterSizeY_[i],
|
||||||
|
filterSize_[i],
|
||||||
|
strideZ_[i],
|
||||||
|
strideY_[i],
|
||||||
|
stride_[i],
|
||||||
|
paddingZ_[i],
|
||||||
|
paddingY_[i],
|
||||||
|
padding_[i]);
|
||||||
|
|
||||||
|
real *outGradData =
|
||||||
|
getOutputGrad()->getData() + n * getOutputGrad()->getStride();
|
||||||
|
MatrixPtr outGradSub =
|
||||||
|
Matrix::create(outGradData, groups_[i] * M, N, false, useGpu_);
|
||||||
|
for (int g = 0; g < groups_[i]; ++g) {
|
||||||
|
MatrixPtr inMatSub = colBuf_->subMatrix(g * K, K);
|
||||||
|
MatrixPtr outG = outGradSub->subMatrix(g * M, M);
|
||||||
|
MatrixPtr wGradSub = wGradMat->subMatrix(g * M, M);
|
||||||
|
wGradSub->mul(*outG, *(inMatSub->getTranspose()), 1.0, 1.0);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void Conv3DLayer::bpropData(int i) {
|
||||||
|
int M = M_[i];
|
||||||
|
int N = N_[i];
|
||||||
|
int K = K_[i];
|
||||||
|
Matrix::resizeOrCreate(colBuf_, K * groups_[i], N, false, useGpu_);
|
||||||
|
MatrixPtr wMat = weights_[i]->getW();
|
||||||
|
int batchSize = inputLayers_[0]->getOutputValue()->getHeight();
|
||||||
|
for (int n = 0; n < batchSize; ++n) {
|
||||||
|
real *outGradData =
|
||||||
|
getOutputGrad()->getData() + n * getOutputGrad()->getStride();
|
||||||
|
real *preGradData =
|
||||||
|
getInputGrad(i)->getData() + n * getInputGrad(i)->getStride();
|
||||||
|
MatrixPtr outGradSub =
|
||||||
|
Matrix::create(outGradData, M * groups_[i], N, false, useGpu_);
|
||||||
|
for (int g = 0; g < groups_[i]; ++g) {
|
||||||
|
MatrixPtr wMatSub = wMat->subMatrix(g * M, M);
|
||||||
|
MatrixPtr outG = outGradSub->subMatrix(g * M, M);
|
||||||
|
MatrixPtr inGradMatSub = colBuf_->subMatrix(g * K, K);
|
||||||
|
inGradMatSub->mul(*(wMatSub->getTranspose()), *outG, 1.0, 0.0);
|
||||||
|
}
|
||||||
|
colBuf_->col2Vol(preGradData,
|
||||||
|
channels_[i],
|
||||||
|
imgSizeD_[i],
|
||||||
|
imgSizeH_[i],
|
||||||
|
imgSizeW_[i],
|
||||||
|
filterSizeZ_[i],
|
||||||
|
filterSizeY_[i],
|
||||||
|
filterSize_[i],
|
||||||
|
strideZ_[i],
|
||||||
|
strideY_[i],
|
||||||
|
stride_[i],
|
||||||
|
paddingZ_[i],
|
||||||
|
paddingY_[i],
|
||||||
|
padding_[i],
|
||||||
|
1.0,
|
||||||
|
1.0);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void Conv3DLayer::bpropBiases() {
|
||||||
|
MatrixPtr outGradMat = getOutputGrad();
|
||||||
|
if (this->sharedBiases_) {
|
||||||
|
biases_->getWGrad()->collectSharedBias(*outGradMat, 1.0f);
|
||||||
|
} else {
|
||||||
|
biases_->getWGrad()->collectBias(*outGradMat, 1.0f);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void Conv3DLayer::addBias() {
|
||||||
|
MatrixPtr outMat = getOutputValue();
|
||||||
|
if (this->sharedBiases_) {
|
||||||
|
outMat->addSharedBias(*(biases_->getW()), 1.0f);
|
||||||
|
} else {
|
||||||
|
outMat->addBias(*(biases_->getW()), 1.0f);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
} // namespace paddle
|
||||||
@ -0,0 +1,51 @@
|
|||||||
|
/* Copyright (c) 2016 Baidu, Inc. All Rights Reserve.
|
||||||
|
|
||||||
|
Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
you may not use this file except in compliance with the License.
|
||||||
|
You may obtain a copy of the License at
|
||||||
|
|
||||||
|
http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
|
||||||
|
Unless required by applicable law or agreed to in writing, software
|
||||||
|
distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
See the License for the specific language governing permissions and
|
||||||
|
limitations under the License. */
|
||||||
|
|
||||||
|
#pragma once
|
||||||
|
#include <vector>
|
||||||
|
#include "ConvBaseLayer.h"
|
||||||
|
#include "paddle/math/MathUtils.h"
|
||||||
|
#include "paddle/math/Matrix.h"
|
||||||
|
|
||||||
|
namespace paddle {
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @brief A subclass of convolution layer.
|
||||||
|
* This layer expands input and use matrix multiplication to
|
||||||
|
* calculate convolution operation.
|
||||||
|
*/
|
||||||
|
class Conv3DLayer : public ConvBaseLayer {
|
||||||
|
public:
|
||||||
|
explicit Conv3DLayer(const LayerConfig& config) : ConvBaseLayer(config) {}
|
||||||
|
~Conv3DLayer() {}
|
||||||
|
|
||||||
|
bool init(const LayerMap& layerMap, const ParameterMap& parameterMap);
|
||||||
|
|
||||||
|
void forward(PassType passType);
|
||||||
|
void addBias();
|
||||||
|
void backward(const UpdateCallback& callback);
|
||||||
|
void bpropBiases();
|
||||||
|
void bpropData(int i);
|
||||||
|
void bpropWeights(int i);
|
||||||
|
size_t getSize();
|
||||||
|
|
||||||
|
protected:
|
||||||
|
// Figure out the dimensions for individual gemms.
|
||||||
|
IntV M_; /// numFilters_ / filter_group_;
|
||||||
|
IntV N_; /// channels_ * filterSizeZ_ * filterSize_ * filterSizeY_
|
||||||
|
IntV K_; /// outputD_ * outputH_ * outputW_
|
||||||
|
MatrixPtr colBuf_;
|
||||||
|
};
|
||||||
|
|
||||||
|
} // namespace paddle
|
||||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in new issue