From 0f3252e48104a22b9e9988db212bd7d8717eb698 Mon Sep 17 00:00:00 2001
From: Ryan Hill <ryanhill@microsoft.com>
Date: Wed, 5 May 2021 15:01:26 -0700
Subject: [PATCH] Merge conflicts

---
 include/onnxruntime/core/framework/kernel_def_builder.h  | 2 +-
 include/onnxruntime/core/framework/tensor.h              | 4 ++--
 onnxruntime/core/providers/cpu/controlflow/loop.cc       | 2 +-
 onnxruntime/core/providers/cuda/cuda_provider_factory.cc | 6 +++---
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/include/onnxruntime/core/framework/kernel_def_builder.h b/include/onnxruntime/core/framework/kernel_def_builder.h
index a786b1a639..f01405e8d4 100644
--- a/include/onnxruntime/core/framework/kernel_def_builder.h
+++ b/include/onnxruntime/core/framework/kernel_def_builder.h
@@ -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()) {}
diff --git a/include/onnxruntime/core/framework/tensor.h b/include/onnxruntime/core/framework/tensor.h
index 35ce742e1e..ce5fc39d40 100644
--- a/include/onnxruntime/core/framework/tensor.h
+++ b/include/onnxruntime/core/framework/tensor.h
@@ -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
\ No newline at end of file
+}  // namespace onnxruntime
diff --git a/onnxruntime/core/providers/cpu/controlflow/loop.cc b/onnxruntime/core/providers/cpu/controlflow/loop.cc
index c30b42ee78..46b38a88f3 100644
--- a/onnxruntime/core/providers/cpu/controlflow/loop.cc
+++ b/onnxruntime/core/providers/cpu/controlflow/loop.cc
@@ -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;
diff --git a/onnxruntime/core/providers/cuda/cuda_provider_factory.cc b/onnxruntime/core/providers/cuda/cuda_provider_factory.cc
index 97181de2cd..78979783a8 100644
--- a/onnxruntime/core/providers/cuda/cuda_provider_factory.cc
+++ b/onnxruntime/core/providers/cuda/cuda_provider_factory.cc
@@ -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 {