Add Xamarin support by skottmckay · Pull Request #9436 · microsoft/onnxruntime

skottmckay · 2021-10-19T06:44:48Z

Description:
Add Xamarin support to the ORT nuget packages.

Update C# code to support Xamarin builds for iOS and Android
- refactor some things to split out common code
include iOS and Android ORT native shared library in native nuget package

Motivation and Context
Enable usage of ORT in Xamarin apps

Cleanups.

…inSupport_PR

skottmckay · 2021-10-19T06:58:00Z

cmake/onnxruntime_csharp.cmake

-#We can't fix it because cmake only supports the "TargetFrameworkVersion" property, not "TargetFramework".
-set_target_properties(Microsoft.ML.OnnxRuntime Microsoft.ML.OnnxRuntime.InferenceSample Microsoft.ML.OnnxRuntime.Tests 
-                      Microsoft.ML.OnnxRuntime.PerfTool PROPERTIES EXCLUDE_FROM_ALL 1)
-


No point adding these entries just to exclude them.

skottmckay · 2021-10-19T06:58:26Z

csharp/.clang-format

@@ -0,0 +1,15 @@
+---
+# clang-format settings for the C# code
+BasedOnStyle:  Microsoft


This is only used for the C# projects. The .clang-format in the root directory is used for everything else.

skottmckay · 2021-10-19T07:07:10Z

...untime.InferenceSample.NetCoreApp/Microsoft.ML.OnnxRuntime.InferenceSample.NetCoreApp.csproj

+    </None>
+    <None Include="$(NativeBuildOutputDir)\onnxruntime.pdb" Condition="'$(IsWindowsBuild)'=='true'And Exists('$(NativeBuildOutputDir)\onnxruntime.pdb')">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
      <Visible>false</Visible>


Using PreserveNewest as these files are large and the copy was taking minutes on my dev machine every time you wanted to run a test.

skottmckay · 2021-10-19T07:14:21Z

csharp/sample/Xamarin/FasterRcnnSample/FasterRcnnSample.sln

+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FasterRcnnSample.Forms", "FasterRcnnSample.Forms\FasterRcnnSample.Forms.csproj", "{51D1A8FB-ADFF-43DE-8215-DB5E86DA4870}"
+EndProject
+Global


This will most likely move to the inference samples repo once the nuget package is released.

skottmckay · 2021-10-19T08:43:47Z

csharp/src/Microsoft.ML.OnnxRuntime/DisposableNamedOnnxValue.shared.cs

                    return new DisposableNamedOnnxValue(name, dt, OnnxValueType.ONNX_TYPE_TENSOR, nativeTensorWrapper.ElementType, nativeTensorWrapper);
-                } catch(Exception e)
+                } catch(Exception)
                {


Fixing some warnings.

skottmckay · 2021-10-19T08:54:07Z

csharp/src/Microsoft.ML.OnnxRuntime/NativeMethods.shared.cs

        #region Runtime/Environment API

+        [UnmanagedFunctionPointer(CallingConvention.Winapi)]
        public delegate IntPtr /* OrtStatus* */DOrtCreateEnv(LogLevel default_warning_level, string logId, out IntPtr /*(OrtEnv*)*/ env);


'WinApi' actually means the appropriate platform specific default.

skottmckay · 2021-10-19T10:41:40Z

csharp/test/Microsoft.ML.OnnxRuntime.Tests/InferenceTest.cs

-#if USE_TENSORRT
-        [Fact]
-        private void CanRunInferenceOnAModelWithTensorRT()
-        {


Moved to Tests.NetCoreApp

skottmckay · 2021-10-19T10:52:48Z

tools/ci_build/github/Doxyfile_csharp.cfg

 ALLOW_UNICODE_NAMES    = NO
 OUTPUT_LANGUAGE        = English
-OUTPUT_TEXT_DIRECTION  = None
 BRIEF_MEMBER_DESC      = YES


Removing deprecated options

skottmckay · 2021-10-19T10:53:22Z

tools/ci_build/github/Doxyfile_csharp.cfg

 EXCLUDE_SYMBOLS        =
-EXAMPLE_PATH           = $(ORT_DOXY_SRC)\csharp\sample\Microsoft.ML.OnnxRuntime.InferenceSample\Program.cs
+EXAMPLE_PATH           = 
 EXAMPLE_PATTERNS       = *


We don't have any 'example' code in doxygen comments so this is unnecessary.

skottmckay · 2021-10-19T10:54:30Z

tools/ci_build/github/azure-pipelines/c-api-noopenmp-packaging-pipelines.yml

-    displayName: 'Restore nuget packages'
+  - task: NuGetCommand@2
+    displayName: Restore NuGet Packages
    inputs:


dotnet.exe doesn't support all the new target frameworks, so use nuget and msbuild.

cmake/onnxruntime_csharp.cmake

csharp/sample/Xamarin/FasterRcnnSample/FasterRcnnSample.Forms/MainPage.xaml.cs

csharp/sample/Xamarin/readme.md

edgchen1 · 2021-10-22T02:53:13Z

csharp/src/Microsoft.ML.OnnxRuntime/Microsoft.ML.OnnxRuntime.csproj

    <PackageId>Microsoft.ML.OnnxRuntime.Managed</PackageId>
    <Authors>Microsoft</Authors>
-    <PackageVersion Condition=" '$(PackageVersion)' == '' ">0.0</PackageVersion>
+    <PackageVersion Condition=" '$(PackageVersion)' == '' And '$(Configuration)' == 'Debug' ">1.0.0</PackageVersion>


just curious as to why Debug has version 1.0.0?

@mikeparker104 do you remember? May have been so the version was valid when testing locally.

Was during local testing where the package was being built via the csproj not the normal way via the .proj in the \csharp dir.

csharp/src/Microsoft.ML.OnnxRuntime/SessionOptionsContainer.shared.cs

...rosoft.ML.OnnxRuntime.EndToEndTests.Mobile/EndToEndTests.Mobile.Automation/AppInitializer.cs

csharp/test/Microsoft.ML.OnnxRuntime.EndToEndTests.Mobile/runmobiletests.sh

csharp/test/Microsoft.ML.OnnxRuntime.Tests.Droid/InferenceTest.android.cs

tools/ci_build/github/azure-pipelines/nuget/templates/gpu.yml

tools/ci_build/github/windows/extract_nuget_files.ps1

…inSupport_PR

edgchen1 · 2021-10-26T16:41:03Z

csharp/test/Microsoft.ML.OnnxRuntime.Tests.iOS/InferenceTest.ios.cs

+        {
+            var opt = new SessionOptions();
+            opt.AppendExecutionProvider_CoreML(CoreMLFlags.COREML_FLAG_ONLY_ENABLE_DEVICE_WITH_ANE);
+            Assert.NotNull(opt);


similar to the android test, remove opt != null assertion after opt is used

will do as separate PR

skottmckay added 3 commits October 16, 2021 08:12

Squash merge from dev branch

e4fce21

Merge with master.

a812450

Cleanups.

Merge remote-tracking branch 'origin/master' into skottmckay/AddXamar…

d99afa7

…inSupport_PR

skottmckay commented Oct 19, 2021

View reviewed changes

skottmckay added 2 commits October 19, 2021 20:58

Minor cleanups.

803b0f2

Fix flake8 error

efc4869

edgchen1 reviewed Oct 22, 2021

View reviewed changes

skottmckay added 2 commits October 26, 2021 20:21

Address PR comments

b7b6157

Merge remote-tracking branch 'origin/master' into skottmckay/AddXamar…

1ef46e3

…inSupport_PR

edgchen1 reviewed Oct 26, 2021

View reviewed changes

edgchen1 approved these changes Oct 26, 2021

View reviewed changes

skottmckay merged commit b5a652c into master Oct 27, 2021

skottmckay deleted the skottmckay/AddXamarinSupport_PR branch October 27, 2021 10:07

Conversation

skottmckay commented Oct 19, 2021

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants