Separate preprocess and Eval

Author: nums11

Samples/WinMLSamplesGallery/WinMLSamplesGalleryNative/DXResourceBinding.cpp

@@ -38,7 +38,7 @@ D3D12Quad sample(800, 600, L"D3D12 Quad");
 
 namespace winrt::WinMLSamplesGalleryNative::implementation
 {
-	winrt::com_array<float> DXResourceBinding::LaunchWindow() {
+	void DXResourceBinding::LaunchWindow() {
 
         const wchar_t* preprocessingModelFilePath = L"C:/Users/numform/Windows-Machine-Learning/Samples/WinMLSamplesGallery/WinMLSamplesGalleryNative/dx_preprocessor_efficient_net.onnx";
         preprocesingSession = CreateSession(preprocessingModelFilePath);
@@ -53,20 +53,15 @@ namespace winrt::WinMLSamplesGalleryNative::implementation
 
         // Run the quad in a separate, detached thread
         d3d_th.detach();
-
-        winrt::com_array<float> eval_results(1000);
-        for (int i = 0; i < 1000; i++) {
-            eval_results[i] = 100;
-        }
-        return eval_results;
 	}
 
     winrt::com_array<float> DXResourceBinding::EvalORT() {
         D3D12Quad::D3DInfo info = sample.GetD3DInfo();
-        bool running = true;
-        return Preprocess(*preprocesingSession, *inferenceSession, info.device.Get(),
-            running, info.swapChain.Get(), info.frameIndex, info.commandAllocator.Get(), info.commandList.Get(),
+        Ort::Value preprocessedInput = Preprocess(*preprocesingSession, info.device.Get(),
+            info.swapChain.Get(), info.frameIndex, info.commandAllocator.Get(), info.commandList.Get(),
             info.commandQueue.Get());
+        winrt::com_array<float> results = Eval(*inferenceSession, preprocessedInput);
+        return results;
     }
 
     void DXResourceBinding::CloseWindow() {

Samples/WinMLSamplesGallery/WinMLSamplesGalleryNative/DXResourceBinding.h

@@ -6,7 +6,7 @@ namespace winrt::WinMLSamplesGalleryNative::implementation
     struct DXResourceBinding : DXResourceBindingT<DXResourceBinding>
     {
         DXResourceBinding() = default;
-        static winrt::com_array<float> LaunchWindow();
+        static void LaunchWindow();
         static winrt::com_array<float> EvalORT();
         static void CloseWindow();
     };

Samples/WinMLSamplesGallery/WinMLSamplesGalleryNative/ORTHelpers.cpp

@@ -236,7 +236,7 @@ Ort::Value CreateTensorValueUsingD3DResource(
     );
 }
 
-std::vector<float> Eval(Ort::Session& session, const Ort::Value& prev_input) {
+winrt::com_array<float> Eval(Ort::Session& session, const Ort::Value& prev_input) {
     const char* modelInputTensorName = "images:0";
     const char* modelOutputTensorName = "Softmax:0";
     const std::array<int64_t, 4> inputShape = { 1, 224, 224, 3 };
@@ -273,9 +273,9 @@ std::vector<float> Eval(Ort::Session& session, const Ort::Value& prev_input) {
         auto output_tensors = session.Run(Ort::RunOptions{ nullptr }, input_node_names.data(), &prev_input, 1, output_node_names.data(), 1);
         // Get pointer to output tensor float values
         float* floatarr = output_tensors.front().GetTensorMutableData<float>();
-        std::vector<float> final_results;
+        winrt::com_array<float> final_results(1000);
         for (int i = 0; i < 1000; i++) {
-            final_results.push_back(floatarr[i]);
+            final_results[i] = floatarr[i];
         }
 
         return final_results;
@@ -290,13 +290,10 @@ std::vector<float> Eval(Ort::Session& session, const Ort::Value& prev_input) {
         printf("Error running model inference: %s\n", exception.what());
         //return EXIT_FAILURE;
     }
-
 }
 
-winrt::com_array<float> Preprocess(Ort::Session& session,
-    Ort::Session& inferenceSession,
+Ort::Value Preprocess(Ort::Session& session,
     ID3D12Device* device,
-    bool& Running,
     IDXGISwapChain3* swapChain,
     UINT frameIndex,
     ID3D12CommandAllocator* commandAllocator,
@@ -346,7 +343,6 @@ winrt::com_array<float> Preprocess(Ort::Session& session,
         IID_PPV_ARGS(&new_buffer));
     if (FAILED(hr))
     {
-        Running = false;
         //return false;
     }
 
@@ -398,12 +394,7 @@ winrt::com_array<float> Preprocess(Ort::Session& session,
         session.Run(Ort::RunOptions{ nullptr }, input_node_names.data(),
             &inputTensor, 1, output_node_names.data(), &outputTensor, 1);
 
-        auto eval_results_std = Eval(inferenceSession, outputTensor);
-        winrt::com_array<float> eval_results(1000);
-        for (int i = 0; i < 1000; i++) {
-            eval_results[i] = eval_results_std[i];
-        }
-        return eval_results;
+        return outputTensor;
     }
     catch (Ort::Exception const& exception)
     {

Samples/WinMLSamplesGallery/WinMLSamplesGalleryNative/ORTHelpers.h

@@ -36,12 +36,10 @@ using namespace Microsoft::WRL;
 
 Ort::Session CreateSession(const wchar_t* model_file_path);
 
-std::vector<float> Eval(Ort::Session& session, const Ort::Value& prev_input);
+winrt::com_array<float> Eval(Ort::Session& session, const Ort::Value& prev_input);
 
-winrt::com_array<float> Preprocess(Ort::Session& session,
-    Ort::Session& inferenceSession,
+Ort::Value Preprocess(Ort::Session& session,
     ID3D12Device* device,
-    bool& Running,
     IDXGISwapChain3* swapChain,
     UINT frameIndex,
     ID3D12CommandAllocator* commandAllocator,

Samples/WinMLSamplesGallery/WinMLSamplesGalleryNative/WinMLSamplesGalleryNative.idl

@@ -27,7 +27,7 @@ namespace WinMLSamplesGalleryNative
     [default_interface]
     runtimeclass DXResourceBinding
     {
-        static float[] LaunchWindow();
+        static void LaunchWindow();
         static float[] EvalORT();
         static void CloseWindow();
     }