You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mxnet.apache.org by GitBox <gi...@apache.org> on 2020/03/19 14:52:06 UTC
[GitHub] [incubator-mxnet] Tommliu opened a new pull request #17873:
ffi_array_split, v/h/dsplit
Tommliu opened a new pull request #17873: ffi_array_split, v/h/dsplit
URL: https://github.com/apache/incubator-mxnet/pull/17873
## Description ##
FFI imperative invocation for operator : array_split, vsplit , hsplit and dsplit
| Numpy Operator | Old FFI (ctypes) (us) | New FFI (cython) (us) |
|------------------|-------------------------|-------------------------|
| array_split | 40.63 | 25.9 |
| vsplit | 47.03 | 25.81 |
| hsplit | 44.34 | 25.72 |
| dsplit | 47.29 | 25.98 |
## Checklist ##
### Essentials ###
Please feel free to remove inapplicable items for your PR.
- [ ] The PR title starts with [MXNET-$JIRA_ID], where $JIRA_ID refers to the relevant [JIRA issue](https://issues.apache.org/jira/projects/MXNET/issues) created (except PRs with tiny changes)
- [ ] Changes are complete (i.e. I finished coding on this PR)
- [ ] All changes have test coverage:
- Unit tests are added for small changes to verify correctness (e.g. adding a new operator)
- Nightly tests are added for complicated/long-running ones (e.g. changing distributed kvstore)
- Build tests will be added for build configuration changes (e.g. adding a new build option with NCCL)
- [ ] Code is well-documented:
- For user-facing API changes, API doc string has been updated.
- For new C++ functions in header files, their functionalities and arguments are documented.
- For new examples, README.md is added to explain the what the example does, the source of the dataset, expected performance on test set and reference to the original paper if applicable
- Check the API doc at https://mxnet-ci-doc.s3-accelerate.dualstack.amazonaws.com/PR-$PR_ID/$BUILD_ID/index.html
- [ ] To the best of my knowledge, examples are either not affected by this change, or have been fixed to be compatible with this change
### Changes ###
- [ ] Feature1, tests, (and when applicable, API doc)
- [ ] Feature2, tests, (and when applicable, API doc)
## Comments ##
- If this change is a backward incompatible change, why must this change be made.
- Interesting edge cases to note here
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
[GitHub] [incubator-mxnet] mxnet-bot commented on issue #17873: [Numpy] FFI:
array_split, v/h/dsplit
Posted by GitBox <gi...@apache.org>.
mxnet-bot commented on issue #17873: [Numpy] FFI: array_split, v/h/dsplit
URL: https://github.com/apache/incubator-mxnet/pull/17873#issuecomment-603635998
Jenkins CI successfully triggered : [windows-gpu]
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
[GitHub] [incubator-mxnet] mxnet-bot commented on issue #17873: [Numpy] FFI:
array_split, v/h/dsplit
Posted by GitBox <gi...@apache.org>.
mxnet-bot commented on issue #17873: [Numpy] FFI: array_split, v/h/dsplit
URL: https://github.com/apache/incubator-mxnet/pull/17873#issuecomment-603602724
Jenkins CI successfully triggered : [windows-gpu]
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
[GitHub] [incubator-mxnet] mxnet-bot commented on issue #17873: [Numpy] FFI:
array_split, v/h/dsplit
Posted by GitBox <gi...@apache.org>.
mxnet-bot commented on issue #17873: [Numpy] FFI: array_split, v/h/dsplit
URL: https://github.com/apache/incubator-mxnet/pull/17873#issuecomment-603673302
Jenkins CI successfully triggered : [windows-gpu]
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
[GitHub] [incubator-mxnet] Tommliu commented on issue #17873: [Numpy] FFI:
array_split, v/h/dsplit
Posted by GitBox <gi...@apache.org>.
Tommliu commented on issue #17873: [Numpy] FFI: array_split, v/h/dsplit
URL: https://github.com/apache/incubator-mxnet/pull/17873#issuecomment-603602700
@mxnet-bot run ci [windows-gpu]
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
[GitHub] [incubator-mxnet] Tommliu commented on issue #17873: [Numpy] FFI:
array_split, v/h/dsplit
Posted by GitBox <gi...@apache.org>.
Tommliu commented on issue #17873: [Numpy] FFI: array_split, v/h/dsplit
URL: https://github.com/apache/incubator-mxnet/pull/17873#issuecomment-604193210
@mxnet-bot run ci [windows-gpu]
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
[GitHub] [incubator-mxnet] haojin2 commented on issue #17873: [Numpy] FFI:
array_split, v/h/dsplit
Posted by GitBox <gi...@apache.org>.
haojin2 commented on issue #17873: [Numpy] FFI: array_split, v/h/dsplit
URL: https://github.com/apache/incubator-mxnet/pull/17873#issuecomment-603981805
@mxnet-bot run ci [windows-gpu]
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
[GitHub] [incubator-mxnet] mxnet-bot commented on issue #17873: [Numpy] FFI:
array_split, v/h/dsplit
Posted by GitBox <gi...@apache.org>.
mxnet-bot commented on issue #17873: [Numpy] FFI: array_split, v/h/dsplit
URL: https://github.com/apache/incubator-mxnet/pull/17873#issuecomment-604193240
Jenkins CI successfully triggered : [windows-gpu]
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
[GitHub] [incubator-mxnet] Tommliu commented on issue #17873: [Numpy] FFI:
array_split, v/h/dsplit
Posted by GitBox <gi...@apache.org>.
Tommliu commented on issue #17873: [Numpy] FFI: array_split, v/h/dsplit
URL: https://github.com/apache/incubator-mxnet/pull/17873#issuecomment-603673264
@mxnet-bot run ci [windows-gpu]
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
[GitHub] [incubator-mxnet] hzfan commented on a change in pull request
#17873: [Numpy] FFI: array_split, v/h/dsplit
Posted by GitBox <gi...@apache.org>.
hzfan commented on a change in pull request #17873: [Numpy] FFI: array_split, v/h/dsplit
URL: https://github.com/apache/incubator-mxnet/pull/17873#discussion_r395423393
##########
File path: src/api/operator/numpy/np_matrix_op.cc
##########
@@ -142,4 +142,158 @@ MXNET_REGISTER_API("_npi.rot90")
*ret = ndoutputs[0];
});
+MXNET_REGISTER_API("_npi.array_split")
+.set_body([](runtime::MXNetArgs args, runtime::MXNetRetValue* ret) {
+ using namespace runtime;
+ static const nnvm::Op* op = Op::Get("_npi_array_split");
+ nnvm::NodeAttrs attrs;
+ op::SplitParam param;
+ param.axis = args[2].operator int();
+ param.squeeze_axis = false;
+ if (args[1].type_code() == kDLInt) {
+ param.indices = TShape(0, 0);
+ param.sections = args[1].operator int();
+ CHECK_GT(param.sections, 0)
Review comment:
Do we need to check `shape[axis] % param.sections == 0`? like https://github.com/apache/incubator-mxnet/pull/17873/files#diff-21ec839e5c3e65fe0e31e75da91d4996R196
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
[GitHub] [incubator-mxnet] mxnet-bot commented on issue #17873: [Numpy] FFI:
array_split, v/h/dsplit
Posted by GitBox <gi...@apache.org>.
mxnet-bot commented on issue #17873: [Numpy] FFI: array_split, v/h/dsplit
URL: https://github.com/apache/incubator-mxnet/pull/17873#issuecomment-603981860
Jenkins CI successfully triggered : [windows-gpu]
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
[GitHub] [incubator-mxnet] hzfan commented on a change in pull request
#17873: [Numpy] FFI: array_split, v/h/dsplit
Posted by GitBox <gi...@apache.org>.
hzfan commented on a change in pull request #17873: [Numpy] FFI: array_split, v/h/dsplit
URL: https://github.com/apache/incubator-mxnet/pull/17873#discussion_r395423638
##########
File path: src/api/operator/numpy/np_matrix_op.cc
##########
@@ -142,4 +142,158 @@ MXNET_REGISTER_API("_npi.rot90")
*ret = ndoutputs[0];
});
+MXNET_REGISTER_API("_npi.array_split")
+.set_body([](runtime::MXNetArgs args, runtime::MXNetRetValue* ret) {
+ using namespace runtime;
+ static const nnvm::Op* op = Op::Get("_npi_array_split");
+ nnvm::NodeAttrs attrs;
+ op::SplitParam param;
+ param.axis = args[2].operator int();
+ param.squeeze_axis = false;
+ if (args[1].type_code() == kDLInt) {
+ param.indices = TShape(0, 0);
+ param.sections = args[1].operator int();
+ CHECK_GT(param.sections, 0)
+ << "ValueError: number sections must be larger than 0";
+ } else {
+ TShape t = TShape(args[1].operator ObjectRef());
+ param.indices = TShape(t.ndim() + 1, 0);
+ for (int i = 0; i < t.ndim(); ++i) {
+ param.indices[i + 1] = t[i];
+ }
+ param.sections = 0;
+ }
+ attrs.parsed = std::move(param);
+ attrs.op = op;
+ SetAttrDict<op::SplitParam>(&attrs);
+ NDArray* inputs[] = {args[0].operator mxnet::NDArray*()};
+ int num_inputs = 1;
+ int num_outputs = 0;
+ auto ndoutputs = Invoke(op, &attrs, num_inputs, inputs, &num_outputs, nullptr);
+ std::vector<NDArrayHandle> ndarray_handles;
+ ndarray_handles.reserve(num_outputs);
+ for (int i = 0; i < num_outputs; ++i) {
+ ndarray_handles.emplace_back(ndoutputs[i]);
+ }
+ *ret = ADT(0, ndarray_handles.begin(), ndarray_handles.end());
+});
+
+MXNET_REGISTER_API("_npi.dsplit")
+.set_body([](runtime::MXNetArgs args, runtime::MXNetRetValue* ret) {
+ using namespace runtime;
+ static const nnvm::Op* op = Op::Get("_npi_split");
+ int num_inputs = 1;
+ NDArray* inputs[] = {args[0].operator mxnet::NDArray*()};
+ CHECK_GE(inputs[0]->shape().ndim(), 3)
+ << "ValueError: dsplit only works on arrays of 3 or more dimensions";
+ nnvm::NodeAttrs attrs;
+ op::SplitParam param;
+ param.axis = 2;
+ param.squeeze_axis = false;
+ if (args[1].type_code() == kDLInt) {
+ param.indices = TShape(0, 0);
+ param.sections = args[1].operator int();
+ CHECK_EQ(inputs[0]->shape()[2] % param.sections, 0)
+ << "ValueError: array split does not result in an equal division";
+ CHECK_GT(param.sections, 0)
+ << "ValueError: number sections must be larger than 0";
+ } else {
+ TShape t = TShape(args[1].operator ObjectRef());
+ param.indices = TShape(t.ndim() + 1, 0);
+ for (int i = 0; i < t.ndim(); ++i) {
+ param.indices[i + 1] = t[i];
+ }
+ param.sections = 0;
+ }
+ attrs.parsed = std::move(param);
+ attrs.op = op;
+ SetAttrDict<op::SplitParam>(&attrs);
+ int num_outputs = 0;
+ auto ndoutputs = Invoke(op, &attrs, num_inputs, inputs, &num_outputs, nullptr);
+ std::vector<NDArrayHandle> ndarray_handles;
+ ndarray_handles.reserve(num_outputs);
+ for (int i = 0; i < num_outputs; ++i) {
+ ndarray_handles.emplace_back(ndoutputs[i]);
+ }
+ *ret = ADT(0, ndarray_handles.begin(), ndarray_handles.end());
+});
+
+MXNET_REGISTER_API("_npi.hsplit")
+.set_body([](runtime::MXNetArgs args, runtime::MXNetRetValue* ret) {
+ using namespace runtime;
+ static const nnvm::Op* op = Op::Get("_npi_hsplit");
+ int num_inputs = 1;
+ NDArray* inputs[] = {args[0].operator mxnet::NDArray*()};
+ CHECK_GE(inputs[0]->shape().ndim(), 1)
+ << "ValueError: hsplit only works on arrays of 1 or more dimensions";
+ nnvm::NodeAttrs attrs;
+ op::SplitParam param;
+ param.axis = 0;
+ param.squeeze_axis = false;
+ if (args[1].type_code() == kDLInt) {
+ param.indices = TShape(0, 0);
+ param.sections = args[1].operator int();
+ CHECK_GT(param.sections, 0)
Review comment:
Same. Do we need to check `shape[axis] % sections == 0`?
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
[GitHub] [incubator-mxnet] Tommliu commented on issue #17873: [Numpy] FFI:
array_split, v/h/dsplit
Posted by GitBox <gi...@apache.org>.
Tommliu commented on issue #17873: [Numpy] FFI: array_split, v/h/dsplit
URL: https://github.com/apache/incubator-mxnet/pull/17873#issuecomment-603635980
@mxnet-bot run ci [windows-gpu]
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
[GitHub] [incubator-mxnet] Tommliu commented on a change in pull request
#17873: [Numpy] FFI: array_split, v/h/dsplit
Posted by GitBox <gi...@apache.org>.
Tommliu commented on a change in pull request #17873: [Numpy] FFI: array_split, v/h/dsplit
URL: https://github.com/apache/incubator-mxnet/pull/17873#discussion_r395436651
##########
File path: src/api/operator/numpy/np_matrix_op.cc
##########
@@ -142,4 +142,158 @@ MXNET_REGISTER_API("_npi.rot90")
*ret = ndoutputs[0];
});
+MXNET_REGISTER_API("_npi.array_split")
+.set_body([](runtime::MXNetArgs args, runtime::MXNetRetValue* ret) {
+ using namespace runtime;
+ static const nnvm::Op* op = Op::Get("_npi_array_split");
+ nnvm::NodeAttrs attrs;
+ op::SplitParam param;
+ param.axis = args[2].operator int();
+ param.squeeze_axis = false;
+ if (args[1].type_code() == kDLInt) {
+ param.indices = TShape(0, 0);
+ param.sections = args[1].operator int();
+ CHECK_GT(param.sections, 0)
Review comment:
**_array_split_** support such split which is different from **_split_**
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
[GitHub] [incubator-mxnet] Tommliu commented on issue #17873: [Numpy] FFI:
array_split, v/h/dsplit
Posted by GitBox <gi...@apache.org>.
Tommliu commented on issue #17873: [Numpy] FFI: array_split, v/h/dsplit
URL: https://github.com/apache/incubator-mxnet/pull/17873#issuecomment-610187502
@mxnet-bot run ci [windows-gpu]
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
[GitHub] [incubator-mxnet] Tommliu commented on a change in pull request
#17873: [Numpy] FFI: array_split, v/h/dsplit
Posted by GitBox <gi...@apache.org>.
Tommliu commented on a change in pull request #17873: [Numpy] FFI: array_split, v/h/dsplit
URL: https://github.com/apache/incubator-mxnet/pull/17873#discussion_r395436822
##########
File path: src/api/operator/numpy/np_matrix_op.cc
##########
@@ -142,4 +142,158 @@ MXNET_REGISTER_API("_npi.rot90")
*ret = ndoutputs[0];
});
+MXNET_REGISTER_API("_npi.array_split")
+.set_body([](runtime::MXNetArgs args, runtime::MXNetRetValue* ret) {
+ using namespace runtime;
+ static const nnvm::Op* op = Op::Get("_npi_array_split");
+ nnvm::NodeAttrs attrs;
+ op::SplitParam param;
+ param.axis = args[2].operator int();
+ param.squeeze_axis = false;
+ if (args[1].type_code() == kDLInt) {
+ param.indices = TShape(0, 0);
+ param.sections = args[1].operator int();
+ CHECK_GT(param.sections, 0)
+ << "ValueError: number sections must be larger than 0";
+ } else {
+ TShape t = TShape(args[1].operator ObjectRef());
+ param.indices = TShape(t.ndim() + 1, 0);
+ for (int i = 0; i < t.ndim(); ++i) {
+ param.indices[i + 1] = t[i];
+ }
+ param.sections = 0;
+ }
+ attrs.parsed = std::move(param);
+ attrs.op = op;
+ SetAttrDict<op::SplitParam>(&attrs);
+ NDArray* inputs[] = {args[0].operator mxnet::NDArray*()};
+ int num_inputs = 1;
+ int num_outputs = 0;
+ auto ndoutputs = Invoke(op, &attrs, num_inputs, inputs, &num_outputs, nullptr);
+ std::vector<NDArrayHandle> ndarray_handles;
+ ndarray_handles.reserve(num_outputs);
+ for (int i = 0; i < num_outputs; ++i) {
+ ndarray_handles.emplace_back(ndoutputs[i]);
+ }
+ *ret = ADT(0, ndarray_handles.begin(), ndarray_handles.end());
+});
+
+MXNET_REGISTER_API("_npi.dsplit")
+.set_body([](runtime::MXNetArgs args, runtime::MXNetRetValue* ret) {
+ using namespace runtime;
+ static const nnvm::Op* op = Op::Get("_npi_split");
+ int num_inputs = 1;
+ NDArray* inputs[] = {args[0].operator mxnet::NDArray*()};
+ CHECK_GE(inputs[0]->shape().ndim(), 3)
+ << "ValueError: dsplit only works on arrays of 3 or more dimensions";
+ nnvm::NodeAttrs attrs;
+ op::SplitParam param;
+ param.axis = 2;
+ param.squeeze_axis = false;
+ if (args[1].type_code() == kDLInt) {
+ param.indices = TShape(0, 0);
+ param.sections = args[1].operator int();
+ CHECK_EQ(inputs[0]->shape()[2] % param.sections, 0)
+ << "ValueError: array split does not result in an equal division";
+ CHECK_GT(param.sections, 0)
+ << "ValueError: number sections must be larger than 0";
+ } else {
+ TShape t = TShape(args[1].operator ObjectRef());
+ param.indices = TShape(t.ndim() + 1, 0);
+ for (int i = 0; i < t.ndim(); ++i) {
+ param.indices[i + 1] = t[i];
+ }
+ param.sections = 0;
+ }
+ attrs.parsed = std::move(param);
+ attrs.op = op;
+ SetAttrDict<op::SplitParam>(&attrs);
+ int num_outputs = 0;
+ auto ndoutputs = Invoke(op, &attrs, num_inputs, inputs, &num_outputs, nullptr);
+ std::vector<NDArrayHandle> ndarray_handles;
+ ndarray_handles.reserve(num_outputs);
+ for (int i = 0; i < num_outputs; ++i) {
+ ndarray_handles.emplace_back(ndoutputs[i]);
+ }
+ *ret = ADT(0, ndarray_handles.begin(), ndarray_handles.end());
+});
+
+MXNET_REGISTER_API("_npi.hsplit")
+.set_body([](runtime::MXNetArgs args, runtime::MXNetRetValue* ret) {
+ using namespace runtime;
+ static const nnvm::Op* op = Op::Get("_npi_hsplit");
+ int num_inputs = 1;
+ NDArray* inputs[] = {args[0].operator mxnet::NDArray*()};
+ CHECK_GE(inputs[0]->shape().ndim(), 1)
+ << "ValueError: hsplit only works on arrays of 1 or more dimensions";
+ nnvm::NodeAttrs attrs;
+ op::SplitParam param;
+ param.axis = 0;
+ param.squeeze_axis = false;
+ if (args[1].type_code() == kDLInt) {
+ param.indices = TShape(0, 0);
+ param.sections = args[1].operator int();
+ CHECK_GT(param.sections, 0)
Review comment:
This check has been placed in the _hsplit forward function_
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
[GitHub] [incubator-mxnet] mxnet-bot commented on issue #17873: [Numpy] FFI:
array_split, v/h/dsplit
Posted by GitBox <gi...@apache.org>.
mxnet-bot commented on issue #17873: [Numpy] FFI: array_split, v/h/dsplit
URL: https://github.com/apache/incubator-mxnet/pull/17873#issuecomment-610187549
Jenkins CI successfully triggered : [windows-gpu]
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
[GitHub] [incubator-mxnet] haojin2 merged pull request #17873: [Numpy] FFI:
array_split, v/h/dsplit
Posted by GitBox <gi...@apache.org>.
haojin2 merged pull request #17873: [Numpy] FFI: array_split, v/h/dsplit
URL: https://github.com/apache/incubator-mxnet/pull/17873
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services