Can't use DXGI to print adapter name of VPU (#274)

Ryan Lai · web-flow · commit 5ddf3a215b21 · 2019-08-29T15:51:41.000-07:00
* Fix vpu break, can't print adaptername using dxcore

* Spacing
diff --git a/Tools/WinMLRunner/src/LearningModelDeviceHelper.cpp b/Tools/WinMLRunner/src/LearningModelDeviceHelper.cpp
@@ -6,6 +6,7 @@
 #include <Windows.Graphics.DirectX.Direct3D11.interop.h>
 #include "Windows.AI.MachineLearning.Native.h"
 #include <codecvt>
+#include "OutputHelper.h"
 using namespace winrt::Windows::Graphics::DirectX::Direct3D11;
 
 #ifdef DXCORE_SUPPORTED_BUILD
@@ -83,11 +84,14 @@ void PopulateLearningModelDeviceList(CommandLineArgs& args, std::vector<Learning
                     com_ptr<IInspectable> inspectableDevice;
                     hr = CreateDirect3D11DeviceFromDXGIDevice(dxgiDevice.get(), inspectableDevice.put());
                     THROW_IF_FAILED(hr);
-                    deviceList.push_back({
+                    LearningModelDeviceWithMetadata learningModelDeviceWithMetadata =
+                        {
                         LearningModelDevice::CreateFromDirect3D11Device(inspectableDevice.as<IDirect3DDevice>()),
                         deviceType,
                         deviceCreationLocation
-                        });
+                        };
+                    OutputHelper::PrintLearningModelDevice(learningModelDeviceWithMetadata);
+                    deviceList.push_back(learningModelDeviceWithMetadata);
                 }
 #ifdef DXCORE_SUPPORTED_BUILD
                 else if ((TypeHelper::GetWinmlDeviceKind(deviceType) != LearningModelDeviceKind::Cpu) &&
@@ -216,11 +220,14 @@ void PopulateLearningModelDeviceList(CommandLineArgs& args, std::vector<Learning
 #endif
                 else
                 {
-                    deviceList.push_back({
-                        LearningModelDevice(TypeHelper::GetWinmlDeviceKind(deviceType)),
-                        deviceType,
-                        deviceCreationLocation
-                        });
+                    LearningModelDeviceWithMetadata learningModelDeviceWithMetadata = 
+                    { 
+                        LearningModelDevice( TypeHelper::GetWinmlDeviceKind(deviceType)),
+                                             deviceType, 
+                                             deviceCreationLocation 
+                    };
+                    OutputHelper::PrintLearningModelDevice(learningModelDeviceWithMetadata);
+                    deviceList.push_back(learningModelDeviceWithMetadata);
                 }
             }
             catch (...)
diff --git a/Tools/WinMLRunner/src/OutputHelper.h b/Tools/WinMLRunner/src/OutputHelper.h
@@ -165,11 +165,11 @@ class OutputHelper
         std::cout << std::endl;
     }
 
-    void PrintLearningModelDevice(const LearningModelDeviceWithMetadata& device)
+    static void PrintLearningModelDevice(const LearningModelDeviceWithMetadata& device)
     {
         if (device.DeviceType == DeviceType::CPU)
         {
-            std::cout << "\nCreating Session with CPU device" << std::endl;
+            std::cout << "\nCreated LearningModelDevice with CPU device" << std::endl;
             return;
         }
 
@@ -185,7 +185,7 @@ class OutputHelper
             DXGI_ADAPTER_DESC description;
             if (SUCCEEDED(adapter->GetDesc(&description)))
             {
-                std::wcout << L"\nCreating Session with GPU: " << description.Description << std::endl;
+                std::wcout << L"\nCreated LearningModelDevice with GPU: " << description.Description << std::endl;
             }
         }
         else
diff --git a/Tools/WinMLRunner/src/Run.cpp b/Tools/WinMLRunner/src/Run.cpp
@@ -180,7 +180,6 @@ HRESULT CreateSession(LearningModelSession& session, LearningModel& model, const
     }
     try
     {
-        output.PrintLearningModelDevice(learningModelDevice);
         CreateSessionConsideringSupportForSessionOptions(session, model, profiler, args, learningModelDevice);
     }
     catch (hresult_error hr)

Original file line number	Diff line number	Diff line change
`@@ -165,11 +165,11 @@ class OutputHelper`
`165`	`165`	`std::cout << std::endl;`
`166`	`166`	`}`
`167`	`167`
`168`		`- void PrintLearningModelDevice(const LearningModelDeviceWithMetadata& device)`
	`168`	`+ static void PrintLearningModelDevice(const LearningModelDeviceWithMetadata& device)`
`169`	`169`	`{`
`170`	`170`	`if (device.DeviceType == DeviceType::CPU)`
`171`	`171`	`{`
`172`		`- std::cout << "\nCreating Session with CPU device" << std::endl;`
	`172`	`+ std::cout << "\nCreated LearningModelDevice with CPU device" << std::endl;`
`173`	`173`	`return;`
`174`	`174`	`}`
`175`	`175`
`@@ -185,7 +185,7 @@ class OutputHelper`
`185`	`185`	`DXGI_ADAPTER_DESC description;`
`186`	`186`	`if (SUCCEEDED(adapter->GetDesc(&description)))`
`187`	`187`	`{`
`188`		`- std::wcout << L"\nCreating Session with GPU: " << description.Description << std::endl;`
	`188`	`+ std::wcout << L"\nCreated LearningModelDevice with GPU: " << description.Description << std::endl;`
`189`	`189`	`}`
`190`	`190`	`}`
`191`	`191`	`else`
Original file line number	Diff line number	Diff line change
`@@ -180,7 +180,6 @@ HRESULT CreateSession(LearningModelSession& session, LearningModel& model, const`
`180`	`180`	`}`
`181`	`181`	`try`
`182`	`182`	`{`
`183`		`- output.PrintLearningModelDevice(learningModelDevice);`
`184`	`183`	`CreateSessionConsideringSupportForSessionOptions(session, model, profiler, args, learningModelDevice);`
`185`	`184`	`}`
`186`	`185`	`catch (hresult_error hr)`