fix some issues for samples repo (dotnet#870)

* upgrade SciSharp.TensorFlow.Redist version and fix tf not working on netcore 2.1 exception * update ml.net version
ylu3 · Dec 15, 2020 · afa7a4d · afa7a4d
1 parent eb64899
commit afa7a4d
Show file tree

Hide file tree

Showing 13 changed files with 27 additions and 15 deletions.
diff --git a/samples/Directory.Build.props b/samples/Directory.Build.props
@@ -1,8 +1,8 @@
 <Project>
 
   <PropertyGroup>
-    <MicrosoftMLVersion>1.5.0</MicrosoftMLVersion>
-    <MicrosoftMLPreviewVersion>0.17.0</MicrosoftMLPreviewVersion>
+    <MicrosoftMLVersion>1.5.3</MicrosoftMLVersion>
+    <MicrosoftMLPreviewVersion>0.17.3</MicrosoftMLPreviewVersion>
   </PropertyGroup>
 
 </Project>
diff --git a/...ps/DeepLearning_ImageClassification_TF/TFImageClassification/TFImageClassification.csproj b/...ps/DeepLearning_ImageClassification_TF/TFImageClassification/TFImageClassification.csproj
@@ -11,7 +11,8 @@
     <PackageReference Include="Microsoft.ML" Version="$(MicrosoftMLVersion)" />
     <PackageReference Include="Microsoft.ML.ImageAnalytics" Version="$(MicrosoftMLVersion)" />
     <PackageReference Include="Microsoft.ML.TensorFlow" Version="$(MicrosoftMLVersion)" />
-    <PackageReference Include="SciSharp.TensorFlow.Redist" Version="2.3.0" />
+    <PackageReference Include="SciSharp.TensorFlow.Redist" Version="2.3.1" />
+    <PackageReference Condition="'$(TargetFramework)'=='netcoreapp2.1'" Include="System.Runtime.CompilerServices.Unsafe" Version="4.5.3" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/...ification_Binary/DeepLearning_ImageClassification/DeepLearning_ImageClassification.csproj b/...ification_Binary/DeepLearning_ImageClassification/DeepLearning_ImageClassification.csproj
@@ -9,8 +9,8 @@
     <PackageReference Include="Microsoft.ML" Version="$(MicrosoftMLVersion)" />
     <PackageReference Include="Microsoft.ML.ImageAnalytics" Version="$(MicrosoftMLVersion)" />
     <PackageReference Include="Microsoft.ML.Vision" Version="$(MicrosoftMLVersion)" />
-    <PackageReference Include="SciSharp.TensorFlow.Redist" Version="2.3.0" />
-    <PackageReference Condition="'$(TargetFramework)'=='netcoreapp2.1'" Include="System.Runtime.CompilerServices.Unsafe" Version="5.0.0" />
+    <PackageReference Include="SciSharp.TensorFlow.Redist" Version="2.3.1" />
+    <PackageReference Condition="'$(TargetFramework)'=='netcoreapp2.1'" Include="System.Runtime.CompilerServices.Unsafe" Version="4.5.3" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/...rning_ImageClassification_TensorFlow/ImageClassification/ImageClassification.Score.csproj b/...rning_ImageClassification_TensorFlow/ImageClassification/ImageClassification.Score.csproj
@@ -14,7 +14,8 @@
     <PackageReference Include="Microsoft.ML" Version="$(MicrosoftMLVersion)" />
     <PackageReference Include="Microsoft.ML.ImageAnalytics" Version="$(MicrosoftMLVersion)" />
     <PackageReference Include="Microsoft.ML.TensorFlow" Version="$(MicrosoftMLVersion)" />
-    <PackageReference Include="SciSharp.TensorFlow.Redist" Version="1.15.0" />
+    <PackageReference Include="SciSharp.TensorFlow.Redist" Version="2.3.1" />
+    <PackageReference Condition="'$(TargetFramework)'=='netcoreapp2.1'" Include="System.Runtime.CompilerServices.Unsafe" Version="4.5.3" />
   </ItemGroup>
 
 </Project>

diff --git a/...ageClassification_Training/ImageClassification.Predict/ImageClassification.Predict.csproj b/...ageClassification_Training/ImageClassification.Predict/ImageClassification.Predict.csproj
@@ -16,7 +16,8 @@
     <PackageReference Include="Microsoft.ML" Version="$(MicrosoftMLVersion)" />
     <PackageReference Include="Microsoft.ML.ImageAnalytics" Version="$(MicrosoftMLVersion)" />
     <PackageReference Include="Microsoft.ML.Vision" Version="$(MicrosoftMLVersion)" />
-    <PackageReference Include="SciSharp.TensorFlow.Redist" Version="2.3.0" />
+    <PackageReference Include="SciSharp.TensorFlow.Redist" Version="2.3.1" />
+    <PackageReference Condition="'$(TargetFramework)'=='netcoreapp2.1'" Include="System.Runtime.CompilerServices.Unsafe" Version="4.5.3" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/...g_ImageClassification_Training/ImageClassification.Train/ImageClassification.Train.csproj b/...g_ImageClassification_Training/ImageClassification.Train/ImageClassification.Train.csproj
@@ -15,7 +15,8 @@
     <PackageReference Include="Microsoft.ML" Version="$(MicrosoftMLVersion)" />
     <PackageReference Include="Microsoft.ML.ImageAnalytics" Version="$(MicrosoftMLVersion)" />
     <PackageReference Include="Microsoft.ML.Vision" Version="$(MicrosoftMLVersion)" />
-    <PackageReference Include="SciSharp.TensorFlow.Redist" Version="2.3.0" />
+    <PackageReference Include="SciSharp.TensorFlow.Redist" Version="2.3.1" />
+    <PackageReference Condition="'$(TargetFramework)'=='netcoreapp2.1'" Include="System.Runtime.CompilerServices.Unsafe" Version="4.5.3" />
     <PackageReference Include="SharpZipLib" Version="1.2.0" />
   </ItemGroup>
 

diff --git a/...eepLearning_ImageClassification_Training/WebApp.Predict/ImageClassification.WebApp.csproj b/...eepLearning_ImageClassification_Training/WebApp.Predict/ImageClassification.WebApp.csproj
@@ -10,7 +10,8 @@
     <PackageReference Include="Microsoft.ML" Version="$(MicrosoftMLVersion)" />
     <PackageReference Include="Microsoft.ML.ImageAnalytics" Version="$(MicrosoftMLVersion)" />
     <PackageReference Include="Microsoft.ML.Vision" Version="$(MicrosoftMLVersion)" />
-    <PackageReference Include="SciSharp.TensorFlow.Redist" Version="1.15.0" />
+    <PackageReference Include="SciSharp.TensorFlow.Redist" Version="2.3.1" />
+    <PackageReference Condition="'$(TargetFramework)'=='netcoreapp2.1'" Include="System.Runtime.CompilerServices.Unsafe" Version="4.5.3" />
     <PackageReference Include="Microsoft.Extensions.ML" Version="$(MicrosoftMLVersion)" /> 
   </ItemGroup>
 

diff --git a/...arning_TensorFlowEstimator/ImageClassification.Predict/ImageClassification.Predict.csproj b/...arning_TensorFlowEstimator/ImageClassification.Predict/ImageClassification.Predict.csproj
@@ -22,7 +22,8 @@
     <PackageReference Include="Microsoft.ML" Version="$(MicrosoftMLVersion)" />
     <PackageReference Include="Microsoft.ML.ImageAnalytics" Version="$(MicrosoftMLVersion)" />
     <PackageReference Include="Microsoft.ML.TensorFlow" Version="$(MicrosoftMLVersion)" />
-    <PackageReference Include="SciSharp.TensorFlow.Redist" Version="1.15.0" />
+    <PackageReference Include="SciSharp.TensorFlow.Redist" Version="2.3.1" />
+    <PackageReference Condition="'$(TargetFramework)'=='netcoreapp2.1'" Include="System.Runtime.CompilerServices.Unsafe" Version="4.5.3" />
   </ItemGroup>
 
 </Project>
diff --git a/...epLearning_TensorFlowEstimator/ImageClassification.Train/ImageClassification.Train.csproj b/...epLearning_TensorFlowEstimator/ImageClassification.Train/ImageClassification.Train.csproj
@@ -17,7 +17,8 @@
     <PackageReference Include="Microsoft.ML" Version="$(MicrosoftMLVersion)" />
     <PackageReference Include="Microsoft.ML.ImageAnalytics" Version="$(MicrosoftMLVersion)" />
     <PackageReference Include="Microsoft.ML.TensorFlow" Version="$(MicrosoftMLVersion)" />
-    <PackageReference Include="SciSharp.TensorFlow.Redist" Version="1.15.0" />
+    <PackageReference Include="SciSharp.TensorFlow.Redist" Version="2.3.1" />
+    <PackageReference Condition="'$(TargetFramework)'=='netcoreapp2.1'" Include="System.Runtime.CompilerServices.Unsafe" Version="4.5.3" />
     <PackageReference Include="SharpZipLib" Version="1.2.0" />
   </ItemGroup>
 

diff --git a/...rning_ImageClassification_TensorFlow/ImageClassification/ImageClassification.Score.fsproj b/...rning_ImageClassification_TensorFlow/ImageClassification/ImageClassification.Score.fsproj
@@ -13,7 +13,9 @@
     <PackageReference Include="Microsoft.ML" Version="$(MicrosoftMLVersion)" />
     <PackageReference Include="Microsoft.ML.ImageAnalytics" Version="$(MicrosoftMLVersion)" />
     <PackageReference Include="Microsoft.ML.TensorFlow" Version="$(MicrosoftMLVersion)" />
-    <PackageReference Include="SciSharp.TensorFlow.Redist" Version="2.3.0" />
+    <PackageReference Include="SciSharp.TensorFlow.Redist" Version="2.3.1" />
+    <PackageReference Condition="'$(TargetFramework)'=='netcoreapp2.1'" Include="System.Runtime.CompilerServices.Unsafe" Version="4.5.3" />
+    <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="4.5.3" />
   </ItemGroup>
 
 </Project>
diff --git a/...g_ImageClassification_Training/ImageClassification.Train/ImageClassification.Train.fsproj b/...g_ImageClassification_Training/ImageClassification.Train/ImageClassification.Train.fsproj
@@ -13,6 +13,7 @@
     <PackageReference Include="Microsoft.ML" Version="$(MicrosoftMLVersion)" />
     <PackageReference Include="Microsoft.ML.ImageAnalytics" Version="$(MicrosoftMLVersion)" />
     <PackageReference Include="Microsoft.ML.Vision" Version="$(MicrosoftMLVersion)" />
-    <PackageReference Include="SciSharp.TensorFlow.Redist" Version="1.15.0" />
+    <PackageReference Include="SciSharp.TensorFlow.Redist" Version="2.3.1" />
+    <PackageReference Condition="'$(TargetFramework)'=='netcoreapp2.1'" Include="System.Runtime.CompilerServices.Unsafe" Version="4.5.3" />
   </ItemGroup>
 </Project>
diff --git a/...arning_TensorFlowEstimator/ImageClassification.Predict/ImageClassification.Predict.fsproj b/...arning_TensorFlowEstimator/ImageClassification.Predict/ImageClassification.Predict.fsproj
@@ -13,7 +13,8 @@
     <PackageReference Include="Microsoft.ML" Version="$(MicrosoftMLVersion)" />
     <PackageReference Include="Microsoft.ML.ImageAnalytics" Version="$(MicrosoftMLVersion)" />
     <PackageReference Include="Microsoft.ML.TensorFlow" Version="$(MicrosoftMLVersion)" />
-    <PackageReference Include="SciSharp.TensorFlow.Redist" Version="2.3.0" />
+    <PackageReference Include="SciSharp.TensorFlow.Redist" Version="2.3.1" />
+    <PackageReference Condition="'$(TargetFramework)'=='netcoreapp2.1'" Include="System.Runtime.CompilerServices.Unsafe" Version="4.5.3" />
   </ItemGroup>
 
 </Project>
diff --git a/...epLearning_TensorFlowEstimator/ImageClassification.Train/ImageClassification.Train.fsproj b/...epLearning_TensorFlowEstimator/ImageClassification.Train/ImageClassification.Train.fsproj
@@ -13,7 +13,8 @@
     <PackageReference Include="Microsoft.ML" Version="$(MicrosoftMLVersion)" />
     <PackageReference Include="Microsoft.ML.ImageAnalytics" Version="$(MicrosoftMLVersion)" />
     <PackageReference Include="Microsoft.ML.TensorFlow" Version="$(MicrosoftMLVersion)" />
-    <PackageReference Include="SciSharp.TensorFlow.Redist" Version="2.3.0" />
+    <PackageReference Include="SciSharp.TensorFlow.Redist" Version="2.3.1" />
+    <PackageReference Condition="'$(TargetFramework)'=='netcoreapp2.1'" Include="System.Runtime.CompilerServices.Unsafe" Version="4.5.3" />
   </ItemGroup>
 
 </Project>