saymrwulf/onnxruntime
1
0
Fork 0
mirror of https://github.com/saymrwulf/onnxruntime.git synced 2026-07-30 20:18:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix C header to stop people accidentally copying the OrtApi by value (#12297)

Browse source 
* Fix C header to stop people accidentally copying the OrtApi by value
* Remove api_ from KernelTwo
This commit is contained in:
Ryan Hill 2022-07-25 19:19:40 -07:00 committed by GitHub
parent c40f73ae0c
commit 3e014a5e5d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
13 changed files with 22 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
include/onnxruntime/core/session/onnxruntime_c_api.h
View file

@ -3495,6 +3495,10 @@ struct OrtApi {
* \since Version 1.13
*/
const OrtTrainingApi*(ORT_API_CALL* GetTrainingApi)(uint32_t version)NO_EXCEPTION ORT_ALL_ARGS_NONNULL;
#ifdef __cplusplus
OrtApi(const OrtApi&)=delete; // Prevent users from accidentally copying the API structure, it should always be passed as a pointer
#endif
};
/*
@ -3503,7 +3507,6 @@ struct OrtApi {
* 2 Create an OrtCustomOp structure for each op and add them to the domain
* 3 Call OrtAddCustomOpDomain to add the custom domain of ops to the session options
*/
#define OrtCustomOpApi OrtApi
// Specifies some characteristics of inputs/outputs of custom ops:
// Specify if the inputs/outputs are one of:

4
onnxruntime/core/providers/coreml/coreml_execution_provider.cc
View file

@ -139,7 +139,7 @@ common::Status CoreMLExecutionProvider::Compile(const std::vector<FusedNodeAndGr
ORT_UNUSED_PARAMETER(state);
};
compute_info.compute_func = [](FunctionState state, const OrtCustomOpApi* api, OrtKernelContext* context) {
compute_info.compute_func = [](FunctionState state, const OrtApi* api, OrtKernelContext* context) {
Ort::CustomOpApi ort{*api};
coreml::Model* model = reinterpret_cast<coreml::Model*>(state);
const size_t num_inputs = ort.KernelContext_GetInputCount(context);
@ -243,7 +243,7 @@ common::Status CoreMLExecutionProvider::Compile(const std::vector<FusedNodeAndGr
NodeComputeInfo compute_info;
compute_info.create_state_func = [](ComputeContext* /*context*/, FunctionState* /*state*/) { return 0; };
compute_info.release_state_func = [](FunctionState /*state*/) {};
compute_info.compute_func = [](FunctionState /* state */, const OrtCustomOpApi* /* api */,
compute_info.compute_func = [](FunctionState /* state */, const OrtApi* /* api */,
OrtKernelContext* /* context */) {
return ORT_MAKE_STATUS(ONNXRUNTIME, NOT_IMPLEMENTED, "Compute is not supported in this build.");
};

2
onnxruntime/core/providers/dnnl/dnnl_execution_provider.cc
View file

@ -309,7 +309,7 @@ Status DNNLExecutionProvider::Compile(const std::vector<FusedNodeAndGraph>& fuse
ORT_UNUSED_PARAMETER(state);
};
compute_info.compute_func = [](FunctionState state, const OrtCustomOpApi* api, OrtKernelContext* context) {
compute_info.compute_func = [](FunctionState state, const OrtApi* api, OrtKernelContext* context) {
Ort::CustomOpApi ort{*api};
ort_dnnl::DnnlSubgraphPrimitive* subgraph_primitive = reinterpret_cast<ort_dnnl::DnnlSubgraphPrimitive*>(state);

2
onnxruntime/core/providers/migraphx/migraphx_execution_provider.cc
View file

@ -1038,7 +1038,7 @@ Status MIGraphXExecutionProvider::Compile(const std::vector<FusedNodeAndGraph>&
delete static_cast<MIGraphXFuncState*>(state);
};
compute_info.compute_func = [](FunctionState state, const OrtCustomOpApi* api, OrtKernelContext* context) {
compute_info.compute_func = [](FunctionState state, const OrtApi* api, OrtKernelContext* context) {
Ort::CustomOpApi ort{*api};
MIGraphXFuncState* mgx_state = reinterpret_cast<MIGraphXFuncState*>(state);
std::unordered_map<std::string, std::size_t>& map_input_name_index = mgx_state->input_name_indexes;

2
onnxruntime/core/providers/nnapi/nnapi_builtin/nnapi_execution_provider.cc
View file

@ -297,7 +297,7 @@ common::Status NnapiExecutionProvider::Compile(const std::vector<FusedNodeAndGra
ORT_UNUSED_PARAMETER(state);
};
compute_info.compute_func = [](FunctionState state, const OrtCustomOpApi* api, OrtKernelContext* context) {
compute_info.compute_func = [](FunctionState state, const OrtApi* api, OrtKernelContext* context) {
Ort::CustomOpApi ort{*api};
nnapi::Model* model = reinterpret_cast<nnapi::Model*>(state);
const size_t num_inputs = ort.KernelContext_GetInputCount(context);

2
onnxruntime/core/providers/nuphar/nuphar_execution_provider.cc
View file

@ -453,7 +453,7 @@ Status NupharExecutionProvider::Compile(
// Compute function
// This is similar to the original OpKernel's Compute()
info.compute_func =
[](FunctionState state, const OrtCustomOpApi*, OrtKernelContext* op_kernel_context) {
[](FunctionState state, const OrtApi*, OrtKernelContext* op_kernel_context) {
NupharKernelState* s = reinterpret_cast<NupharKernelState*>(state);
return s->Compute(reinterpret_cast<OpKernelContext*>(op_kernel_context));
};

2
onnxruntime/core/providers/rknpu/rknpu_execution_provider.cc
View file

@ -315,7 +315,7 @@ common::Status RknpuExecutionProvider::Compile(const std::vector<FusedNodeAndGra
};
compute_info.compute_func = [](FunctionState state,
const OrtCustomOpApi* api,
const OrtApi* api,
OrtKernelContext* context) {
Ort::CustomOpApi ort{*api};
RknpuFuncState* rk_state = reinterpret_cast<RknpuFuncState*>(state);

2
onnxruntime/core/providers/tensorrt/tensorrt_execution_provider.cc
View file

@ -1368,7 +1368,7 @@ common::Status TensorrtExecutionProvider::Compile(const std::vector<FusedNodeAnd
};
// Create compute function
compute_info.compute_func = [this](FunctionState state, const OrtCustomOpApi* api, OrtKernelContext* context) {
compute_info.compute_func = [this](FunctionState state, const OrtApi* api, OrtKernelContext* context) {
Ort::CustomOpApi ort{*api};
TensorrtFuncState* trt_state = reinterpret_cast<TensorrtFuncState*>(state);
std::lock_guard<OrtMutex> lock(*(trt_state->tensorrt_mu_ptr));

2
onnxruntime/core/providers/tvm/tvm_runner.cc
View file

@ -18,7 +18,7 @@ TVMRunner::TVMRunner(const TvmEPOptions& options,
runner_ = getTVMRunnerImpl(mod, options, inputs_info, output_tensors);
}
common::Status TVMRunner::operator()(FunctionState state, const OrtCustomOpApi* api, OrtKernelContext* context) {
common::Status TVMRunner::operator()(FunctionState state, const OrtApi* api, OrtKernelContext* context) {
return runner_->run(api, context);
}

2
onnxruntime/core/providers/tvm/tvm_runner.h
View file

@ -23,7 +23,7 @@ public:
const InputsInfoMap& inputs_info,
const std::vector<DLTensor>& output_tensor);
common::Status operator()(FunctionState state, const OrtCustomOpApi* api, OrtKernelContext* context);
common::Status operator()(FunctionState state, const OrtApi* api, OrtKernelContext* context);
private:
std::shared_ptr<RunnerImpl> runner_;

2
onnxruntime/core/providers/tvm/tvm_runner_impl.h
View file

@ -27,7 +27,7 @@ public:
const std::vector<DLTensor> tensors_outputs);
virtual ~RunnerImpl() = default;
virtual common::Status run(const OrtCustomOpApi* api, OrtKernelContext* context) {
virtual common::Status run(const OrtApi* api, OrtKernelContext* context) {
Ort::CustomOpApi ort{*api};
set_input(ort, context);

2
onnxruntime/test/providers/internal_testing/internal_testing_execution_provider.cc
View file

@ -215,7 +215,7 @@ common::Status InternalTestingExecutionProvider::Compile(const std::vector<Fused
compute_info.release_state_func = [](FunctionState /*state*/) {
};
compute_info.compute_func = [&node](FunctionState /*state*/, const OrtCustomOpApi* c_api,
compute_info.compute_func = [&node](FunctionState /*state*/, const OrtApi* c_api,
OrtKernelContext* context) -> Status {
Ort::CustomOpApi api{*c_api}; // use C++ API for convenience

16
onnxruntime/test/testdata/custom_op_library/custom_op_library.cc vendored
View file

@ -46,9 +46,8 @@ struct OrtTensorDimensions : std::vector<int64_t> {
};
struct KernelOne {
KernelOne(OrtApi api)
: api_(api),
ort_(api_) {
KernelOne(const OrtApi& api)
: ort_(api) {
}
void Compute(OrtKernelContext* context) {
@ -80,14 +79,12 @@ struct KernelOne {
}
private:
OrtApi api_; // keep a copy of the struct, whose ref is used in the ort_
Ort::CustomOpApi ort_;
};
struct KernelTwo {
KernelTwo(OrtApi api)
: api_(api),
ort_(api_) {
KernelTwo(const OrtApi& api)
: ort_(api) {
}
void Compute(OrtKernelContext* context) {
@ -112,12 +109,11 @@ struct KernelTwo {
}
private:
OrtApi api_; // keep a copy of the struct, whose ref is used in the ort_
Ort::CustomOpApi ort_;
};
struct CustomOpOne : Ort::CustomOpBase<CustomOpOne, KernelOne> {
void* CreateKernel(OrtApi api, const OrtKernelInfo* /* info */) const {
void* CreateKernel(const OrtApi& api, const OrtKernelInfo* /* info */) const {
return new KernelOne(api);
};
@ -136,7 +132,7 @@ struct CustomOpOne : Ort::CustomOpBase<CustomOpOne, KernelOne> {
} c_CustomOpOne;
struct CustomOpTwo : Ort::CustomOpBase<CustomOpTwo, KernelTwo> {
void* CreateKernel(OrtApi api, const OrtKernelInfo* /* info */) const {
void* CreateKernel(const OrtApi& api, const OrtKernelInfo* /* info */) const {
return new KernelTwo(api);
};