Tao Luo
8 years ago
committed by
GitHub
commit
322d9ad81b
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,144 @@
|
|||||||
|
/* Copyright (c) 2017 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. */
|
||||||
|
|
||||||
|
#include "MKLDNNMatrix.h"
|
||||||
|
|
||||||
|
using namespace mkldnn; // NOLINT
|
||||||
|
|
||||||
|
namespace paddle {
|
||||||
|
|
||||||
|
MKLDNNMatrixPtr MKLDNNMatrix::create(MatrixPtr m, memory::primitive_desc pd) {
|
||||||
|
memory::desc md = pd.desc();
|
||||||
|
size_t ndims = md.data.ndims;
|
||||||
|
int* dims = md.data.dims;
|
||||||
|
CHECK(ndims > 0) << "Input dims should not be empty";
|
||||||
|
size_t cnts = 1;
|
||||||
|
for (size_t i = 0; i < ndims; ++i) {
|
||||||
|
cnts *= dims[i];
|
||||||
|
}
|
||||||
|
|
||||||
|
if (m == nullptr) {
|
||||||
|
size_t height = dims[0];
|
||||||
|
size_t width = cnts / dims[0];
|
||||||
|
m = Matrix::create(height, width, false, false);
|
||||||
|
}
|
||||||
|
|
||||||
|
CHECK(m) << " Matrix should not be empty";
|
||||||
|
CpuMatrixPtr cpuMatrix = std::dynamic_pointer_cast<CpuMatrix>(m);
|
||||||
|
CHECK(cpuMatrix) << "Only support create from CPU matrix yet";
|
||||||
|
|
||||||
|
CHECK_EQ(cnts, m->getElementCnt()) << "Count size does not match";
|
||||||
|
return std::make_shared<MKLDNNMatrix>(
|
||||||
|
m->getData(), m->getHeight(), m->getWidth(), pd);
|
||||||
|
}
|
||||||
|
|
||||||
|
MKLDNNMatrixPtr MKLDNNMatrix::create(MatrixPtr m,
|
||||||
|
memory::dims dims,
|
||||||
|
memory::format fmt,
|
||||||
|
engine& eg,
|
||||||
|
mkldnn::memory::data_type dtype) {
|
||||||
|
return create(m, memory::primitive_desc(memory::desc(dims, dtype, fmt), eg));
|
||||||
|
}
|
||||||
|
|
||||||
|
void MKLDNNMatrix::reorderDataFrom(const MKLDNNMatrixPtr& m,
|
||||||
|
memory::format srcFmt,
|
||||||
|
memory::dims targetDim) {
|
||||||
|
memory::format dstFmt = getFormat();
|
||||||
|
if (srcFmt == dstFmt) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
CHECK_EQ(getElementCnt(), m->getElementCnt()) << "size should equal";
|
||||||
|
reorderOnce(getData(), m->getData(), srcFmt, dstFmt, targetDim);
|
||||||
|
}
|
||||||
|
|
||||||
|
void MKLDNNMatrix::reorderDataTo(const MKLDNNMatrixPtr& m,
|
||||||
|
memory::format dstFmt,
|
||||||
|
memory::dims targetDim) {
|
||||||
|
memory::format srcFmt = getFormat();
|
||||||
|
if (srcFmt == dstFmt) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
CHECK_EQ(getElementCnt(), m->getElementCnt()) << "size should equal";
|
||||||
|
reorderOnce(getData(), m->getData(), srcFmt, dstFmt, targetDim);
|
||||||
|
}
|
||||||
|
|
||||||
|
void MKLDNNMatrix::reorderOnce(void* srcData,
|
||||||
|
void* dstData,
|
||||||
|
memory::format srcFmt,
|
||||||
|
memory::format dstFmt,
|
||||||
|
memory::dims dm) {
|
||||||
|
CHECK(srcData);
|
||||||
|
CHECK(dstData);
|
||||||
|
MatrixPtr tmpSrc;
|
||||||
|
if (dstData == srcData) {
|
||||||
|
// inplace data
|
||||||
|
size_t sz = 1;
|
||||||
|
for (size_t i = 0; i < dm.size(); ++i) {
|
||||||
|
sz *= dm[i];
|
||||||
|
}
|
||||||
|
tmpSrc = Matrix::create(sz, 1, false, false);
|
||||||
|
tmpSrc->copyFrom((real*)srcData, sz);
|
||||||
|
srcData = tmpSrc->getData();
|
||||||
|
}
|
||||||
|
|
||||||
|
auto dtype = this->getDtype();
|
||||||
|
auto srcMD = memory::desc(dm, dtype, srcFmt);
|
||||||
|
auto dstMD = memory::desc(dm, dtype, dstFmt);
|
||||||
|
|
||||||
|
auto eg = this->getEngine();
|
||||||
|
auto src = memory(memory::primitive_desc(srcMD, eg), srcData);
|
||||||
|
auto dst = memory(memory::primitive_desc(dstMD, eg), dstData);
|
||||||
|
|
||||||
|
auto r = reorder(src, dst);
|
||||||
|
stream(stream::kind::eager).submit({r}).wait();
|
||||||
|
}
|
||||||
|
|
||||||
|
void MKLDNNMatrix::downSpatial() {
|
||||||
|
int fmt = getFormat();
|
||||||
|
if (!(fmt == memory::format::nchw || fmt == memory::format::oihw)) {
|
||||||
|
// only support nchw and oihw yet, later can support more like nhwc, ihwo
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// TODO(TJ): change H(height) and W(width) if support nhwc or more
|
||||||
|
const int H = 2, W = 3;
|
||||||
|
memory::dims srcDims = getDims();
|
||||||
|
if (srcDims[H] != 1 || srcDims[W] != 1) {
|
||||||
|
// can not down spatial
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
memory::dims dstDims = memory::dims{srcDims[0], srcDims[1]};
|
||||||
|
memory::format dstFmt;
|
||||||
|
switch (fmt) {
|
||||||
|
case memory::format::nchw:
|
||||||
|
dstFmt = memory::format::nc;
|
||||||
|
break;
|
||||||
|
case memory::format::oihw:
|
||||||
|
dstFmt = memory::format::oi;
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
LOG(FATAL) << "unsupported format";
|
||||||
|
}
|
||||||
|
memory::desc md = memory::desc(dstDims, getDtype(), dstFmt);
|
||||||
|
memory::primitive_desc pd = memory::primitive_desc(md, getEngine());
|
||||||
|
mkldnn_primitive_t result;
|
||||||
|
mkldnn::error::wrap_c_api(
|
||||||
|
mkldnn_primitive_create(&result, pd.get(), nullptr, nullptr),
|
||||||
|
"could not create a memory primitive");
|
||||||
|
reset(result);
|
||||||
|
set_data_handle(getData());
|
||||||
|
}
|
||||||
|
|
||||||
|
} // namespace paddle
|
||||||
@ -0,0 +1,148 @@
|
|||||||
|
/* Copyright (c) 2017 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
|
||||||
|
|
||||||
|
#include <vector>
|
||||||
|
#include "Matrix.h"
|
||||||
|
#include "mkldnn.hpp"
|
||||||
|
#include "paddle/parameter/Parameter.h"
|
||||||
|
|
||||||
|
namespace paddle {
|
||||||
|
|
||||||
|
class MKLDNNMatrix;
|
||||||
|
typedef std::shared_ptr<MKLDNNMatrix> MKLDNNMatrixPtr;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @brief MKLDNN Matrix.
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
class MKLDNNMatrix : public CpuMatrix, public mkldnn::memory {
|
||||||
|
public:
|
||||||
|
MKLDNNMatrix(real* data,
|
||||||
|
size_t height,
|
||||||
|
size_t width,
|
||||||
|
mkldnn::memory::primitive_desc pd)
|
||||||
|
: CpuMatrix(data, height, width, false), mkldnn::memory(pd, data) {}
|
||||||
|
|
||||||
|
~MKLDNNMatrix() {}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Create MKLDNNMatrix from a MatrixPtr and memory primitive_desc
|
||||||
|
*/
|
||||||
|
static MKLDNNMatrixPtr create(MatrixPtr m, mkldnn::memory::primitive_desc pd);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Create MKLDNNMatrix from a MatrixPtr and memory details info
|
||||||
|
*/
|
||||||
|
static MKLDNNMatrixPtr create(
|
||||||
|
MatrixPtr m,
|
||||||
|
mkldnn::memory::dims dims,
|
||||||
|
mkldnn::memory::format fmt,
|
||||||
|
mkldnn::engine& eg,
|
||||||
|
mkldnn::memory::data_type dtype = mkldnn::memory::data_type::f32);
|
||||||
|
|
||||||
|
public:
|
||||||
|
/**
|
||||||
|
* Reorder this MKLDNNMatrix from other format.
|
||||||
|
* Support inplace reorder.
|
||||||
|
* @note: this function would only reorder the data layout.
|
||||||
|
* will NOT change this original dim or format info
|
||||||
|
*/
|
||||||
|
void reorderDataFrom(const MKLDNNMatrixPtr& m,
|
||||||
|
memory::format srcFmt,
|
||||||
|
memory::dims targetDim);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Reorder this MKLDNNMatrix to other format.
|
||||||
|
* Support inplace reorder.
|
||||||
|
* @note: this function would only reorder the data layout.
|
||||||
|
* will NOT change the dst dim or format info
|
||||||
|
*/
|
||||||
|
void reorderDataTo(const MKLDNNMatrixPtr& m,
|
||||||
|
memory::format dstFmt,
|
||||||
|
memory::dims targetDim);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Dimensionality reduction.
|
||||||
|
* Change format "nchw --> nc" or "oihw --> oi" if the h and w are both 1
|
||||||
|
*/
|
||||||
|
void downSpatial();
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Update the memory data handle.
|
||||||
|
* Caution: This will not check the buffer size of the data,
|
||||||
|
* it should be coverd by user.
|
||||||
|
*/
|
||||||
|
void updateData(void* data) { set_data_handle(data); }
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get primitive descriptor.
|
||||||
|
*/
|
||||||
|
mkldnn::memory::primitive_desc getPrimitiveDesc() {
|
||||||
|
return this->get_primitive_desc();
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get memory descriptor.
|
||||||
|
*/
|
||||||
|
mkldnn::memory::desc getMemoryDesc() { return getPrimitiveDesc().desc(); }
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get dimensions.
|
||||||
|
*/
|
||||||
|
mkldnn::memory::dims getDims() {
|
||||||
|
mkldnn::memory::desc md = getMemoryDesc();
|
||||||
|
const int* src = md.data.dims;
|
||||||
|
int ndims = md.data.ndims;
|
||||||
|
mkldnn::memory::dims dst;
|
||||||
|
dst.resize(ndims);
|
||||||
|
for (int i = 0; i < ndims; ++i) {
|
||||||
|
dst[i] = src[i];
|
||||||
|
}
|
||||||
|
return dst;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get format.
|
||||||
|
*/
|
||||||
|
mkldnn::memory::format getFormat() {
|
||||||
|
return (mkldnn::memory::format)(getMemoryDesc().data.format);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get memory data type.
|
||||||
|
*/
|
||||||
|
mkldnn::memory::data_type getDtype() {
|
||||||
|
return (mkldnn::memory::data_type)(getMemoryDesc().data.data_type);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get engine.
|
||||||
|
*/
|
||||||
|
mkldnn::engine getEngine() { return getPrimitiveDesc().get_engine(); }
|
||||||
|
|
||||||
|
protected:
|
||||||
|
/**
|
||||||
|
* Do reorder once.
|
||||||
|
* Can support inplace.
|
||||||
|
*/
|
||||||
|
void reorderOnce(void* srcData,
|
||||||
|
void* dstData,
|
||||||
|
memory::format srcFmt,
|
||||||
|
memory::format dstFmt,
|
||||||
|
memory::dims dm);
|
||||||
|
};
|
||||||
|
|
||||||
|
} // namespace paddle
|
||||||
Loading…
Reference in new issue