From 407492472f66cbfe4a6cea61f985dcb0c57abade Mon Sep 17 00:00:00 2001
From: Jeff Bloomfield <jeffbloo@ntdev.microsoft.com>
Date: Mon, 27 Apr 2020 13:21:45 -0700
Subject: [PATCH] Fix build warnings and address PR comment

---
 cmake/onnxruntime_providers.cmake                             | 3 +--
 cmake/winml.cmake                                             | 4 ++--
 .../providers/dml/DmlExecutionProvider/src/ReadbackHeap.cpp   | 2 +-
 winml/test/image/imageTestHelper.cpp                          | 3 ++-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/cmake/onnxruntime_providers.cmake b/cmake/onnxruntime_providers.cmake
index 2af3cf49d3..6c9ce0dc73 100644
--- a/cmake/onnxruntime_providers.cmake
+++ b/cmake/onnxruntime_providers.cmake
@@ -515,7 +515,6 @@ if (onnxruntime_USE_DML)
       target_link_libraries(${target} PRIVATE "${DML_PACKAGE_DIR}/bin/${onnxruntime_target_platform}/DirectML.lib")
 	  target_compile_definitions(${target} PRIVATE DML_TARGET_VERSION_USE_LATEST)
     endif()
-    target_link_options(${target} PUBLIC /DELAYLOAD:directml.dll /DELAYLOAD:dxgi.dll /DELAYLOAD:d3d11.dll /DELAYLOAD:d3d12.dll)
   endfunction()
 
   target_add_dml(onnxruntime_providers_dml)
@@ -527,7 +526,7 @@ if (onnxruntime_USE_DML)
     target_link_libraries(onnxruntime_providers_dml PRIVATE delayimp.lib)
   endif()
 
-  set(onnxruntime_DELAYLOAD_FLAGS "${onnxruntime_DELAYLOAD_FLAGS} /DELAYLOAD:DirectML.dll /DELAYLOAD:d3d12.dll /DELAYLOAD:dxgi.dll")
+  set(onnxruntime_DELAYLOAD_FLAGS "${onnxruntime_DELAYLOAD_FLAGS} /DELAYLOAD:DirectML.dll /DELAYLOAD:d3d12.dll /DELAYLOAD:dxgi.dll /ignore:4199")
 
   # The DML EP requires C++17
   set_target_properties(onnxruntime_providers_dml PROPERTIES CXX_STANDARD 17)
diff --git a/cmake/winml.cmake b/cmake/winml.cmake
index 114f9e5d2c..bc74a55883 100644
--- a/cmake/winml.cmake
+++ b/cmake/winml.cmake
@@ -272,7 +272,7 @@ set_target_properties(winml_adapter
 target_link_libraries(winml_adapter PRIVATE wil)
 if (onnxruntime_USE_DML)
   target_add_dml(winml_adapter)
-endif(onnxruntime_USE_DML)
+endif()
 
 # add it to the onnxruntime shared library
 set(onnxruntime_winml winml_adapter)
@@ -593,7 +593,7 @@ set_target_properties(winml_dll
 set(os_component_link_flags_list ${os_component_link_flags})
 separate_arguments(os_component_link_flags_list)
 
-target_link_options(winml_dll PRIVATE /DEF:${WINML_DIR}/winml.def ${os_component_link_flags_list} /DELAYLOAD:api-ms-win-core-libraryloader-l1-2-1.dll /DELAYLOAD:api-ms-win-core-threadpool-legacy-l1-1-0.dll /DELAYLOAD:api-ms-win-core-processtopology-obsolete-l1-1-0.dll /DELAYLOAD:api-ms-win-core-kernel32-legacy-l1-1-0.dll /DELAYLOAD:d3d12.dll /DELAYLOAD:d3d11.dll /DELAYLOAD:dxgi.dll)
+target_link_options(winml_dll PRIVATE /DEF:${WINML_DIR}/winml.def ${os_component_link_flags_list} /DELAYLOAD:api-ms-win-core-libraryloader-l1-2-1.dll /DELAYLOAD:api-ms-win-core-threadpool-legacy-l1-1-0.dll /DELAYLOAD:api-ms-win-core-processtopology-obsolete-l1-1-0.dll /DELAYLOAD:api-ms-win-core-kernel32-legacy-l1-1-0.dll /DELAYLOAD:d3d12.dll /DELAYLOAD:d3d11.dll /DELAYLOAD:dxgi.dll /DELAYLOAD:directml.dll)
 
 
 if (EXISTS ${dxcore_header})
diff --git a/onnxruntime/core/providers/dml/DmlExecutionProvider/src/ReadbackHeap.cpp b/onnxruntime/core/providers/dml/DmlExecutionProvider/src/ReadbackHeap.cpp
index e0f2ad267a..f18246623f 100644
--- a/onnxruntime/core/providers/dml/DmlExecutionProvider/src/ReadbackHeap.cpp
+++ b/onnxruntime/core/providers/dml/DmlExecutionProvider/src/ReadbackHeap.cpp
@@ -63,7 +63,7 @@ namespace Dml
             m_readbackHeap = CreateReadbackHeap(m_device.Get(), m_capacity);
         }
 
-        assert(gsl::narrow_cast<ptrdiff_t>(m_readbackHeap->GetDesc().Width) >= size);
+        assert(m_readbackHeap->GetDesc().Width >= size);
     }
 
     void ReadbackHeap::ReadbackFromGpu(
diff --git a/winml/test/image/imageTestHelper.cpp b/winml/test/image/imageTestHelper.cpp
index ab055ab624..fd06f3380a 100644
--- a/winml/test/image/imageTestHelper.cpp
+++ b/winml/test/image/imageTestHelper.cpp
@@ -188,10 +188,11 @@ namespace ImageTestHelper {
 
         // Create the GPU upload buffer.
         auto heap_properties = CD3DX12_HEAP_PROPERTIES(D3D12_HEAP_TYPE_UPLOAD);
+        auto buffer_desc = CD3DX12_RESOURCE_DESC::Buffer(bufferbytesize);
         WINML_EXPECT_NO_THROW(pD3D12Device->CreateCommittedResource(
             &heap_properties,
             D3D12_HEAP_FLAG_NONE,
-            &CD3DX12_RESOURCE_DESC::Buffer(bufferbytesize),
+            &buffer_desc,
             D3D12_RESOURCE_STATE_GENERIC_READ,
             nullptr,
             __uuidof(ID3D12Resource),