This repository has been archived by the owner on Nov 17, 2023. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 6.8k
add symbol.SwapAxis operator, just can do Forward(). #502
Closed
Closed
Changes from all commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
4d749bb
add swapaxis
ab19122
symbol.SwapAxis can run now, but not sure whether work ok.
0ca99da
finished forward and backward of symbol.SwapAxis.but still need more …
1dd6ada
disable the debug out.
1a2dc81
fixed a bug in Backward.
a0ec24d
add myself into CONTRIBUTORS.md.
23cfadc
add test_SwapAxis in file test_operator.py. remove the debug info in …
fcd62fd
make code be google style. remove std::accumulate which nvcc doesnot …
a21d3be
perfect the codes.
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Submodule mshadow
updated
9 files
+3 −3 | doc/README.md | |
+2 −0 | guide/basic.cpp | |
+1 −0 | mshadow/base.h | |
+7 −7 | mshadow/cuda/tensor_gpu-inl.cuh | |
+57 −3 | mshadow/dot_engine-inl.h | |
+1 −0 | mshadow/extension.h | |
+156 −0 | mshadow/extension/slice.h | |
+11 −0 | mshadow/tensor.h | |
+13 −9 | mshadow/tensor_cpu-inl.h |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,197 @@ | ||
/*! | ||
* Copyright (c) 2015 by Contributors | ||
* \file swapaxis-inl.h | ||
* \brief | ||
* \author Ming Zhang | ||
*/ | ||
#ifndef MXNET_OPERATOR_SWAPAXIS_INL_H_ | ||
#define MXNET_OPERATOR_SWAPAXIS_INL_H_ | ||
|
||
#include <dmlc/logging.h> | ||
#include <dmlc/parameter.h> | ||
#include <mxnet/operator.h> | ||
#include <algorithm> | ||
#include <map> | ||
#include <vector> | ||
#include <string> | ||
#include <utility> | ||
#include "./operator_common.h" | ||
|
||
namespace mxnet { | ||
namespace op { | ||
|
||
struct SwapAxis{ | ||
enum SwapAxisOpInputs {kData}; | ||
enum SwapAxisOpOutputs {kOut}; | ||
}; | ||
|
||
using namespace mshadow; | ||
using namespace mshadow::expr; | ||
|
||
struct SwapAxisParam : public dmlc::Parameter<SwapAxisParam> { | ||
// use int for enumeration | ||
uint32_t dim1, dim2; | ||
DMLC_DECLARE_PARAMETER(SwapAxisParam) { | ||
DMLC_DECLARE_FIELD(dim1) | ||
.set_default(0) | ||
.describe("the first axis to be swapped."); | ||
DMLC_DECLARE_FIELD(dim2) | ||
.set_default(0) | ||
.describe("the second axis to be swapped."); | ||
} | ||
}; | ||
|
||
|
||
template<typename xpu> | ||
class SwapAxisOp : public Operator { | ||
public: | ||
explicit SwapAxisOp(SwapAxisParam p) { | ||
CHECK_NE(p.dim1, p.dim2) << "dim1 can not be equal dim2."; | ||
this->param_ = p; | ||
} | ||
|
||
void Reshape2Five(Shape<5> *inter_shape, const TShape &shape, uint32_t dim1, uint32_t dim2) { | ||
index_t ndim_in = shape.ndim(); | ||
int si; | ||
|
||
if (dim1 > dim2) { | ||
std::swap(dim1, dim2); | ||
} | ||
|
||
for (si = 0; si < 5; si++) { | ||
(*inter_shape)[si] = 1; | ||
} | ||
// dim_0 | ||
for (si = 0; si < dim1; si++) { | ||
(*inter_shape)[0] *= shape[si]; | ||
} | ||
// dim_1 | ||
(*inter_shape)[1] = shape[dim1]; | ||
// dim_2 | ||
for (si = dim1 + 1; si < dim2; si++) { | ||
(*inter_shape)[2] *= shape[si]; | ||
} | ||
// dim_3 | ||
(*inter_shape)[3] = shape[dim2]; | ||
// dim_4 | ||
for (si = dim2 + 1; si < ndim_in; si++) { | ||
(*inter_shape)[4] *= shape[si]; | ||
} | ||
} | ||
|
||
void SwapAxis(Stream<xpu> *s, | ||
const std::vector<TBlob> &in_data, | ||
const std::vector<TBlob> &out_data) { | ||
uint32_t dim1 = param_.dim1; | ||
uint32_t dim2 = param_.dim2; | ||
|
||
TBlob data_in = in_data[SwapAxis::kData]; | ||
TBlob data_out = out_data[SwapAxis::kData]; | ||
|
||
TShape shape_in = data_in.shape_; | ||
TShape shape_out = data_out.shape_; | ||
|
||
Shape<5> inter_shape; | ||
|
||
Reshape2Five(&inter_shape, shape_in, dim1, dim2); | ||
|
||
Tensor<xpu, 5> inter_data_in = data_in.get_with_shape<xpu, 5, real_t>(inter_shape, s); | ||
|
||
Shape<5> inter_shape2 = inter_shape; | ||
std::swap(inter_shape2[1], inter_shape2[3]); | ||
|
||
Tensor<xpu, 5> inter_data_out = data_out.get_with_shape<xpu, 5, real_t>(inter_shape2, s); | ||
|
||
inter_data_out = swapaxis<3, 1>(inter_data_in); | ||
} | ||
|
||
virtual void Forward(const OpContext &ctx, | ||
const std::vector<TBlob> &in_data, | ||
const std::vector<OpReqType> &req, | ||
const std::vector<TBlob> &out_data, | ||
const std::vector<TBlob> &aux_args) { | ||
Stream<xpu> *s = ctx.get_stream<xpu>(); | ||
|
||
SwapAxis(s, in_data, out_data); | ||
} | ||
|
||
virtual void Backward(const OpContext &ctx, | ||
const std::vector<TBlob> &out_grad, | ||
const std::vector<TBlob> &in_data, | ||
const std::vector<TBlob> &out_data, | ||
const std::vector<OpReqType> &req, | ||
const std::vector<TBlob> &in_grad, | ||
const std::vector<TBlob> &aux_args) { | ||
Stream<xpu> *s = ctx.get_stream<xpu>(); | ||
SwapAxis(s, out_grad, in_grad); | ||
} | ||
|
||
SwapAxisParam param_; | ||
}; | ||
|
||
|
||
template<typename xpu> | ||
Operator* CreateOp(SwapAxisParam param); | ||
|
||
|
||
#if DMLC_USE_CXX11 | ||
class SwapAxisProp : public OperatorProperty { | ||
public: | ||
std::vector<std::string> ListArguments() const override { | ||
return {"data"}; | ||
} | ||
|
||
void Init(const std::vector<std::pair<std::string, std::string> >& kwargs) override { | ||
param_.Init(kwargs); | ||
} | ||
|
||
std::map<std::string, std::string> GetParams() const override { | ||
return param_.__DICT__(); | ||
} | ||
|
||
bool InferShape(std::vector<TShape> *in_shape, | ||
std::vector<TShape> *out_shape, | ||
std::vector<TShape> *aux_shape) const override { | ||
CHECK_EQ(in_shape->size(), 1); | ||
|
||
TShape &shape0 = (*in_shape)[SwapAxis::kData]; | ||
out_shape->clear(); | ||
out_shape->push_back(shape0); | ||
TShape &shape1 = (*out_shape)[SwapAxis::kOut]; | ||
|
||
std::swap(shape1[param_.dim1], shape1[param_.dim2]); | ||
|
||
return true; | ||
} | ||
|
||
OperatorProperty* Copy() const override { | ||
auto ptr = new SwapAxisProp(); | ||
ptr->param_ = param_; | ||
return ptr; | ||
} | ||
|
||
std::string TypeString() const override { | ||
return "SwapAxis"; | ||
} | ||
|
||
std::vector<int> DeclareBackwardDependency( | ||
const std::vector<int> &out_grad, | ||
const std::vector<int> &in_data, | ||
const std::vector<int> &out_data) const override { | ||
return {out_grad[SwapAxis::kOut]}; | ||
}; | ||
|
||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. remove the commented fields |
||
Operator* CreateOperator(Context ctx) const override; | ||
|
||
private: | ||
SwapAxisParam param_; | ||
}; // class SwapAxisProp | ||
#endif // DMLC_USE_CXX11 | ||
|
||
|
||
} // namespace op | ||
} // namespace mxnet | ||
|
||
#endif // MXNET_OPERATOR_SWAPAXIS_INL_H_ | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,30 @@ | ||
/*! | ||
* Copyright (c) 2015 by Contributors | ||
* \file swapaxis.cc | ||
* \brief | ||
* \author Ming Zhang | ||
*/ | ||
|
||
#include "./swapaxis-inl.h" | ||
|
||
namespace mxnet { | ||
namespace op { | ||
|
||
template<> | ||
Operator* CreateOp<cpu>(SwapAxisParam param) { | ||
return new SwapAxisOp<cpu>(param); | ||
} | ||
|
||
Operator* SwapAxisProp::CreateOperator(Context ctx) const { | ||
DO_BIND_DISPATCH(CreateOp, param_); | ||
} | ||
|
||
|
||
DMLC_REGISTER_PARAMETER(SwapAxisParam); | ||
|
||
MXNET_REGISTER_OP_PROPERTY(SwapAxis, SwapAxisProp) | ||
.add_argument("data", "Symbol", "Input data to the SwapAxisOp.") | ||
.add_arguments(SwapAxisParam::__FIELDS__()) | ||
.describe("Apply swapaxis to input."); | ||
} // namespace op | ||
} // namespace mxnet |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,20 @@ | ||
/*! | ||
* Copyright (c) 2015 by Contributors | ||
* \file swapaxis.cu | ||
* \brief | ||
* \author Ming Zhang | ||
*/ | ||
|
||
#include "./swapaxis-inl.h" | ||
|
||
namespace mxnet { | ||
namespace op { | ||
|
||
template<> | ||
Operator *CreateOp<gpu>(SwapAxisParam param) { | ||
return new SwapAxisOp<gpu>(param); | ||
} | ||
|
||
} // namespace op | ||
} // namespace mxnet | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
override DeclarebackwardDependency