Clean up code

Author: nums11

Samples/WinMLSamplesGallery/WinMLSamplesGalleryNative/DXResourceBinding.cpp

@@ -6,8 +6,6 @@
 #include "DXResourceBinding.g.cpp"
 #include "stdafx.h"
 #include "ORTHelpers.h"
-#include "winrt/Microsoft.AI.MachineLearning.h"
-#include "winrt/Microsoft.AI.MachineLearning.Experimental.h"
 
 using namespace winrt::Microsoft::AI::MachineLearning;
 
@@ -18,88 +16,10 @@ static std::optional<Ort::Session> preprocesingSession;
 static std::optional<Ort::Session> inferenceSession;
 D3D12Quad sample(800, 600, L"D3D12 Quad");
 
-using TensorInt64Bit = winrt::Microsoft::AI::MachineLearning::TensorInt64Bit;
-using TensorKind = winrt::Microsoft::AI::MachineLearning::TensorKind;
-using LearningModelBuilder = winrt::Microsoft::AI::MachineLearning::Experimental::LearningModelBuilder;
-using LearningModelOperator = winrt::Microsoft::AI::MachineLearning::Experimental::LearningModelOperator;
-
-std::array<int64_t, 2> preprocessInputShape;
-
-std::array<long, 6> CalculateCenterFillDimensions(long oldH, long oldW, long h, long w)
-{
-    long resizedW, resizedH, top, bottom, left, right;
-    auto oldHFloat = (float)oldH;
-    auto oldWFloat = (float)oldW;
-    auto hFloat = (float)h;
-    auto wFloat = (float)w;
-
-    auto oldAspectRatio = oldWFloat / oldHFloat;
-    auto newAspectRatio = wFloat / hFloat;
-
-    auto scale = (newAspectRatio < oldAspectRatio) ? (hFloat / oldHFloat) : (wFloat / oldWFloat);
-    resizedW = (newAspectRatio < oldAspectRatio) ? (long)std::floor(scale * oldWFloat) : w;
-    resizedH = (newAspectRatio < oldAspectRatio) ? h : (long)std::floor(scale * oldHFloat);
-    long totalPad = (newAspectRatio < oldAspectRatio) ? resizedW - w : resizedH - h;
-    long biggerDim = (newAspectRatio < oldAspectRatio) ? w : h;
-    long first = (totalPad % 2 == 0) ? totalPad / 2 : (long)std::floor(totalPad / 2.0f);
-    long second = first + biggerDim;
-
-    if (newAspectRatio < oldAspectRatio)
-    {
-        top = 0;
-        bottom = h;
-        left = first;
-        right = second;
-    }
-    else
-    {
-        top = first;
-        bottom = second;
-        left = 0;
-        right = w;
-    }
-
-    std::array<long, 6> new_dimensions = { resizedW, resizedH, top, bottom, left, right };
-    return new_dimensions;
-}
-
 namespace winrt::WinMLSamplesGalleryNative::implementation
 {
     // Create ORT Sessions and launch D3D window in a separate thread
 	void DXResourceBinding::LaunchWindow() {
-
-
-        long newH = 224;
-        long newW = 224;
-        long h = 512;
-        long w = 512;
-        std::array<long, 6> center_fill_dimensions = CalculateCenterFillDimensions(h, w, newH, newW);
-        long resizedW = center_fill_dimensions[0];
-        long resizedH = center_fill_dimensions[1];
-        long top = center_fill_dimensions[2];
-        long bottom = center_fill_dimensions[3];
-        long left = center_fill_dimensions[4];
-        long right = center_fill_dimensions[5];
-        winrt::hstring interpolationMode = L"nearest";
-        long c = 4;
-
-        auto width = 800;
-        auto height = 600;
-        auto rowPitchInBytes = (width * 4 + 255) & ~255;
-        auto rowPitchInPixels = rowPitchInBytes / 4;
-        auto bufferInBytes = rowPitchInBytes * height;
-        preprocessInputShape = { 1, bufferInBytes};
-        //const std::array<int64_t, 4> preprocessInputShape = { 1, 512, 512, 4 };
-        //const std::array<int64_t, 4> preprocessInputShape = { 1, -1, -1, -1 };
-
-        const std::array<int64_t, 4> preprocessOutputShape = { 1, 224, 224, 3 };
-
-        auto kernel = new float[] {
-            0,0,1,
-            0,1,0,
-            1,0,0
-        };
-
         // Create ORT Sessions that will be used for preprocessing and classification
         preprocesingSession = CreateSession(Win32Application::GetAssetPath(L"dx_preprocessor_efficient_net_v2.onnx").c_str());
         inferenceSession = CreateSession(Win32Application::GetAssetPath(L"efficientnet-lite4-11.onnx").c_str());
@@ -120,9 +40,9 @@ namespace winrt::WinMLSamplesGalleryNative::implementation
         // Get the buffer currently being drawn to the screen
         ComPtr<ID3D12Resource> currentBuffer = sample.GetCurrentBuffer();
 
-        // Preprocess the buffer (shrink from 512 x 512 x 4 to 224 x 224 x 3)
+        // Preprocess the buffer (shrink to 224 x 224 x 3)
         Ort::Value preprocessedInput = Preprocess(*preprocesingSession,
-            currentBuffer, preprocessInputShape);
+            currentBuffer);
 
         // Classify the image using EfficientNet and return the results
         winrt::com_array<float> results = Eval(*inferenceSession, preprocessedInput);

Samples/WinMLSamplesGallery/WinMLSamplesGalleryNative/ORTHelpers.cpp

@@ -47,8 +47,7 @@ Ort::Session CreateSession(const wchar_t* model_file_path)
 // Run the buffer through a preprocessing model that will shrink the
 // image from 512 x 512 x 4 to 224 x 224 x 3
 Ort::Value Preprocess(Ort::Session& session,
-    ComPtr<ID3D12Resource> currentBuffer,
-    const std::array<int64_t, 2> inputShape)
+    ComPtr<ID3D12Resource> currentBuffer)
 {
     // Init OrtAPI
     OrtApi const& ortApi = Ort::GetApi(); // Uses ORT_API_VERSION
@@ -59,7 +58,15 @@ Ort::Value Preprocess(Ort::Session& session,
     const char* memoryInformationName = "DML";
     Ort::MemoryInfo memoryInformation(memoryInformationName, OrtAllocatorType::OrtDeviceAllocator, 0, OrtMemType::OrtMemTypeDefault);
     ComPtr<IUnknown> inputTensorEpWrapper;
-    //const std::array<int64_t, 4> inputShape = { 1, 512, 512, 4 };
+    
+    // Calculate input shape
+    auto width = 800;
+    auto height = 600;
+    auto rowPitchInBytes = (width * 4 + 255) & ~255;
+    auto rowPitchInPixels = rowPitchInBytes / 4;
+    auto bufferInBytes = rowPitchInBytes * height;
+    const std::array<int64_t, 2> inputShape = { 1, bufferInBytes };
+
     Ort::Value inputTensor = CreateTensorValueFromD3DResource(
         *ortDmlApi,
         memoryInformation,

Samples/WinMLSamplesGallery/WinMLSamplesGalleryNative/ORTHelpers.h

@@ -13,8 +13,7 @@ using namespace Microsoft::WRL;
 Ort::Session CreateSession(const wchar_t* model_file_path);
 
 Ort::Value Preprocess(Ort::Session& session,
-    ComPtr<ID3D12Resource> currentBuffer,
-    const std::array<int64_t, 2> inputShape);
+    ComPtr<ID3D12Resource> currentBuffer);
 
 winrt::com_array<float> Eval(Ort::Session& session, const Ort::Value& prev_input);