From 8045273782a118e3f13f31b572767ed53d5e6816 Mon Sep 17 00:00:00 2001 From: Ryan Lai Date: Mon, 10 Sep 2018 15:31:06 -0700 Subject: [PATCH] Renamed WinMLModelRunner to WinMLRunner --- .../BindingUtilities.h | 0 .../CommandLineArgs.cpp | 2 +- .../CommandLineArgs.h | 0 .../Common.h | 0 .../Main.cpp | 0 .../ModelBinding.h | 0 .../OutputHelper.h | 4 ++-- .../README.md | 20 +++++++++---------- .../TimerHelper.h | 0 .../WinMLRunner.sln} | 2 +- .../WinMLRunner.vcxproj} | 2 +- 11 files changed, 15 insertions(+), 15 deletions(-) rename Tools/{WinMLModelRunner => WinMLRunner}/BindingUtilities.h (100%) rename Tools/{WinMLModelRunner => WinMLRunner}/CommandLineArgs.cpp (98%) rename Tools/{WinMLModelRunner => WinMLRunner}/CommandLineArgs.h (100%) rename Tools/{WinMLModelRunner => WinMLRunner}/Common.h (100%) rename Tools/{WinMLModelRunner => WinMLRunner}/Main.cpp (100%) rename Tools/{WinMLModelRunner => WinMLRunner}/ModelBinding.h (100%) rename Tools/{WinMLModelRunner => WinMLRunner}/OutputHelper.h (99%) rename Tools/{WinMLModelRunner => WinMLRunner}/README.md (88%) rename Tools/{WinMLModelRunner => WinMLRunner}/TimerHelper.h (100%) rename Tools/{WinMLModelRunner/WinMLModelRunner.sln => WinMLRunner/WinMLRunner.sln} (90%) rename Tools/{WinMLModelRunner/WinMLModelRunner.vcxproj => WinMLRunner/WinMLRunner.vcxproj} (99%) diff --git a/Tools/WinMLModelRunner/BindingUtilities.h b/Tools/WinMLRunner/BindingUtilities.h similarity index 100% rename from Tools/WinMLModelRunner/BindingUtilities.h rename to Tools/WinMLRunner/BindingUtilities.h diff --git a/Tools/WinMLModelRunner/CommandLineArgs.cpp b/Tools/WinMLRunner/CommandLineArgs.cpp similarity index 98% rename from Tools/WinMLModelRunner/CommandLineArgs.cpp rename to Tools/WinMLRunner/CommandLineArgs.cpp index f3a108bc..4557898e 100644 --- a/Tools/WinMLModelRunner/CommandLineArgs.cpp +++ b/Tools/WinMLRunner/CommandLineArgs.cpp @@ -6,7 +6,7 @@ using namespace Windows::AI::MachineLearning; void CommandLineArgs::PrintUsage() { - std::cout << "WinML Model Runner" << std::endl; + std::cout << "WinML Runner" << std::endl; std::cout << " ---------------------------------------------------------------" << std::endl; std::cout << "WinmlRunner.exe <-model | -folder> [options]" << std::endl; std::cout << std::endl; diff --git a/Tools/WinMLModelRunner/CommandLineArgs.h b/Tools/WinMLRunner/CommandLineArgs.h similarity index 100% rename from Tools/WinMLModelRunner/CommandLineArgs.h rename to Tools/WinMLRunner/CommandLineArgs.h diff --git a/Tools/WinMLModelRunner/Common.h b/Tools/WinMLRunner/Common.h similarity index 100% rename from Tools/WinMLModelRunner/Common.h rename to Tools/WinMLRunner/Common.h diff --git a/Tools/WinMLModelRunner/Main.cpp b/Tools/WinMLRunner/Main.cpp similarity index 100% rename from Tools/WinMLModelRunner/Main.cpp rename to Tools/WinMLRunner/Main.cpp diff --git a/Tools/WinMLModelRunner/ModelBinding.h b/Tools/WinMLRunner/ModelBinding.h similarity index 100% rename from Tools/WinMLModelRunner/ModelBinding.h rename to Tools/WinMLRunner/ModelBinding.h diff --git a/Tools/WinMLModelRunner/OutputHelper.h b/Tools/WinMLRunner/OutputHelper.h similarity index 99% rename from Tools/WinMLModelRunner/OutputHelper.h rename to Tools/WinMLRunner/OutputHelper.h index 9fe6ebb3..d952a7fe 100644 --- a/Tools/WinMLModelRunner/OutputHelper.h +++ b/Tools/WinMLRunner/OutputHelper.h @@ -214,7 +214,7 @@ public: void PrintHardwareInfo() { - std::cout << "WinML Model Runner" << std::endl; + std::cout << "WinML Runner" << std::endl; com_ptr factory; (CreateDXGIFactory1(__uuidof(IDXGIFactory6), factory.put_void())); @@ -236,7 +236,7 @@ public: std::ostringstream oss; oss << std::put_time(&localTime, "%Y-%m-%d"); - std::string fileName = "WinML Model Runner [" + oss.str() + "].csv"; + std::string fileName = "WinML Runner [" + oss.str() + "].csv"; std::wstring_convert> converter; m_csvFileName = converter.from_bytes(fileName); } diff --git a/Tools/WinMLModelRunner/README.md b/Tools/WinMLRunner/README.md similarity index 88% rename from Tools/WinMLModelRunner/README.md rename to Tools/WinMLRunner/README.md index 39e6ffc8..ae46d971 100644 --- a/Tools/WinMLModelRunner/README.md +++ b/Tools/WinMLRunner/README.md @@ -1,7 +1,7 @@ -# WinML Model Runner Sample +# WinML Runner Sample -The WinMLModelRunner program can run .onnx or .pb models where the input and output variables are tensors or images. It will attempt to load, bind, and evaluate a model and output error messages if these steps were unsuccessful. It will also capture performance measurements on the GPU and/or CPU. If using the performance flag, the GPU, CPU and wall-clock times for loading (on CPU only), binding, and evaluating and the CPU and GPU memory usage during evaluate will print to the command line and to a CSV file. +The WinMLRunner program can run .onnx or .pb models where the input and output variables are tensors or images. It will attempt to load, bind, and evaluate a model and output error messages if these steps were unsuccessful. It will also capture performance measurements on the GPU and/or CPU. If using the performance flag, the GPU, CPU and wall-clock times for loading (on CPU only), binding, and evaluating and the CPU and GPU memory usage during evaluate will print to the command line and to a CSV file. ## Prerequisites - [Visual Studio 2017 Version 15.7.4 or Newer](https://developer.microsoft.com/en-us/windows/downloads) @@ -33,19 +33,19 @@ Required command-Line arguments: ``` ### Examples: Run a model on the CPU and GPU separately 5 times and output performance data: -> WinMLModelRunner.exe -model c:\\data\\concat.onnx -iterations 5 -perf +> WinMLRunner.exe -model c:\\data\\concat.onnx -iterations 5 -perf Runs all the models in the data folder, captures performance data 3 times using only the CPU: -> WinMLModelRunner .exe -folder c:\\data -perf -iterations 3 -CPU +> WinMLRunner .exe -folder c:\\data -perf -iterations 3 -CPU ## Default output **Running a good model:** Run the executable as shown below. Make sure to replace the install location with what matches yours: ``` - WinMLModelRunner.exe -model C:\Repos\Windows-Machine-Learning\SharedContent\models\SqueezeNet.onnx + WinMLRunner.exe -model C:\Repos\Windows-Machine-Learning\SharedContent\models\SqueezeNet.onnx -WinML Model Runner +WinML Runner GPU: AMD Radeon Pro WX 3100 ================================================================= @@ -150,7 +150,7 @@ private: Run the executable as shown below. Make sure to replace the install location with what matches yours: ``` -WinMLModelRunner.exe -model C:\Repos\Windows-Machine-Learning\SharedContent\models\SqueezeNet.onnx -perf +WinMLRunner.exe -model C:\Repos\Windows-Machine-Learning\SharedContent\models\SqueezeNet.onnx -perf If capturing performance measurements, the program will create a CSV titled "WinML Model Run [Today's date]" in the same folder as the .exe file. ``` @@ -159,7 +159,7 @@ Dedicated Memory (MB) - The amount of memory that was used on the VRAM of the de Shared Memory (MB) - The amount of memory that was used on the DRAM by the GPU. ### Sample performance output: ``` -WinML Model Runner +WinML Runner GPU: AMD Radeon Pro WX 3100 ================================================================= @@ -244,10 +244,10 @@ CPU Time Averages (iterations = 1): ``` logman start winml -ets -o winmllog.etl -nb 128 640 -bs 128 logman update trace winml -p {BCAD6AEE-C08D-4F66-828C-4C43461A033D} 0xffffffffffffffff 0xff -ets -WinMLModelRunner.exe -model C:\Repos\Windows-Machine-Learning\SharedContent\models\SqueezeNet.onnx -debug +WinMLRunner.exe -model C:\Repos\Windows-Machine-Learning\SharedContent\models\SqueezeNet.onnx -debug logman stop winml -ets ``` -The winmllog.etl file will appear in the same directory as the WinMLModelRunner.exe. +The winmllog.etl file will appear in the same directory as the WinMLRunner.exe. ## Reading the Trace Logs 1. Using the traceprt.exe diff --git a/Tools/WinMLModelRunner/TimerHelper.h b/Tools/WinMLRunner/TimerHelper.h similarity index 100% rename from Tools/WinMLModelRunner/TimerHelper.h rename to Tools/WinMLRunner/TimerHelper.h diff --git a/Tools/WinMLModelRunner/WinMLModelRunner.sln b/Tools/WinMLRunner/WinMLRunner.sln similarity index 90% rename from Tools/WinMLModelRunner/WinMLModelRunner.sln rename to Tools/WinMLRunner/WinMLRunner.sln index 3fba5450..703efe20 100644 --- a/Tools/WinMLModelRunner/WinMLModelRunner.sln +++ b/Tools/WinMLRunner/WinMLRunner.sln @@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 15 VisualStudioVersion = 15.0.27004.2005 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WinMLModelRunner", "WinMLModelRunner.vcxproj", "{81EA9CC6-8A26-4583-B1A4-84740EF815C8}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WinMLRunner", "WinMLRunner.vcxproj", "{81EA9CC6-8A26-4583-B1A4-84740EF815C8}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/Tools/WinMLModelRunner/WinMLModelRunner.vcxproj b/Tools/WinMLRunner/WinMLRunner.vcxproj similarity index 99% rename from Tools/WinMLModelRunner/WinMLModelRunner.vcxproj rename to Tools/WinMLRunner/WinMLRunner.vcxproj index 3a4e00e3..bccc1102 100644 --- a/Tools/WinMLModelRunner/WinMLModelRunner.vcxproj +++ b/Tools/WinMLRunner/WinMLRunner.vcxproj @@ -36,7 +36,7 @@ {81EA9CC6-8A26-4583-B1A4-84740EF815C8} Benchmark 10.0.17738.0 - WinMLModelRunner + WinMLRunner