diff --git a/test/YoloDotNet.Benchmarks/ClassificationTests/SimpleClassificationTests.cs b/test/YoloDotNet.Benchmarks/ClassificationTests/SimpleClassificationTests.cs index a664bbb..49f109c 100644 --- a/test/YoloDotNet.Benchmarks/ClassificationTests/SimpleClassificationTests.cs +++ b/test/YoloDotNet.Benchmarks/ClassificationTests/SimpleClassificationTests.cs @@ -33,7 +33,6 @@ public void GlobalSetup() // Yolov8 options.OnnxModel = _model8; - options.ModelVersion = ModelVersion.V8; options.Cuda = false; _cpuYolov8 = new Yolo(options); @@ -43,7 +42,6 @@ public void GlobalSetup() // Yolov11 options.OnnxModel = _model11; - options.ModelVersion = ModelVersion.V11; options.Cuda = false; _cpuYolov11 = new Yolo(options); diff --git a/test/YoloDotNet.Benchmarks/ObjectDetectionTests/SimpleObjectDetectionTests.cs b/test/YoloDotNet.Benchmarks/ObjectDetectionTests/SimpleObjectDetectionTests.cs index 9a9c46f..7cbbf17 100644 --- a/test/YoloDotNet.Benchmarks/ObjectDetectionTests/SimpleObjectDetectionTests.cs +++ b/test/YoloDotNet.Benchmarks/ObjectDetectionTests/SimpleObjectDetectionTests.cs @@ -36,7 +36,6 @@ public void GlobalSetup() // Yolov8 options.OnnxModel = _modelV8; - options.ModelVersion = ModelVersion.V8; _cpuYolov8 = new Yolo(options); options.Cuda = true; @@ -44,7 +43,6 @@ public void GlobalSetup() // Yolov9 options.OnnxModel = _modelV9; - options.ModelVersion = ModelVersion.V9; options.Cuda = false; _cpuYolov9 = new Yolo(options); @@ -54,7 +52,6 @@ public void GlobalSetup() // Yolov10 options.OnnxModel = _modelV10; - options.ModelVersion = ModelVersion.V10; options.Cuda = false; _cpuYolov10 = new Yolo(options); @@ -64,7 +61,6 @@ public void GlobalSetup() // Yolov11 options.OnnxModel = _modelV11; - options.ModelVersion = ModelVersion.V11; options.Cuda = false; _cpuYolov11 = new Yolo(options); diff --git a/test/YoloDotNet.Benchmarks/OrientedBoundingBoxTests/SimpleOrientedBoundingBoxTests.cs b/test/YoloDotNet.Benchmarks/OrientedBoundingBoxTests/SimpleOrientedBoundingBoxTests.cs index e4f138f..f0a52df 100644 --- a/test/YoloDotNet.Benchmarks/OrientedBoundingBoxTests/SimpleOrientedBoundingBoxTests.cs +++ b/test/YoloDotNet.Benchmarks/OrientedBoundingBoxTests/SimpleOrientedBoundingBoxTests.cs @@ -33,7 +33,6 @@ public void GlobalSetup() // Yolov8 options.OnnxModel = _model8; - options.ModelVersion = ModelVersion.V8; options.Cuda = false; _cpuYolov8 = new Yolo(options); @@ -43,7 +42,6 @@ public void GlobalSetup() // Yolov11 options.OnnxModel = _model11; - options.ModelVersion = ModelVersion.V11; options.Cuda = false; _cpuYolov11 = new Yolo(options); diff --git a/test/YoloDotNet.Benchmarks/PoseEstimationTests/SimplePoseEstimationTests.cs b/test/YoloDotNet.Benchmarks/PoseEstimationTests/SimplePoseEstimationTests.cs index 838b53a..b270b3e 100644 --- a/test/YoloDotNet.Benchmarks/PoseEstimationTests/SimplePoseEstimationTests.cs +++ b/test/YoloDotNet.Benchmarks/PoseEstimationTests/SimplePoseEstimationTests.cs @@ -33,7 +33,6 @@ public void GlobalSetup() // Yolov8 options.OnnxModel = _model8; - options.ModelVersion = ModelVersion.V8; options.Cuda = false; _cpuYolov8 = new Yolo(options); @@ -43,7 +42,6 @@ public void GlobalSetup() // Yolov11 options.OnnxModel = _model11; - options.ModelVersion = ModelVersion.V11; options.Cuda = false; _cpuYolov11 = new Yolo(options); diff --git a/test/YoloDotNet.Benchmarks/SegmentationTests/SimpleSegmentationTests.cs b/test/YoloDotNet.Benchmarks/SegmentationTests/SimpleSegmentationTests.cs index 4c77285..8f3bda4 100644 --- a/test/YoloDotNet.Benchmarks/SegmentationTests/SimpleSegmentationTests.cs +++ b/test/YoloDotNet.Benchmarks/SegmentationTests/SimpleSegmentationTests.cs @@ -33,7 +33,6 @@ public void GlobalSetup() // Yolov8 options.OnnxModel = _model8; - options.ModelVersion = ModelVersion.V8; options.Cuda = false; _cpuYolov8 = new Yolo(options); @@ -43,7 +42,6 @@ public void GlobalSetup() // Yolov11 options.OnnxModel = _model11; - options.ModelVersion = ModelVersion.V11; options.Cuda = false; _cpuYolov11 = new Yolo(options); diff --git a/test/YoloDotNet.Tests/ClassificationTests/Yolov11ClassificationTests.cs b/test/YoloDotNet.Tests/ClassificationTests/Yolov11ClassificationTests.cs index e7ea202..02d4129 100644 --- a/test/YoloDotNet.Tests/ClassificationTests/Yolov11ClassificationTests.cs +++ b/test/YoloDotNet.Tests/ClassificationTests/Yolov11ClassificationTests.cs @@ -13,7 +13,6 @@ public void RunClassification_Yolov11_LabelImageCorrectly_AssertTrue() { OnnxModel = model, ModelType = ModelType.Classification, - ModelVersion = ModelVersion.V11, Cuda = false }); diff --git a/test/YoloDotNet.Tests/ClassificationTests/Yolov8ClassificationTests.cs b/test/YoloDotNet.Tests/ClassificationTests/Yolov8ClassificationTests.cs index 1ed5c21..b4566d1 100644 --- a/test/YoloDotNet.Tests/ClassificationTests/Yolov8ClassificationTests.cs +++ b/test/YoloDotNet.Tests/ClassificationTests/Yolov8ClassificationTests.cs @@ -13,7 +13,6 @@ public void RunClassification_Yolov8_LabelImageCorrectly_AssertTrue() { OnnxModel = model, ModelType = ModelType.Classification, - ModelVersion = ModelVersion.V8, Cuda = false }); diff --git a/test/YoloDotNet.Tests/OBBDetectionTests/Yolov11OBBDetectionTests.cs b/test/YoloDotNet.Tests/OBBDetectionTests/Yolov11OBBDetectionTests.cs index 045f71f..a061b6d 100644 --- a/test/YoloDotNet.Tests/OBBDetectionTests/Yolov11OBBDetectionTests.cs +++ b/test/YoloDotNet.Tests/OBBDetectionTests/Yolov11OBBDetectionTests.cs @@ -13,7 +13,6 @@ public void RunObbDetection_Yolov11_GetExpectedNumberOfObjects_AssertTrue() { OnnxModel = model, ModelType = ModelType.ObbDetection, - ModelVersion = ModelVersion.V11, Cuda = false }); diff --git a/test/YoloDotNet.Tests/OBBDetectionTests/Yolov8OBBDetectionTests.cs b/test/YoloDotNet.Tests/OBBDetectionTests/Yolov8OBBDetectionTests.cs index ce84663..4f16b50 100644 --- a/test/YoloDotNet.Tests/OBBDetectionTests/Yolov8OBBDetectionTests.cs +++ b/test/YoloDotNet.Tests/OBBDetectionTests/Yolov8OBBDetectionTests.cs @@ -13,7 +13,6 @@ public void RunObbDetection_Yolov8_GetExpectedNumberOfObjects_AssertTrue() { OnnxModel = model, ModelType = ModelType.ObbDetection, - ModelVersion = ModelVersion.V8, Cuda = false }); diff --git a/test/YoloDotNet.Tests/ObjectDetectionTests/Yolov10ObjectDetectionTests.cs b/test/YoloDotNet.Tests/ObjectDetectionTests/Yolov10ObjectDetectionTests.cs index c2d17f2..d6438a4 100644 --- a/test/YoloDotNet.Tests/ObjectDetectionTests/Yolov10ObjectDetectionTests.cs +++ b/test/YoloDotNet.Tests/ObjectDetectionTests/Yolov10ObjectDetectionTests.cs @@ -13,7 +13,6 @@ public void RunObjectDetection_Yolov10_GetExpectedNumberOfObjects_AssertTrue() { OnnxModel = model, ModelType = ModelType.ObjectDetection, - ModelVersion = ModelVersion.V10, Cuda = false }); diff --git a/test/YoloDotNet.Tests/ObjectDetectionTests/Yolov11ObjectDetectionTests.cs b/test/YoloDotNet.Tests/ObjectDetectionTests/Yolov11ObjectDetectionTests.cs index cb837ec..152e219 100644 --- a/test/YoloDotNet.Tests/ObjectDetectionTests/Yolov11ObjectDetectionTests.cs +++ b/test/YoloDotNet.Tests/ObjectDetectionTests/Yolov11ObjectDetectionTests.cs @@ -13,7 +13,6 @@ public void RunObjectDetection_Yolov11_GetExpectedNumberOfObjects_AssertTrue() { OnnxModel = model, ModelType = ModelType.ObjectDetection, - ModelVersion = ModelVersion.V11, Cuda = false }); diff --git a/test/YoloDotNet.Tests/ObjectDetectionTests/Yolov8ObjectDetectionTests.cs b/test/YoloDotNet.Tests/ObjectDetectionTests/Yolov8ObjectDetectionTests.cs index 09ddc2c..94aaaa8 100644 --- a/test/YoloDotNet.Tests/ObjectDetectionTests/Yolov8ObjectDetectionTests.cs +++ b/test/YoloDotNet.Tests/ObjectDetectionTests/Yolov8ObjectDetectionTests.cs @@ -13,7 +13,6 @@ public void RunObjectDetection_Yolov8_GetExpectedNumberOfObjects_AssertTrue() { OnnxModel = model, ModelType = ModelType.ObjectDetection, - ModelVersion = ModelVersion.V8, Cuda = false }); diff --git a/test/YoloDotNet.Tests/ObjectDetectionTests/Yolov9ObjectDetectionTests.cs b/test/YoloDotNet.Tests/ObjectDetectionTests/Yolov9ObjectDetectionTests.cs index 4aad89c..071bc2a 100644 --- a/test/YoloDotNet.Tests/ObjectDetectionTests/Yolov9ObjectDetectionTests.cs +++ b/test/YoloDotNet.Tests/ObjectDetectionTests/Yolov9ObjectDetectionTests.cs @@ -13,7 +13,6 @@ public void RunObjectDetection_Yolov9_GetExpectedNumberOfObjects_AssertTrue() { OnnxModel = model, ModelType = ModelType.ObjectDetection, - ModelVersion = ModelVersion.V9, Cuda = false }); diff --git a/test/YoloDotNet.Tests/PoseEstimationTests/Yolov11PoseEstimationTests.cs b/test/YoloDotNet.Tests/PoseEstimationTests/Yolov11PoseEstimationTests.cs index 3d08eff..68f824a 100644 --- a/test/YoloDotNet.Tests/PoseEstimationTests/Yolov11PoseEstimationTests.cs +++ b/test/YoloDotNet.Tests/PoseEstimationTests/Yolov11PoseEstimationTests.cs @@ -13,7 +13,6 @@ public void RunPoseEstimation_Yolov11_GetExpectedNumberOfPoseEstimations_AssertT { OnnxModel = model, ModelType = ModelType.PoseEstimation, - ModelVersion = ModelVersion.V11, Cuda = false }); diff --git a/test/YoloDotNet.Tests/PoseEstimationTests/Yolov8PoseEstimationTests.cs b/test/YoloDotNet.Tests/PoseEstimationTests/Yolov8PoseEstimationTests.cs index 44132cd..6f6cc08 100644 --- a/test/YoloDotNet.Tests/PoseEstimationTests/Yolov8PoseEstimationTests.cs +++ b/test/YoloDotNet.Tests/PoseEstimationTests/Yolov8PoseEstimationTests.cs @@ -13,7 +13,6 @@ public void RunPoseEstimation_Yolov8_GetExpectedNumberOfPoseEstimations_AssertTr { OnnxModel = model, ModelType = ModelType.PoseEstimation, - ModelVersion = ModelVersion.V8, Cuda = false }); diff --git a/test/YoloDotNet.Tests/SegmentationTests/Yolov11SegmentationTests.cs b/test/YoloDotNet.Tests/SegmentationTests/Yolov11SegmentationTests.cs index 28087ef..abe0439 100644 --- a/test/YoloDotNet.Tests/SegmentationTests/Yolov11SegmentationTests.cs +++ b/test/YoloDotNet.Tests/SegmentationTests/Yolov11SegmentationTests.cs @@ -13,14 +13,13 @@ public void RunSegmentation_Yolov11_GetExpectedNumberOfSegmentations_AssertTrue( { OnnxModel = model, ModelType = ModelType.Segmentation, - ModelVersion = ModelVersion.V11, Cuda = false }); var image = SKImage.FromEncodedData(testImage); // Act - var results = yolo.RunSegmentation(image, 0.25, 0.45); + var results = yolo.RunSegmentation(image, 0.25, 0.65, 0.45); // Assert Assert.Equal(17, results.Count); diff --git a/test/YoloDotNet.Tests/SegmentationTests/Yolov8SegmentationTests.cs b/test/YoloDotNet.Tests/SegmentationTests/Yolov8SegmentationTests.cs index f51b6e8..5c40d90 100644 --- a/test/YoloDotNet.Tests/SegmentationTests/Yolov8SegmentationTests.cs +++ b/test/YoloDotNet.Tests/SegmentationTests/Yolov8SegmentationTests.cs @@ -13,7 +13,6 @@ public void RunSegmentation_Yolov8_GetExpectedNumberOfSegmentations_AssertTrue() { OnnxModel = model, ModelType = ModelType.Segmentation, - ModelVersion = ModelVersion.V8, Cuda = false });