Merge branch 'master' into user/numform/gallery-bundle-arm64

nums11 · nums11 · commit efc11ed2fc87 · 2021-11-18T10:34:01.000-08:00
diff --git a/Samples/WinMLSamplesGallery/WinMLSamplesGallery (Package)/Package.appxmanifest b/Samples/WinMLSamplesGallery/WinMLSamplesGallery (Package)/Package.appxmanifest
@@ -31,7 +31,7 @@
       Executable="$targetnametoken$.exe"
       EntryPoint="$targetentrypoint$">
       <uap:VisualElements
-        DisplayName="Windows ML SamplesGallery"
+        DisplayName="Windows ML Samples Gallery"
         Description="WinMLSamplesGallery (Package)"
         BackgroundColor="transparent"
         Square150x150Logo="Images\Square150x150Logo.png"
diff --git a/Samples/WinMLSamplesGallery/WinMLSamplesGallery/MainWindow.xaml b/Samples/WinMLSamplesGallery/WinMLSamplesGallery/MainWindow.xaml
@@ -15,7 +15,7 @@
             BackRequested="nvSample_BackRequested"
             Loaded="nvSample_Loaded"
             AlwaysShowHeader="False"
-            PaneTitle="Windows AI"
+            PaneTitle="Windows ML"
             FontFamily="Arial"
             IsSettingsVisible="False">
             <NavigationView.Resources>
@@ -26,6 +26,11 @@
                 <NavigationViewItem Icon="Flag" Content="Home" Tag="home" />
                 <NavigationViewItem Icon="Library" Content="All samples" Tag="all_samples" />
                 <NavigationViewItemSeparator />
+                <TextBlock>
+                    <Hyperlink TextDecorations="None" NavigateUri="https://docs.microsoft.com/en-us/windows/ai/windows-ml/">
+                        Learn more about Windows ML
+                    </Hyperlink>
+                </TextBlock>
             </NavigationView.MenuItems>
             <Frame x:Name="contentFrame" Navigated="contentFrame_Navigated" BorderBrush="#dbdbdb" BorderThickness="1,1,0,0" Margin="0,40,0,0"
                    CornerRadius="5,0,0,0" Background="White" FontFamily="Arial"/>
diff --git a/Samples/WinMLSamplesGallery/WinMLSamplesGallery/SampleMetadata/SampleMetadata.json b/Samples/WinMLSamplesGallery/WinMLSamplesGallery/SampleMetadata/SampleMetadata.json
@@ -3,7 +3,7 @@
     {
       "Title": "Image Classification",
       "DescriptionShort": "Pick an image and classify the scene into 1000 categories such as keyboard, mouse, pencil, and many animals.",
-      "Description": "Pick an image and classify the scene into 1000 categories such as keyboard, mouse, pencil, and many animals. Many more models can be tested with this sample by building the WinML Samples Gallery App from source from the project GitHub. Select an image to classify.",
+      "Description": "Pick an image and classify the scene into 1000 categories such as keyboard, mouse, pencil, and many animals. Many more models can be tested with this sample by building the Windows ML Samples Gallery App from source from the project GitHub. Select an image to classify.",
       "Icon": "\uE155",
       "Tag": "ImageClassifier",
       "XAMLGithubLink": "https://github.com/microsoft/Windows-Machine-Learning/blob/master/Samples/WinMLSamplesGallery/WinMLSamplesGallery/Samples/ImageClassifier/ImageClassifier.xaml",
@@ -12,8 +12,8 @@
     },
     {
       "Title": "Image Effects",
-      "DescriptionShort": "Pick an image and apply a variety of effects powered by Windows AI MachineLearning like Blur, Sharpen, Contrast, and many more.",
-      "Description": "Pick an image and apply a variety of effects powered by Windows AI MachineLearning like Blur, Sharpen, Contrast, and many more.",
+      "DescriptionShort": "Pick an image and apply a variety of effects powered by Windows ML like Blur, Sharpen, Contrast, and many more.",
+      "Description": "Pick an image and apply a variety of effects powered by Windows ML like Blur, Sharpen, Contrast, and many more.",
       "Icon": "\uE155",
       "Tag": "ImageEffects",
       "XAMLGithubLink": "https://github.com/microsoft/Windows-Machine-Learning/blob/master/Samples/WinMLSamplesGallery/WinMLSamplesGallery/Samples/ImageEffects/ImageEffects.xaml",
diff --git a/Samples/WinMLSamplesGallery/WinMLSamplesGallery/Samples/Batching/README.md b/Samples/WinMLSamplesGallery/WinMLSamplesGallery/Samples/Batching/README.md
@@ -1,4 +1,4 @@
-# WinML Samples Gallery: Batching
+# Windows ML Samples Gallery: Batching
  Perform infererence over multiple inputs at once to increase runtime performance.
  
  Use this sample to compare inference runtime performace with and without batched inputs. 50 images will be passed through SqueezeNet for classification. Set a batch size and click Start Inference to compare.
@@ -20,7 +20,7 @@
 - **Note**: To use batched inputs, the model must have a value of -1 or a variable name in the input batch dimension. Additionally, the DATA_BATCH Denotation must be added on the batch dimension. To edit your model you can use tools like [WinML Dashboard](https://github.com/Microsoft/Windows-Machine-Learning/tree/master/Tools/WinMLDashboard).
 
 ## Feedback
-Please file an issue [here](https://github.com/microsoft/Windows-Machine-Learning/issues/new) if you encounter any issues with the WinML Samples Gallery or wish to request a new sample.
+Please file an issue [here](https://github.com/microsoft/Windows-Machine-Learning/issues/new) if you encounter any issues with the Windows ML Samples Gallery or wish to request a new sample.
 
 ## External Links
 
diff --git a/Samples/WinMLSamplesGallery/WinMLSamplesGallery/Samples/ImageClassifier/ImageClassifier.xaml.cs b/Samples/WinMLSamplesGallery/WinMLSamplesGallery/Samples/ImageClassifier/ImageClassifier.xaml.cs
@@ -125,6 +125,8 @@ public ImageClassifier()
             AllModelsGrid.ItemsSource = allModels;
             AllModelsGrid.SelectRange(new ItemIndexRange(0, 1));
             AllModelsGrid.SelectionChanged += AllModelsGrid_SelectionChanged;
+
+            BasicGridView.SelectedIndex = 0;
         }
 
         private void EnsureInitialized()
diff --git a/Samples/WinMLSamplesGallery/WinMLSamplesGallery/Samples/ImageEffects/README.md b/Samples/WinMLSamplesGallery/WinMLSamplesGallery/Samples/ImageEffects/README.md
@@ -1,5 +1,5 @@
 ﻿# WinML Samples Gallery: Image Effects
-Pick an image and apply a variety of effects powered by Windows AI MachineLearning like Blur, Sharpen, Contrast, and many more. These effects can be used to perform model input image preprocessing, or postprocessing for visualizing outputs.
+Pick an image and apply a variety of effects powered by Windows ML like Blur, Sharpen, Contrast, and many more. These effects can be used to perform model input image preprocessing, or postprocessing for visualizing outputs.
 
 This sample demonstrates using the ```Windows.AI.MachineLearning.Experimental``` namespace to create efficient pre and post processing models in ONNX.
 
diff --git a/Samples/WinMLSamplesGallery/WinMLSamplesGallery/Samples/ImageSharpInterop/ImageSharpInterop.xaml.cs b/Samples/WinMLSamplesGallery/WinMLSamplesGallery/Samples/ImageSharpInterop/ImageSharpInterop.xaml.cs
@@ -64,6 +64,7 @@ public ImageSharpInterop()
             _inferenceSession = CreateLearningModelSession("ms-appx:///Models/squeezenet1.1-7.onnx");
             _postProcessingSession = CreateLearningModelSession(TensorizationModels.SoftMaxThenTopK(TopK));
 
+            BasicGridView.SelectedIndex = 0;
         }
 
 #pragma warning disable CA1416 // Validate platform compatibility
diff --git a/Samples/WinMLSamplesGallery/WinMLSamplesGallery/Samples/ImageSharpInterop/README.md b/Samples/WinMLSamplesGallery/WinMLSamplesGallery/Samples/ImageSharpInterop/README.md
@@ -1,4 +1,4 @@
-﻿# WinML Samples Gallery: ImageSharp Interop
+﻿# Windows ML Samples Gallery: ImageSharp Interop
 This sample demonstrates how to interop between [Windows ML](https://docs.microsoft.com/en-us/windows/ai/windows-ml/) and [ImageSharp](https://docs.sixlabors.com/articles/imagesharp/index.html).
 
 ImageSharp is a new, fully featured, fully managed, cross-platform, 2D graphics library.
diff --git a/Samples/WinMLSamplesGallery/WinMLSamplesGallery/Samples/OpenCVInterop/OpenCVInterop.xaml b/Samples/WinMLSamplesGallery/WinMLSamplesGallery/Samples/OpenCVInterop/OpenCVInterop.xaml
@@ -106,7 +106,7 @@
                                 </Grid>
                             </Border>
                             <Grid Background="LightGray" HorizontalAlignment="Center" Height="200" Width="200" VerticalAlignment="Top">
-                                <Image x:Name="InputImage" Stretch="UniformToFill" Height="200" HorizontalAlignment="Center"/>
+                                <Image x:Name="InputImage" Stretch="UniformToFill" Height="200" HorizontalAlignment="Center"/>
                             </Grid>
                             <Button Content="Classify" x:Name="InferOriginal" IsEnabled="false" FontFamily="Segoe UI Light" Typography.Capitals="AllSmallCaps" Typography.StylisticSet4="True"
                                     Style="{StaticResource AccentButtonStyle}" Width="200"
@@ -120,7 +120,7 @@
                                 </Grid>
                             </Border>
                             <Grid Background="LightGray" HorizontalAlignment="Center" Height="200" Width="200" VerticalAlignment="Top">
-                                <Image x:Name="NoisyImage" Stretch="UniformToFill" Height="200" HorizontalAlignment="Center"/>
+                                <Image x:Name="NoisyImage" Stretch="UniformToFill" Height="200" HorizontalAlignment="Center"/>
                             </Grid>
                             <Button Content="Classify" x:Name="InferNoisy" IsEnabled="false" FontFamily="Segoe UI Light" Typography.Capitals="AllSmallCaps" Typography.StylisticSet4="True"
                                     Style="{StaticResource AccentButtonStyle}" Width="200"
@@ -134,7 +134,7 @@
                                 </Grid>
                             </Border>
                             <Grid Background="LightGray" HorizontalAlignment="Center" Height="200" Width="200" VerticalAlignment="Top">
-                                <Image x:Name="DenoisedImage" Stretch="UniformToFill" Height="200" HorizontalAlignment="Center"/>
+                                <Image x:Name="DenoisedImage" Stretch="UniformToFill" Height="200" HorizontalAlignment="Center"/>
                             </Grid>
                             <Button Content="Classify" x:Name="InferDenoised" IsEnabled="false" FontFamily="Segoe UI Light" Typography.Capitals="AllSmallCaps" Typography.StylisticSet4="True"
                                     Style="{StaticResource AccentButtonStyle}" Width="200"
diff --git a/Samples/WinMLSamplesGallery/WinMLSamplesGallery/Samples/OpenCVInterop/OpenCVInterop.xaml.cs b/Samples/WinMLSamplesGallery/WinMLSamplesGallery/Samples/OpenCVInterop/OpenCVInterop.xaml.cs
@@ -118,6 +118,8 @@ public OpenCVInterop()
             _imagenetLabels = LoadLabels("ms-appx:///InputData/sysnet.txt");
             _inferenceSession = CreateLearningModelSession("ms-appx:///Models/squeezenet1.1-7.onnx");
             _postProcessingSession = CreateLearningModelSession(TensorizationModels.SoftMaxThenTopK(TopK));
+
+            BasicGridView.SelectedIndex = 0;
         }
 
 #pragma warning disable CA1416 // Validate platform compatibility
diff --git a/Samples/WinMLSamplesGallery/WinMLSamplesGallery/Samples/OpenCVInterop/README.md b/Samples/WinMLSamplesGallery/WinMLSamplesGallery/Samples/OpenCVInterop/README.md
@@ -1,4 +1,4 @@
-﻿# WinML Samples Gallery: OpenCV Interop
+﻿# Windows ML Samples Gallery: OpenCV Interop
 This sample demonstrates how to interop between [Windows ML](https://docs.microsoft.com/en-us/windows/ai/windows-ml/) and [OpenCV](https://github.com/opencv/opencv).
 
 OpenCV (Open Source Computer Vision Library) is an open source computer vision and machine learning software library. OpenCV was built to provide a common infrastructure for computer vision applications and to accelerate the use of machine perception in the commercial products. 
@@ -21,7 +21,7 @@ Windows ML will be used to resize and tensorize the image into NCHW format, as w
 See [ThirdPartyNotices.txt](../../../../../ThirdPartyNotices.txt) for relevant license info.
 
 ## Getting Started
-In order to build this sample, OpenCV will need to be built and linked into the WinML Samples Gallery. The OpenCV project is included as a submodule, and will need to be synced and built for your Platform Architecture and Configuration before it will appear in the Windows ML Samples Gallery. To do so follow these instructions:
+In order to build this sample, OpenCV will need to be built and linked into the Windows ML Samples Gallery. The OpenCV project is included as a submodule, and will need to be synced and built for your Platform Architecture and Configuration before it will appear in the Windows ML Samples Gallery. To do so follow these instructions:
 - Launch a Visual Studio Developer Command Prompt.
 - Navigate to the `repository root` directory.
 - Sync submodules with `git submodule update --init --recursive`
diff --git a/Samples/WinMLSamplesGallery/WinMLSamplesGallery/WinMLSamplesGallery.csproj b/Samples/WinMLSamplesGallery/WinMLSamplesGallery/WinMLSamplesGallery.csproj
@@ -50,7 +50,6 @@
 
   <!-- Models to include in the app -->
   <ItemGroup>
-    <Content Include="Models\yolov4.onnx" />
     <Content Include="Models\densenet-9.onnx" />
     <Content Include="Models\efficientnet-lite4-11.onnx" />
     <Content Include="Models\shufflenet-9.onnx" />
@@ -171,9 +170,6 @@
     <DownloadFile Condition="!Exists('$(MSBuildProjectDirectory)\Models\squeezenet1.1-7.onnx')" SourceUrl="https://github.com/onnx/models/raw/master/vision/classification/squeezenet/model/squeezenet1.1-7.onnx" DestinationFolder="$(MSBuildProjectDirectory)\Models">
       <Output TaskParameter="DownloadedFile" ItemName="Content" />
     </DownloadFile>
-    <DownloadFile Condition="!Exists('$(MSBuildProjectDirectory)\Models\yolov4.onnx')" SourceUrl="https://github.com/onnx/models/raw/master/vision/object_detection_segmentation/yolov4/model/yolov4.onnx" DestinationFolder="$(MSBuildProjectDirectory)\Models">
-      <Output TaskParameter="DownloadedFile" ItemName="Content" />
-    </DownloadFile>
 
     <!-- Large models. This models must be enabled for Build-From-Source scenarios -->
     <DownloadFile Condition="$(UseLargeModels) AND !Exists('$(MSBuildProjectDirectory)\LargeModels\bvlcalexnet-9.onnx')" SourceUrl="https://github.com/onnx/models/raw/master/vision/classification/alexnet/model/bvlcalexnet-9.onnx" DestinationFolder="$(MSBuildProjectDirectory)\LargeModels">

Original file line number	Diff line number	Diff line change
`@@ -125,6 +125,8 @@ public ImageClassifier()`
`125`	`125`	`AllModelsGrid.ItemsSource = allModels;`
`126`	`126`	`AllModelsGrid.SelectRange(new ItemIndexRange(0, 1));`
`127`	`127`	`AllModelsGrid.SelectionChanged += AllModelsGrid_SelectionChanged;`
	`128`	`+`
	`129`	`+ BasicGridView.SelectedIndex = 0;`
`128`	`130`	`}`
`129`	`131`
`130`	`132`	`private void EnsureInitialized()`
Original file line number	Diff line number	Diff line change
`@@ -64,6 +64,7 @@ public ImageSharpInterop()`
`64`	`64`	`_inferenceSession = CreateLearningModelSession("ms-appx:///Models/squeezenet1.1-7.onnx");`
`65`	`65`	`_postProcessingSession = CreateLearningModelSession(TensorizationModels.SoftMaxThenTopK(TopK));`
`66`	`66`
	`67`	`+ BasicGridView.SelectedIndex = 0;`
`67`	`68`	`}`
`68`	`69`
`69`	`70`	`#pragma warning disable CA1416 // Validate platform compatibility`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-# WinML Samples Gallery: ImageSharp Interop`
	`1`	`+# Windows ML Samples Gallery: ImageSharp Interop`
`2`	`2`	`This sample demonstrates how to interop between [Windows ML](https://docs.microsoft.com/en-us/windows/ai/windows-ml/) and [ImageSharp](https://docs.sixlabors.com/articles/imagesharp/index.html).`
`3`	`3`
`4`	`4`	`ImageSharp is a new, fully featured, fully managed, cross-platform, 2D graphics library.`
Original file line number	Diff line number	Diff line change
`@@ -118,6 +118,8 @@ public OpenCVInterop()`
`118`	`118`	`_imagenetLabels = LoadLabels("ms-appx:///InputData/sysnet.txt");`
`119`	`119`	`_inferenceSession = CreateLearningModelSession("ms-appx:///Models/squeezenet1.1-7.onnx");`
`120`	`120`	`_postProcessingSession = CreateLearningModelSession(TensorizationModels.SoftMaxThenTopK(TopK));`
	`121`	`+`
	`122`	`+ BasicGridView.SelectedIndex = 0;`
`121`	`123`	`}`
`122`	`124`
`123`	`125`	`#pragma warning disable CA1416 // Validate platform compatibility`