diff --git a/csharp/src/Microsoft.ML.OnnxRuntime/Microsoft.ML.OnnxRuntime.csproj b/csharp/src/Microsoft.ML.OnnxRuntime/Microsoft.ML.OnnxRuntime.csproj index e11525de29..d6cd8de095 100644 --- a/csharp/src/Microsoft.ML.OnnxRuntime/Microsoft.ML.OnnxRuntime.csproj +++ b/csharp/src/Microsoft.ML.OnnxRuntime/Microsoft.ML.OnnxRuntime.csproj @@ -12,7 +12,8 @@ ..\.. $(OnnxRuntimeCsharpRoot)\..\build\Windows $(OnnxRuntimeBuildDirectory)\$(Configuration)\$(Configuration) - + x64 + Microsoft.ML.OnnxRuntime Microsoft @@ -40,41 +41,41 @@ Visible="false" /> - + $(MSBuildThisFileDirectory)../../runtimes/win-x64/native/onnxruntime.lib + + + $(MSBuildThisFileDirectory)../../runtimes/win-x86/native/onnxruntime.lib + + + - onnxruntime.dll + onnxruntime.dll PreserveNewest false @@ -46,5 +52,32 @@ PreserveNewest false + + onnxruntime.dll + PreserveNewest + false + + + mkldnn.dll + PreserveNewest + false + + + mklml.dll + PreserveNewest + false + + + libiomp5md.dll + PreserveNewest + false + diff --git a/csharp/src/Microsoft.ML.OnnxRuntime/targets.xml b/csharp/src/Microsoft.ML.OnnxRuntime/targets.xml index c4829504ed..e68bd37fac 100644 --- a/csharp/src/Microsoft.ML.OnnxRuntime/targets.xml +++ b/csharp/src/Microsoft.ML.OnnxRuntime/targets.xml @@ -1,16 +1,16 @@ - - + Text="Microsoft.ML.OnnxRuntime only supports the AnyCPU, x64, and x86 platforms at this time."/> diff --git a/csharp/tools/Microsoft.ML.OnnxRuntime.PerfTool/Microsoft.ML.OnnxRuntime.PerfTool.csproj b/csharp/tools/Microsoft.ML.OnnxRuntime.PerfTool/Microsoft.ML.OnnxRuntime.PerfTool.csproj index 7d167dd064..07ebb0e2a5 100644 --- a/csharp/tools/Microsoft.ML.OnnxRuntime.PerfTool/Microsoft.ML.OnnxRuntime.PerfTool.csproj +++ b/csharp/tools/Microsoft.ML.OnnxRuntime.PerfTool/Microsoft.ML.OnnxRuntime.PerfTool.csproj @@ -33,7 +33,6 @@ - diff --git a/csharp/tools/Microsoft.ML.OnnxRuntime.PerfTool/Program.cs b/csharp/tools/Microsoft.ML.OnnxRuntime.PerfTool/Program.cs index ee77e5f484..0e9915ad66 100644 --- a/csharp/tools/Microsoft.ML.OnnxRuntime.PerfTool/Program.cs +++ b/csharp/tools/Microsoft.ML.OnnxRuntime.PerfTool/Program.cs @@ -43,10 +43,10 @@ namespace Microsoft.ML.OnnxRuntime.PerfTool var cmdOptions = Parser.Default.ParseArguments(args); cmdOptions.WithParsed( options => { - Main(options); + Run(options); }); } - public static void Main(CommandOptions options) + public static void Run(CommandOptions options) { string modelPath = options.ModelFile; string inputPath = options.InputFile;