Skip to content

Commit 81cae9a

Browse files
Bri Achtmanjustinormontluisquintanilla
authored
1.5 mlnet update (#839)
* update ml.net versions * update proj to .net core 3.1 * shorten ccfraud project / file name Fixes Error MSB3491 * update image classification training solution to .net core 3 * update ranking sample to .net core 3.1 * Update BikeDemandForecasting.csproj * update to .net core 3.1 to fix errors * Update samples/csharp/getting-started/DeepLearning_ImageClassification_Training/ImageClassification.Train/assets/inputs/images/flower_photos_small_set/LICENSE.txt Co-authored-by: Justin Ormont <[email protected]> * Update samples/csharp/getting-started/DeepLearning_ImageClassification_Training/ImageClassification.Train/assets/inputs/images/flower_photos_small_set/LICENSE.txt Co-authored-by: Justin Ormont <[email protected]> * fix fsharp mnist project * fix automl taxi fare fsharp project * fix fsharp shampoo sales anomaly detection project * fix fsharp power anomaly detection project * Create PowerAnomalyDetection.sln * Update project name so web app will build * fix model explainability project * fix e2e matrix factorization by updating to .net core 3.1 * update scalable web api to 3.1 * update scalable web api integration to 3.1 * Update Startup.cs * Shorten length of project name to fix blazor app * add scisharp package for image classification model consumption * Create ImageClassification.Score.sln * Update samples to 1.5 (#841) * Updated and debuggined ONNX F# sample * Updates to DL TF Estimator * Updated OnnxObjectDetectionE2E * Updated AutoML samples * Fixed bugs in web app when upgraded to 3.1 * Updated version packages for DL binary * Updated to net core 3.1 * Fixed bugs in upgrade to 3.1 * Updated READMES * Delete imageClassifier.zip Co-authored-by: Justin Ormont <[email protected]> Co-authored-by: Luis Quintanilla <[email protected]>
1 parent 5308cda commit 81cae9a

File tree

378 files changed

+4024
-293
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

378 files changed

+4024
-293
lines changed

‎samples/.ionide/symbolCache.db

608 KB
Binary file not shown.

‎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.4.0</MicrosoftMLVersion>
5-
<MicrosoftMLPreviewVersion>0.16.0</MicrosoftMLPreviewVersion>
4+
<MicrosoftMLVersion>1.5.0</MicrosoftMLVersion>
5+
<MicrosoftMLPreviewVersion>0.17.0</MicrosoftMLPreviewVersion>
66
</PropertyGroup>
77

88
</Project>

‎samples/csharp/end-to-end-apps/AnomalyDetection-Sales/SpikeDetectionE2EApp/SpikeDetection.ModelTrainer/SpikeDetectionModelTrainer.csproj

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

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>netcoreapp2.2</TargetFramework>
5+
<TargetFramework>netcoreapp3.1</TargetFramework>
66
</PropertyGroup>
77

88
<ItemGroup>

‎samples/csharp/end-to-end-apps/DeepLearning_ImageClassification_TensorFlow/README.md renamed to ‎samples/csharp/end-to-end-apps/DeepLearning_ImageClassification_TF/README.md

‎samples/csharp/end-to-end-apps/DeepLearning_ImageClassification_TensorFlow/TensorFlowImageClassification/Controllers/ImageClassificationController.cs renamed to ‎samples/csharp/end-to-end-apps/DeepLearning_ImageClassification_TF/TFImageClassification/Controllers/ImageClassificationController.cs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,11 @@
99
using Microsoft.Extensions.Configuration;
1010
using Microsoft.Extensions.Logging;
1111
using Microsoft.Extensions.ML;
12-
using TensorFlowImageClassification.ImageHelpers;
13-
using TensorFlowImageClassification.ML.DataModels;
12+
using TFClassification.ML.DataModels;
13+
using TFImageClassification.ImageHelpers;
14+
using TFImageClassification.ML.DataModels;
1415

15-
namespace TensorFlowImageClassification.Controllers
16+
namespace TFImageClassification.Controllers
1617
{
1718
[Route("api/[controller]")]
1819
[ApiController]

‎samples/csharp/end-to-end-apps/DeepLearning_ImageClassification_TensorFlow/TensorFlowImageClassification/ImageHelpers/ImageValidation.cs renamed to ‎samples/csharp/end-to-end-apps/DeepLearning_ImageClassification_TF/TFImageClassification/ImageHelpers/ImageValidation.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
using System.Linq;
22
using System.Text;
33

4-
namespace TensorFlowImageClassification.ImageHelpers
4+
namespace TFImageClassification.ImageHelpers
55
{
66
public static class ImageValidationExtensions
77
{

‎samples/csharp/end-to-end-apps/DeepLearning_ImageClassification_TensorFlow/TensorFlowImageClassification/ML/DataModels/ImageInputData.cs renamed to ‎samples/csharp/end-to-end-apps/DeepLearning_ImageClassification_TF/TFImageClassification/ML/DataModels/ImageInputData.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
using System.IO;
66
using System.Linq;
77

8-
namespace TensorFlowImageClassification.ML.DataModels
8+
namespace TFImageClassification.ML.DataModels
99
{
1010
public class ImageInputData
1111
{

‎samples/csharp/end-to-end-apps/DeepLearning_ImageClassification_TensorFlow/TensorFlowImageClassification/ML/DataModels/ImageLabelPredictions.cs renamed to ‎samples/csharp/end-to-end-apps/DeepLearning_ImageClassification_TF/TFImageClassification/ML/DataModels/ImageLabelPredictions.cs

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

33
using Microsoft.ML.Data;
44

5-
namespace TensorFlowImageClassification.ML.DataModels
5+
namespace TFClassification.ML.DataModels
66
{
77
public class ImageLabelPredictions
88
{

‎samples/csharp/end-to-end-apps/DeepLearning_ImageClassification_TensorFlow/TensorFlowImageClassification/ML/DataModels/ImagePredictedLabelWithProbability.cs renamed to ‎samples/csharp/end-to-end-apps/DeepLearning_ImageClassification_TF/TFImageClassification/ML/DataModels/ImagePredictedLabelWithProbability.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11

2-
namespace TensorFlowImageClassification.ML.DataModels
2+
namespace TFClassification.ML.DataModels
33
{
44
public class ImagePredictedLabelWithProbability
55
{
66
public string ImageId;
77

8-
public string PredictedLabel;
8+
public string PredictedLabel { get; set; }
99
public float Probability { get; set; }
1010

1111
public long PredictionExecutionTime;

‎samples/csharp/end-to-end-apps/DeepLearning_ImageClassification_TensorFlow/TensorFlowImageClassification/ML/InMemoryModelLoader.cs renamed to ‎samples/csharp/end-to-end-apps/DeepLearning_ImageClassification_TF/TFImageClassification/ML/InMemoryModelLoader.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
using Microsoft.ML;
44
using System.Threading;
55

6-
namespace TensorFlowImageClassification.ML
6+
namespace TFClassification.ML
77
{
88
public class InMemoryModelLoader : ModelLoader
99
{

0 commit comments

Comments
 (0)