Skip to content

Commit 97d7e74

Browse files
martinb35martinb35
authored
User/brianma/samplesgallery (#442)
* remove settings button that doesn't do anything * remove commented out code * change "1.9.1" subtitle to "Samples Gallery" * update batching text to highlight the greater change that happens on GPU * change "DML" -> "GPU" in all device selector drop downs for consistency. * use "DirectML" instead of "GPU" for device selector. Also fix a typo.
1 parent 044edf5 commit 97d7e74

File tree

10 files changed

+21
-28
lines changed

10 files changed

+21
-28
lines changed

‎Samples/WinMLSamplesGallery/WinMLSamplesGallery/Controls/DeviceComboBox.xaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
<ComboBox x:Name="DeviceBox" SelectedIndex="0" SelectionChanged="changeSelectedIndex">
1111
<x:String>CPU</x:String>
12-
<x:String>GPU</x:String>
12+
<x:String>DirectML</x:String>
1313
</ComboBox>
1414

1515
</UserControl>

‎Samples/WinMLSamplesGallery/WinMLSamplesGallery/MainWindow.xaml‎

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@
1616
Loaded="nvSample_Loaded"
1717
AlwaysShowHeader="False"
1818
PaneTitle="Windows AI"
19-
FontFamily="Arial">
19+
FontFamily="Arial"
20+
IsSettingsVisible="False">
2021
<NavigationView.Resources>
2122
<SolidColorBrush x:Key="NavigationViewExpandedPaneBackground" Color="#f5f5f5"/>
2223
<SolidColorBrush x:Key="NavigationViewDefaultPaneBackground" Color="#f5f5f5" />
@@ -25,14 +26,6 @@
2526
<NavigationViewItem Icon="Flag" Content="Home" Tag="home" />
2627
<NavigationViewItem Icon="Library" Content="All samples" Tag="all_samples" />
2728
<NavigationViewItemSeparator />
28-
<!--
29-
<NavigationViewItemHeader>Workloads</NavigationViewItemHeader>
30-
<NavigationViewItem Icon="Library" Content="Image" Tag="image" IsEnabled="False" />
31-
<NavigationViewItem Icon="Library" Content="Video" Tag="video" IsEnabled="False" />
32-
<NavigationViewItem Icon="Library" Content="Audio" Tag="audio" IsEnabled="False" />
33-
<NavigationViewItemSeparator />
34-
<NavigationViewItem Icon="Library" Content="Benchmark" Tag="benchmark" IsEnabled="False" />
35-
-->
3629
</NavigationView.MenuItems>
3730
<Frame x:Name="contentFrame" Navigated="contentFrame_Navigated" BorderBrush="#dbdbdb" BorderThickness="1,1,0,0" Margin="0,40,0,0"
3831
CornerRadius="5,0,0,0" Background="White" FontFamily="Arial"/>

‎Samples/WinMLSamplesGallery/WinMLSamplesGallery/Pages/HomePage.xaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<Image Source="assets/winml_icon.ico" Stretch="UniformToFill" Height="200" VerticalAlignment="Center"/>
2020
<StackPanel Orientation="Vertical" Padding="25,0,0,0" VerticalAlignment="Center">
2121
<TextBlock Foreground="#12bef6" FontSize="60" FontFamily="Segoe UI Light" FontWeight="SemiBold" HorizontalAlignment="Center">Windows ML</TextBlock>
22-
<TextBlock Foreground="#12bef6" FontSize="50" FontFamily="Segoe UI Light" FontWeight="SemiBold" HorizontalAlignment="Center">1.9.1</TextBlock>
22+
<TextBlock Foreground="#12bef6" FontSize="60" FontFamily="Segoe UI Light" FontWeight="SemiBold" HorizontalAlignment="Center">Samples Gallery</TextBlock>
2323
</StackPanel>
2424
</StackPanel>
2525
</Grid>

‎Samples/WinMLSamplesGallery/WinMLSamplesGallery/SampleMetadata/SampleMetadata.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
{
2424
"Title": "Batched Inputs",
2525
"DescriptionShort": "Perform infererence over multiple inputs at once to increase runtime performance.",
26-
"Description": "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.",
26+
"Description": "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. Note that in general batching makes a greater improvement on GPU than it does on CPU.",
2727
"Icon": "\uE155",
2828
"Tag": "Batching",
2929
"XAMLGithubLink": "https://github.com/microsoft/Windows-Machine-Learning/blob/master/Samples/WinMLSamplesGallery/WinMLSamplesGallery/Samples/Batching/Batching.xaml",

‎Samples/WinMLSamplesGallery/WinMLSamplesGallery/Samples/ImageClassifier/ImageClassifier.xaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,12 +70,12 @@
7070
<StackPanel Grid.Row="0" Orientation="Horizontal" Padding="0,10,0,0">
7171
<StackPanel Orientation="Vertical">
7272
<StackPanel Orientation="Horizontal" HorizontalAlignment="Left">
73-
<Button FontFamily="Segoe MDL2 Assets" Content="&#xE1A5;" Width="97" Height="50" HorizontalAlignment="Left" Click="OpenButton_Clicked" />
73+
<Button FontFamily="Segoe MDL2 Assets" Content="&#xE1A5;" Width="55" Height="50" HorizontalAlignment="Left" Click="OpenButton_Clicked" />
7474
<Grid Padding="5,0,0,0">
75-
<ComboBox x:Name="DeviceComboBox" SelectedIndex="0" Background="LightGray" PlaceholderText="Device" Height="50" Width="97"
75+
<ComboBox x:Name="DeviceComboBox" SelectedIndex="0" Background="LightGray" PlaceholderText="Device" Height="50" Width="139"
7676
SelectionChanged="DeviceComboBox_SelectionChanged">
7777
<TextBlock Text="CPU" FontSize="18" Typography.Capitals="AllSmallCaps" Typography.StylisticSet4="True"/>
78-
<TextBlock Text="DML" FontSize="18" Typography.Capitals="AllSmallCaps" Typography.StylisticSet4="True"/>
78+
<TextBlock Text="DirectML" FontSize="18" Typography.Capitals="AllSmallCaps" Typography.StylisticSet4="True"/>
7979
</ComboBox>
8080
</Grid>
8181
</StackPanel>

‎Samples/WinMLSamplesGallery/WinMLSamplesGallery/Samples/ImageEffects/ImageEffects.xaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -122,12 +122,12 @@
122122
<StackPanel Grid.Row="0" Orientation="Horizontal" Padding="0,10,0,0">
123123
<StackPanel Orientation="Vertical">
124124
<StackPanel Orientation="Horizontal" HorizontalAlignment="Left">
125-
<Button FontFamily="Segoe MDL2 Assets" Content="&#xE1A5;" Width="97" Height="50" HorizontalAlignment="Left" Click="OpenButton_Clicked" />
125+
<Button FontFamily="Segoe MDL2 Assets" Content="&#xE1A5;" Width="55" Height="50" HorizontalAlignment="Left" Click="OpenButton_Clicked" />
126126
<Grid Padding="5,0,0,0">
127-
<ComboBox x:Name="DeviceComboBox" SelectedIndex="0" Background="LightGray" PlaceholderText="Device" Height="50" Width="97"
127+
<ComboBox x:Name="DeviceComboBox" SelectedIndex="0" Background="LightGray" PlaceholderText="Device" Height="50" Width="139"
128128
SelectionChanged="DeviceComboBox_SelectionChanged">
129129
<TextBlock Text="CPU" FontSize="18" Typography.Capitals="AllSmallCaps" Typography.StylisticSet4="True"/>
130-
<TextBlock Text="DML" FontSize="18" Typography.Capitals="AllSmallCaps" Typography.StylisticSet4="True"/>
130+
<TextBlock Text="DirectML" FontSize="18" Typography.Capitals="AllSmallCaps" Typography.StylisticSet4="True"/>
131131
</ComboBox>
132132
</Grid>
133133
</StackPanel>

‎Samples/WinMLSamplesGallery/WinMLSamplesGallery/Samples/ImageSharpInterop/ImageSharpInterop.xaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,12 +72,12 @@
7272
<StackPanel Grid.Row="0" Orientation="Horizontal" Padding="0,10,0,0">
7373
<StackPanel Orientation="Vertical">
7474
<StackPanel Orientation="Horizontal" HorizontalAlignment="Left">
75-
<Button FontFamily="Segoe MDL2 Assets" Content="&#xE1A5;" Width="97" Height="50" HorizontalAlignment="Left" Click="OpenButton_Clicked" />
75+
<Button FontFamily="Segoe MDL2 Assets" Content="&#xE1A5;" Width="55" Height="50" HorizontalAlignment="Left" Click="OpenButton_Clicked" />
7676
<Grid Padding="5,0,0,0">
77-
<ComboBox x:Name="DeviceComboBox" SelectedIndex="0" Background="LightGray" PlaceholderText="Device" Height="50" Width="97"
77+
<ComboBox x:Name="DeviceComboBox" SelectedIndex="0" Background="LightGray" PlaceholderText="Device" Height="50" Width="139"
7878
SelectionChanged="DeviceComboBox_SelectionChanged">
7979
<TextBlock Text="CPU" FontSize="18" Typography.Capitals="AllSmallCaps" Typography.StylisticSet4="True"/>
80-
<TextBlock Text="DML" FontSize="18" Typography.Capitals="AllSmallCaps" Typography.StylisticSet4="True"/>
80+
<TextBlock Text="DirectML" FontSize="18" Typography.Capitals="AllSmallCaps" Typography.StylisticSet4="True"/>
8181
</ComboBox>
8282
</Grid>
8383
</StackPanel>

‎Samples/WinMLSamplesGallery/WinMLSamplesGallery/Samples/ObjectDetector/ObjectDetector.xaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -127,12 +127,12 @@
127127
<StackPanel Grid.Row="0" Orientation="Horizontal" Padding="5,10,0,0">
128128
<StackPanel Orientation="Vertical">
129129
<StackPanel Orientation="Horizontal" HorizontalAlignment="Left">
130-
<Button FontFamily="Segoe MDL2 Assets" Content="&#xE1A5;" Width="97" Height="50" HorizontalAlignment="Left" Click="OpenButton_Clicked" />
130+
<Button FontFamily="Segoe MDL2 Assets" Content="&#xE1A5;" Width="55" Height="50" HorizontalAlignment="Left" Click="OpenButton_Clicked" />
131131
<Grid Padding="5,0,0,0">
132-
<ComboBox x:Name="DeviceComboBox" SelectedIndex="0" Background="LightGray" PlaceholderText="Device" Height="50" Width="97"
132+
<ComboBox x:Name="DeviceComboBox" SelectedIndex="0" Background="LightGray" PlaceholderText="Device" Height="50" Width="139"
133133
SelectionChanged="DeviceComboBox_SelectionChanged">
134134
<TextBlock Text="CPU" FontSize="18" Typography.Capitals="AllSmallCaps" Typography.StylisticSet4="True"/>
135-
<TextBlock Text="DML" FontSize="18" Typography.Capitals="AllSmallCaps" Typography.StylisticSet4="True"/>
135+
<TextBlock Text="DirectML" FontSize="18" Typography.Capitals="AllSmallCaps" Typography.StylisticSet4="True"/>
136136
</ComboBox>
137137
</Grid>
138138
</StackPanel>

‎Samples/WinMLSamplesGallery/WinMLSamplesGallery/Samples/OpenCVInterop/OpenCVInterop.xaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,12 +70,12 @@
7070
<StackPanel Grid.Row="0" Orientation="Horizontal" Padding="0,10,0,0">
7171
<StackPanel Orientation="Vertical">
7272
<StackPanel Orientation="Horizontal" HorizontalAlignment="Left">
73-
<Button FontFamily="Segoe MDL2 Assets" Content="&#xE1A5;" Width="97" Height="50" HorizontalAlignment="Left" Click="OpenButton_Clicked" />
73+
<Button FontFamily="Segoe MDL2 Assets" Content="&#xE1A5;" Width="55" Height="50" HorizontalAlignment="Left" Click="OpenButton_Clicked" />
7474
<Grid Padding="5,0,0,0">
75-
<ComboBox x:Name="DeviceComboBox" SelectedIndex="0" Background="LightGray" PlaceholderText="Device" Height="50" Width="97"
75+
<ComboBox x:Name="DeviceComboBox" SelectedIndex="0" Background="LightGray" PlaceholderText="Device" Height="50" Width="139"
7676
SelectionChanged="DeviceComboBox_SelectionChanged">
7777
<TextBlock Text="CPU" FontSize="18" Typography.Capitals="AllSmallCaps" Typography.StylisticSet4="True"/>
78-
<TextBlock Text="DML" FontSize="18" Typography.Capitals="AllSmallCaps" Typography.StylisticSet4="True"/>
78+
<TextBlock Text="DirectML" FontSize="18" Typography.Capitals="AllSmallCaps" Typography.StylisticSet4="True"/>
7979
</ComboBox>
8080
</Grid>
8181
</StackPanel>

‎Samples/WinMLSamplesGallery/WinMLSamplesGallery/Samples/OpenCVInterop/OpenCVInterop.xaml.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ private static LearningModelEvaluationResult Evaluate(LearningModelSession sessi
173173
// Create the binding
174174
var binding = new LearningModelBinding(session);
175175

176-
// Create an emoty output, that will keep the output resources on the GPU
176+
// Create an empty output, that will keep the output resources on the GPU
177177
// It will be chained into a the post processing on the GPU as well
178178
var output = TensorFloat.Create();
179179

0 commit comments

Comments
 (0)