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

Merge conflicts

Browse source
This commit is contained in:
Ryan Hill 2021-05-05 15:01:26 -07:00
parent 401751b4c7
commit 0f3252e481
4 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/onnxruntime/core/framework/kernel_def_builder.h
View file

@ -180,7 +180,7 @@ class KernelDef {
class KernelDefBuilder {
public:
static std::unique_ptr<KernelDefBuilder> Create() { return onnxruntime::make_unique<KernelDefBuilder>(); }
static std::unique_ptr<KernelDefBuilder> Create() { return std::make_unique<KernelDefBuilder>(); }
explicit KernelDefBuilder()
: kernel_def_(new KernelDef()) {}

4
include/onnxruntime/core/framework/tensor.h
View file

@ -58,7 +58,7 @@ using BufferNakedPtr = void*;
*/
class Tensor final {
public:
static std::unique_ptr<Tensor> Create(MLDataType p_type, const TensorShape& shape, std::shared_ptr<IAllocator> allocator) { return onnxruntime::make_unique<Tensor>(p_type, shape, allocator); }
static std::unique_ptr<Tensor> Create(MLDataType p_type, const TensorShape& shape, std::shared_ptr<IAllocator> allocator) { return std::make_unique<Tensor>(p_type, shape, allocator); }
Tensor() = default; // to allow creating vector<Tensor> to support seq(tensor)
@ -261,4 +261,4 @@ class Tensor final {
#ifdef __GNUC__
#pragma GCC diagnostic pop
#endif
} // namespace onnxruntime
} // namespace onnxruntime

2
onnxruntime/core/providers/cpu/controlflow/loop.cc
View file

@ -246,7 +246,7 @@ void Loop::Init(const OpKernelInfo& info) {
}
std::unique_ptr<OpKernel> Loop::Create(const OpKernelInfo& info, const ConcatOutput& concat_output_func, void* stream) {
auto result = make_unique<Loop>(info);
auto result = std::make_unique<Loop>(info);
result->SetConcatOutputFunc(concat_output_func);
result->SetComputeStream(stream);
return result;

6
onnxruntime/core/providers/cuda/cuda_provider_factory.cc
View file

@ -72,15 +72,15 @@ struct ProviderInfo_CUDA_Impl : ProviderInfo_CUDA {
}
std::unique_ptr<IAllocator> CreateCUDAAllocator(int16_t device_id, const char* name) override {
return onnxruntime::make_unique<CUDAAllocator>(device_id, name);
return std::make_unique<CUDAAllocator>(device_id, name);
}
std::unique_ptr<IAllocator> CreateCUDAPinnedAllocator(int16_t device_id, const char* name) override {
return onnxruntime::make_unique<CUDAPinnedAllocator>(device_id, name);
return std::make_unique<CUDAPinnedAllocator>(device_id, name);
}
std::unique_ptr<IDataTransfer> CreateGPUDataTransfer(void* stream) override {
return onnxruntime::make_unique<GPUDataTransfer>(static_cast<cudaStream_t>(stream));
return std::make_unique<GPUDataTransfer>(static_cast<cudaStream_t>(stream));
}
void cuda__Impl_Cast(void* stream, const int64_t* input_data, int32_t* output_data, size_t count) override {