saymrwulf/onnxruntime
1
0
Fork 0
mirror of https://github.com/saymrwulf/onnxruntime.git synced 2026-07-26 19:52:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Mitigate prefast static analysis warnings (#13032)

Browse source 
Address static analysis warnings:

https://msdata.visualstudio.com/DefaultCollection/Vienna/_workitems/edit/1944984/

https://msdata.visualstudio.com/DefaultCollection/Vienna/_workitems/edit/1943846/

Co-authored-by: Randy Shuai <rashuai@microsoft.com>
This commit is contained in:
RandySheriffH 2022-09-26 17:06:33 -07:00 committed by GitHub
parent 77a066c700
commit e3bdba37a8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 34 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
onnxruntime/core/providers/cuda/math/topk.cc
View file

@ -75,7 +75,7 @@ Status TopK<inputk>::ComputeInternal(OpKernelContext* ctx) const {
auto elem_nums = tensor_X->Shape().AsShapeVector();
auto dimension = elem_nums[axis];
for (auto i = static_cast<int32_t>(elem_nums.size()) - 2; i >= 0; --i) {
for (auto i = static_cast<int64_t>(elem_nums.size()) - 2; i >= 0; --i) {
elem_nums[i] *= elem_nums[i + 1];
}

66
onnxruntime/core/session/standalone_op_invoker.cc
View file

@ -7,6 +7,11 @@
#include "core/session/ort_apis.h"
#include <unordered_map>
#if defined(_MSC_VER) && !defined(__clang__)
//disabling warning on calling of raw "delete" operator
#pragma warning(disable : 26400)
#endif
#ifdef ORT_MINIMAL_BUILD
ORT_API_STATUS_IMPL(OrtApis::CreateOpAttr,
@ -72,20 +77,13 @@ ORT_API(void, OrtApis::ReleaseKernelInfo, _Frees_ptr_opt_ OrtKernelInfo*) {
namespace onnxruntime {
namespace standalone {
void ReleaseNode(onnxruntime::Node* node) {
if (node) {
for (auto* input_arg : node->InputDefs()) {
delete input_arg;
}
for (auto* output_arg : node->OutputDefs()) {
delete output_arg;
}
delete node;
}
}
using NodePtr = std::unique_ptr<onnxruntime::Node>;
using NodePtr = std::unique_ptr<onnxruntime::Node, void (*)(onnxruntime::Node*)>;
using StandAloneNodesMap = InlinedHashMap<const onnxruntime::OpKernel*, NodePtr>;
using ArgPtr = std::unique_ptr<onnxruntime::NodeArg>;
using ArgPtrs = onnxruntime::InlinedVector<ArgPtr>;
using NodeResource = std::pair<NodePtr, ArgPtrs>;
using NodeResourceMap = InlinedHashMap<const onnxruntime::OpKernel*,NodeResource>;
class NodeRepo {
public:
@ -94,13 +92,12 @@ class NodeRepo {
return node_repo;
}
onnxruntime::Status AddNode(const onnxruntime::OpKernel* kernel, NodePtr node_ptr) {
onnxruntime::Status AddNode(const onnxruntime::OpKernel* kernel, NodePtr&& node_ptr, ArgPtrs&& args) {
std::lock_guard<std::mutex> guard(mutex_);
auto iter = node_map_.find(kernel);
if (iter != node_map_.end()) {
return ORT_MAKE_STATUS(ONNXRUNTIME, INVALID_ARGUMENT, "kernel already mapped to existing node");
auto ret = resource_map_.try_emplace(kernel, NodeResource{std::move(node_ptr), std::move(args)});
if (!ret.second) {
return ORT_MAKE_STATUS(ONNXRUNTIME, INVALID_ARGUMENT, "kernel already mapped to existing node");
}
node_map_.insert({kernel, std::move(node_ptr)});
return Status::OK();
}
@ -111,11 +108,11 @@ class NodeRepo {
size_t expect_output_count{};
{
std::lock_guard<std::mutex> guard(mutex_);
auto iter = node_map_.find(kernel);
if (iter == node_map_.end()) {
auto iter = resource_map_.find(kernel);
if (iter == resource_map_.end()) {
return ORT_MAKE_STATUS(ONNXRUNTIME, INVALID_ARGUMENT, "matching node is missing");
}
auto* node = iter->second.get();
auto* node = iter->second.first.get();
expect_input_count = node->InputDefs().size();
expect_output_count = node->OutputDefs().size();
}
@ -134,7 +131,7 @@ class NodeRepo {
void RemoveNode(const onnxruntime::OpKernel* kernel) {
std::lock_guard<std::mutex> guard(mutex_);
node_map_.erase(kernel);
resource_map_.erase(kernel);
}
private:
@ -142,7 +139,7 @@ class NodeRepo {
~NodeRepo() = default;
std::mutex mutex_;
StandAloneNodesMap node_map_;
NodeResourceMap resource_map_;
};
// For invoking kernels without a graph
@ -377,18 +374,21 @@ onnxruntime::Status CreateOp(const OrtKernelInfo* info,
&kernel_create_info);
ORT_RETURN_IF_ERROR(status);
ArgPtrs arg_ptrs;
std::vector<onnxruntime::NodeArg*> input_args;
for (int i = 0; i < input_count; ++i) {
auto arg_ptr = std::make_unique<onnxruntime::NodeArg>(std::to_string(i), nullptr);
input_args.push_back(arg_ptr.release());
}
std::vector<onnxruntime::NodeArg*> output_args;
for (int i = 0; i < output_count; ++i) {
auto arg_ptr = std::make_unique<onnxruntime::NodeArg>(std::to_string(i), nullptr);
output_args.push_back(arg_ptr.release());
for (int i = 0; i < input_count; ++i) {
arg_ptrs.push_back(std::make_unique<NodeArg>(std::to_string(i), nullptr));
input_args.push_back(arg_ptrs.back().get());
}
auto tmp_node_holder = std::make_unique<onnxruntime::Node>(std::string("standalone_") + op_name, op_name, "", input_args, output_args, nullptr, domain);
NodePtr node_ptr(tmp_node_holder.release(), ReleaseNode);
for (int i = 0; i < output_count; ++i) {
arg_ptrs.push_back(std::make_unique<NodeArg>(std::to_string(i), nullptr));
output_args.push_back(arg_ptrs.back().get());
}
NodePtr node_ptr = std::make_unique<onnxruntime::Node>(std::string("standalone_") + op_name, op_name, "", input_args, output_args, nullptr, domain);
for (int i = 0; i < attr_count; ++i) {
auto attr_proto = reinterpret_cast<const ONNX_NAMESPACE::AttributeProto*>(attr_values[i]);
node_ptr->AddAttributeProto(*attr_proto);
@ -409,7 +409,7 @@ onnxruntime::Status CreateOp(const OrtKernelInfo* info,
static FuncManager kFuncMgr;
status = kernel_create_info->kernel_create_func(kFuncMgr, tmp_kernel_info, op_kernel);
ORT_RETURN_IF_ERROR(status);
status = NodeRepo::GetInstance().AddNode(op_kernel.get(), std::move(node_ptr));
status = NodeRepo::GetInstance().AddNode(op_kernel.get(), std::move(node_ptr), std::move(arg_ptrs));
ORT_RETURN_IF_ERROR(status);
*op = reinterpret_cast<OrtOp*>(op_kernel.release());
return status;