forked from apache/mxnet
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[Numpy] FFI: sort, argsort, vstack etc (apache#17857)
* * sort FFI * * argsort FFI * * vstack, row_stack FFI * * greater FFI * * inner FFI * multinomial FFI * rand FFI * randn FFI * * Fix input out of index and rscalar of greater * * Fix ndarray situation * * Fix sanity * fix lint * fix bugs * * Remove duplicate operator (greater) * * Fix Tuple downcast Error (Only Integer) * Fix segmentation fault(pointer) Co-authored-by: Sheng Zha <zhasheng@amazon.com>
- Loading branch information
Showing
9 changed files
with
232 additions
and
17 deletions.
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
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
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,88 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. The ASF licenses this file | ||
| * to you 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. | ||
| */ | ||
|
|
||
| /*! | ||
| * \file np_ordering_op.cc | ||
| * \brief Implementation of the API of functions in src/operator/tensor/ordering_op.cc | ||
| */ | ||
| #include <mxnet/api_registry.h> | ||
| #include <mxnet/runtime/packed_func.h> | ||
| #include "../utils.h" | ||
| #include "../../../operator/tensor/ordering_op-inl.h" | ||
|
|
||
| namespace mxnet { | ||
|
|
||
| MXNET_REGISTER_API("_npi.sort") | ||
| .set_body([](runtime::MXNetArgs args, runtime::MXNetRetValue* ret) { | ||
| using namespace runtime; | ||
| const nnvm::Op* op = Op::Get("_npi_sort"); | ||
| nnvm::NodeAttrs attrs; | ||
| op::SortParam param; | ||
|
|
||
| if (args[1].type_code() == kNull) { | ||
| param.axis = dmlc::nullopt; | ||
| } else { | ||
| param.axis = args[1].operator int(); | ||
| } | ||
| param.is_ascend = true; | ||
|
|
||
| attrs.parsed = std::move(param); | ||
| attrs.op = op; | ||
|
|
||
| int num_inputs = 1; | ||
| NDArray* inputs[] = {args[0].operator mxnet::NDArray*()}; | ||
|
|
||
| int num_outputs = 0; | ||
| SetAttrDict<op::SortParam>(&attrs); | ||
| auto ndoutputs = Invoke(op, &attrs, num_inputs, inputs, &num_outputs, nullptr); | ||
| *ret = reinterpret_cast<mxnet::NDArray*>(ndoutputs[0]); | ||
| }); | ||
|
|
||
| MXNET_REGISTER_API("_npi.argsort") | ||
| .set_body([](runtime::MXNetArgs args, runtime::MXNetRetValue* ret) { | ||
| using namespace runtime; | ||
| const nnvm::Op* op = Op::Get("_npi_argsort"); | ||
| nnvm::NodeAttrs attrs; | ||
| op::ArgSortParam param; | ||
|
|
||
| if (args[1].type_code() == kNull) { | ||
| param.axis = dmlc::nullopt; | ||
| } else { | ||
| param.axis = args[1].operator int(); | ||
| } | ||
| param.is_ascend = true; | ||
| if (args[3].type_code() == kNull) { | ||
| param.dtype = mshadow::kFloat32; | ||
| } else { | ||
| param.dtype = String2MXNetTypeWithBool(args[3].operator std::string()); | ||
| } | ||
|
|
||
| attrs.parsed = std::move(param); | ||
| attrs.op = op; | ||
|
|
||
| int num_inputs = 1; | ||
| NDArray* inputs[] = {args[0].operator mxnet::NDArray*()}; | ||
|
|
||
| int num_outputs = 0; | ||
| SetAttrDict<op::ArgSortParam>(&attrs); | ||
| auto ndoutputs = Invoke(op, &attrs, num_inputs, inputs, &num_outputs, nullptr); | ||
| *ret = reinterpret_cast<mxnet::NDArray*>(ndoutputs[0]); | ||
| }); | ||
|
|
||
| } // 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,75 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. The ASF licenses this file | ||
| * to you 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. | ||
| */ | ||
|
|
||
| /*! | ||
| * \file np_multinomial_op.cc | ||
| * \brief Implementation of the API of functions in src/operator/numpy/random/np_multinomial_op.cc | ||
| */ | ||
| #include <mxnet/api_registry.h> | ||
| #include <mxnet/runtime/packed_func.h> | ||
| #include <vector> | ||
| #include "../../utils.h" | ||
| #include "../../../../operator/numpy/random/np_multinomial_op.h" | ||
|
|
||
| namespace mxnet { | ||
|
|
||
| MXNET_REGISTER_API("_npi.multinomial") | ||
| .set_body([](runtime::MXNetArgs args, runtime::MXNetRetValue* ret) { | ||
| using namespace runtime; | ||
| const nnvm::Op* op = Op::Get("_npi_multinomial"); | ||
| nnvm::NodeAttrs attrs; | ||
| op::NumpyMultinomialParam param; | ||
| NDArray** inputs = new NDArray*[1](); | ||
| int num_inputs = 0; | ||
|
|
||
| // parse int | ||
| param.n = args[0].operator int(); | ||
|
|
||
| // parse pvals | ||
| if (args[1].type_code() == kNull) { | ||
| param.pvals = dmlc::nullopt; | ||
| } else if (args[1].type_code() == kNDArrayHandle) { | ||
| param.pvals = dmlc::nullopt; | ||
| inputs[0] = args[1].operator mxnet::NDArray*(); | ||
| num_inputs = 1; | ||
| } else { | ||
| param.pvals = Obj2Tuple<double, Float>(args[1].operator ObjectRef()); | ||
| } | ||
|
|
||
| // parse size | ||
| if (args[2].type_code() == kNull) { | ||
| param.size = dmlc::nullopt; | ||
| } else { | ||
| if (args[2].type_code() == kDLInt) { | ||
| param.size = mxnet::Tuple<int>(1, args[2].operator int64_t()); | ||
| } else { | ||
| param.size = mxnet::Tuple<int>(args[2].operator ObjectRef()); | ||
| } | ||
| } | ||
|
|
||
| attrs.parsed = std::move(param); | ||
| attrs.op = op; | ||
| SetAttrDict<op::NumpyMultinomialParam>(&attrs); | ||
| inputs = num_inputs == 0 ? nullptr : inputs; | ||
| int num_outputs = 0; | ||
| auto ndoutputs = Invoke(op, &attrs, num_inputs, inputs, &num_outputs, nullptr); | ||
| *ret = ndoutputs[0]; | ||
| }); | ||
|
|
||
| } // 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
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