8000 fix some issues for samples repo (#870) · dotnet/machinelearning-samples@afa7a4d · GitHub
[go: up one dir, main page]
Skip to content

Commit afa7a4d

Browse files
frank-dong-ms-zzfrank-dong-ms-zz
authored
fix some issues for samples repo (#870)
* upgrade SciSharp.TensorFlow.Redist version and fix tf not working on netcore 2.1 exception * update ml.net version
1 parent eb64899 commit afa7a4d

File tree

13 files changed

+27
-15
lines changed

13 files changed

+27
-15
lines changed

‎samples/Directory.Build.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<Project>
22

33
<PropertyGroup>
4-
<MicrosoftMLVersion>1.5.0</MicrosoftMLVersion>
5-
<MicrosoftMLPreviewVersion>0.17.0< D7AF /span></MicrosoftMLPreviewVersion>
4+
<MicrosoftMLVersion>1.5.3</MicrosoftMLVersion>
5+
<MicrosoftMLPreviewVersion>0.17.3</MicrosoftMLPreviewVersion>
66
</PropertyGroup>
77

88
</Project>

‎samples/csharp/end-to-end-apps/DeepLearning_ImageClassification_TF/TFImageClassification/TFImageClassification.csproj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@
1111
<PackageReference Include="Microsoft.ML" Version="$(MicrosoftMLVersion)" />
1212
<PackageReference Include="Microsoft.ML.ImageAnalytics" Version="$(MicrosoftMLVersion)" />
1313
<PackageReference Include="Microsoft.ML.TensorFlow" Version="$(MicrosoftMLVersion)" />
14-
<PackageReference Include="SciSharp.TensorFlow.Redist" Version="2.3.0" />
14+
<PackageReference Include="SciSharp.TensorFlow.Redist" Version="2.3.1" />
15+
<PackageReference Condition="'$(TargetFramework)'=='netcoreapp2.1'" Include="System.Runtime.CompilerServices.Unsafe" Version="4.5.3" />
1516
</ItemGroup>
1617

1718
<ItemGroup>

‎samples/csharp/getting-started/DeepLearning_ImageClassification_Binary/DeepLearning_ImageClassification/DeepLearning_ImageClassification.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
<PackageReference Include="Microsoft.ML" Version="$(MicrosoftMLVersion)" />
1010
<PackageReference Include="Microsoft.ML.ImageAnalytics" Version="$(MicrosoftMLVersion)" />
1111
<PackageReference Include="Microsoft.ML.Vision" Version="$(MicrosoftMLVersion)" />
12-
<PackageReference Include="SciSharp.TensorFlow.Redist" Version="2.3.0" />
13-
<PackageReference Condition="'$(TargetFramework)'=='netcoreapp2.1'" Include="System.Runtime.CompilerServices.Unsafe" Version="5.0.0" />
12+
<PackageReference Include="SciSharp.TensorFlow.Redist" Version="2.3.1" />
13+
<PackageReference Condition="'$(TargetFramework)'=='netcoreapp2.1'" Include="System.Runtime.CompilerServices.Unsafe" Version="4.5.3" />
1414
</ItemGroup>
1515

1616
<ItemGroup>

‎samples/csharp/getting-started/DeepLearning_ImageClassification_TensorFlow/ImageClassification/ImageClassification.Score.csproj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@
1414
<PackageReference Include="Microsoft.ML" Version="$(MicrosoftMLVersion)" />
1515
<PackageReference Include="Microsoft.ML.ImageAnalytics" Version="$(MicrosoftMLVersion)" />
1616
<PackageReference Include="Microsoft.ML.TensorFlow" Version="$(MicrosoftMLVersion) F438 " />
17-
<PackageReference Include="SciSharp.TensorFlow.Redist" Version="1.15.0" />
17+
<PackageReference Include="SciSharp.TensorFlow.Redist" Version="2.3.1" />
18+
<PackageReference Condition="'$(TargetFramework)'=='netcoreapp2.1'" Include="System.Runtime.CompilerServices.Unsafe" Version="4.5.3" />
1819
</ItemGroup>
1920

2021
</Project>

‎samples/csharp/getting-started/DeepLearning_ImageClassification_Training/ImageClassification.Predict/ImageClassification.Predict.csproj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@
1616
<PackageReference Include="Microsoft.ML" Version="$(MicrosoftMLVersion)" />
1717
<PackageReference Include="Microsoft.ML.ImageAnalytics" Version="$(MicrosoftMLVersion)" />
1818
<PackageReference Include="Microsoft.ML.Vision" Version="$(MicrosoftMLVersion)" />
19-
<PackageReference Include="SciSharp.TensorFlow.Redist" Version="2.3.0" />
19+
<PackageReference Include="SciSharp.TensorFlow.Redist" Version="2.3.1" />
20+
<PackageReference Condition="'$(TargetFramework)'=='netcoreapp2.1'" Include="System.Runtime.CompilerServices.Unsafe" Version="4.5.3" />
2021
</ItemGroup>
2122

2223
<ItemGroup>

‎samples/csharp/getting-started/DeepLearning_ImageClassification_Training/ImageClassification.Train/ImageClassification.Train.csproj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@
1515
<PackageReference Include="Microsoft.ML" Version="$(MicrosoftMLVersion)" />
1616
<PackageReference Include="Microsoft.ML.ImageAnalytics" Version="$(MicrosoftMLVersion)" />
1717
<PackageReference Include="Microsoft.ML.Vision" Version="$(MicrosoftMLVersion)" />
18-
<PackageReference Include="SciSharp.TensorFlow.Redist" Version="2.3.0" />
18+
<PackageReference Include="SciSharp.TensorFlow.Redist" Version="2.3.1" />
19+
<PackageReference Condition="'$(TargetFramework)'=='netcoreapp2.1'" Include="System.Runtime.CompilerServices.Unsafe" Version="4.5.3" />
1920
<PackageReference Include="SharpZipLib" Version="1.2.0" />
2021
</ItemGroup>
2122

‎samples/csharp/getting-started/DeepLearning_ImageClassification_Training/WebApp.Predict/ImageClassification.WebApp.csproj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@
1010
<PackageReference Include="Microsoft.ML" Version="$(MicrosoftMLVersion)" />
1111
<PackageReference Include="Microsoft.ML.ImageAnalytics" Version="$(MicrosoftMLVersion)" />
1212
<PackageReference Include="Microsoft.ML.Vision" Version="$(MicrosoftMLVersion)" />
13-
<PackageReference Include="SciSharp.TensorFlow.Redist" Version="1.15.0" />
13+
<PackageReference Include="SciSharp.TensorFlow.Redist" Version="2.3.1" />
14+
<PackageReference Condition="'$(TargetFramework)'=='netcoreapp2.1'" Include="System.Runtime.CompilerServices.Unsafe" Version="4.5.3" />
1415
<PackageReference Include="Microsoft.Extensions.ML" Version="$(MicrosoftMLVersion)" />
1516
</ItemGroup>
1617

‎samples/csharp/getting-started/DeepLearning_TensorFlowEstimator/ImageClassification.Predict/ImageClassification.Predict.csproj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@
2222
<PackageReference Include="Microsoft.ML" Version="$(MicrosoftMLVersion)" />
2323
<PackageReference Include="Microsoft.ML.ImageAnalytics" Version="$(MicrosoftMLVersion)" />
2424
<PackageReference Include="Microsoft.ML.TensorFlow" Version="$(MicrosoftMLVersion)" />
25-
<PackageReference Include="SciSharp.TensorFlow.Redist" Version="1.15.0" />
25+
<PackageReference Include="SciSharp.TensorFlow.Redist" Version="2.3.1" />
26+
<PackageReference Condition="'$(TargetFramework)'=='netcoreapp2.1'" Include="System.Runtime.CompilerServices.Unsafe" Version="4.5.3" />
2627
</ItemGroup>
2728

2829
</Project>

‎samples/csharp/getting-started/DeepLearning_TensorFlowEstimator/ImageClassification.Train/ImageClassification.Train.csproj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@
1717
<PackageReference Include="Microsoft.ML" Version="$(MicrosoftMLVersion)" />
1818
<PackageReference Include="Microsoft.ML.ImageAnalytics" Version="$(MicrosoftMLVersion)" />
1919
<PackageReference Include="Microsoft.ML.TensorFlow" Version="$(MicrosoftMLVersion)" />
20-
<PackageReference Include="SciSharp.TensorFlow.Redist" Version="1.15.0" />
20+
<PackageReference Include="SciSharp.TensorFlow.Redist" Version="2.3.1" />
21+
<PackageReference Condition="'$(TargetFramework)'=='netcoreapp2.1'" Include="System.Runtime.CompilerServices.Unsafe" Version="4.5.3" />
2122
<PackageReference Include="SharpZipLib" Version="1.2.0" />
2223
</ItemGroup>
2324

6377 ‎samples/fsharp/getting-started/DeepLearning_ImageClassification_TensorFlow/ImageClassification/ImageClassification.Score.fsproj

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,9 @@
1313
<PackageReference Include="Microsoft.ML" Version="$(MicrosoftMLVersion)" />
1414
<PackageReference Include="Microsoft.ML.ImageAnalytics" Version="$(MicrosoftMLVersion)" />
1515
<PackageReference Include="Microsoft.ML.TensorFlow" Version="$(MicrosoftMLVersion)" />
16-
<PackageReference Include="SciSharp.TensorFlow.Redist" Version="2.3.0" />
16+
<PackageReference Include="SciSharp.TensorFlow.Redist" Version="2.3.1" />
17+
<PackageReference Condition="'$(TargetFramework)'=='netcoreapp2.1'" Include="System.Runtime.CompilerServices.Unsafe" Version="4.5.3" />
18+
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="4.5.3" />
1719
</ItemGroup>
1820

1921
</Project>

0 commit comments

Comments
 (0)
0