-
Notifications
You must be signed in to change notification settings - Fork 655
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
1. Fixes windows line return 2. Furthe reduce NDArray operations 3. Refactor example code 4. Add unittest for Yolov8Detection
- Loading branch information
Showing
3 changed files
with
187 additions
and
190 deletions.
There are no files selected for viewing
244 changes: 124 additions & 120 deletions
244
api/src/main/java/ai/djl/modality/cv/translator/YoloV8Translator.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,120 +1,124 @@ | ||
| /* | ||
| * Copyright 2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance | ||
| * with the License. A copy of the License is located at | ||
| * | ||
| * http://aws.amazon.com/apache2.0/ | ||
| * | ||
| * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES | ||
| * OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions | ||
| * and limitations under the License. | ||
| */ | ||
| package ai.djl.modality.cv.translator; | ||
|
|
||
| import ai.djl.modality.cv.output.DetectedObjects; | ||
| import ai.djl.modality.cv.output.Rectangle; | ||
| import ai.djl.ndarray.NDArray; | ||
| import ai.djl.ndarray.NDList; | ||
| import ai.djl.ndarray.types.DataType; | ||
| import ai.djl.ndarray.types.Shape; | ||
| import ai.djl.translate.ArgumentsUtil; | ||
|
|
||
| import java.util.ArrayList; | ||
| import java.util.Map; | ||
|
|
||
| /** | ||
| * A translator for YoloV8 models. This was tested with ONNX exported Yolo models. For details check | ||
| * here: https://github.com/ultralytics/ultralytics | ||
| */ | ||
| public class YoloV8Translator extends YoloV5Translator { | ||
|
|
||
| int maxBoxes; | ||
|
|
||
| /** | ||
| * Constructs an ImageTranslator with the provided builder. | ||
| * | ||
| * @param builder the data to build with | ||
| */ | ||
| protected YoloV8Translator(Builder builder) { | ||
| super(builder); | ||
| maxBoxes = builder.maxBox; | ||
| } | ||
|
|
||
| /** | ||
| * Creates a builder to build a {@code YoloV8Translator} with specified arguments. | ||
| * | ||
| * @param arguments arguments to specify builder options | ||
| * @return a new builder | ||
| */ | ||
| public static YoloV8Translator.Builder builder(Map<String, ?> arguments) { | ||
| YoloV8Translator.Builder builder = new YoloV8Translator.Builder(); | ||
| builder.configPreProcess(arguments); | ||
| builder.configPostProcess(arguments); | ||
|
|
||
| return builder; | ||
| } | ||
|
|
||
| @Override | ||
| protected DetectedObjects processFromBoxOutput(NDList list) { | ||
| NDArray rawResult = list.get(0); | ||
| NDArray reshapedResult = rawResult.transpose(); | ||
| Shape preparedResult = reshapedResult.getShape(); | ||
| long numberRows = preparedResult.get(0); | ||
| long sizeClasses = preparedResult.get(1); | ||
|
|
||
| ArrayList<IntermediateResult> intermediateResults = new ArrayList<>(); | ||
| // reverse order search in heap; searches through #maxBoxes for optimization when set | ||
| for (int i = (int) numberRows - 1; i > numberRows - maxBoxes; i--) { | ||
| final float[] row = reshapedResult.get(i).toFloatArray(); | ||
|
|
||
| float maxClassProb = -1f; | ||
| int maxIndex = -1; | ||
| for (int c = 4; c < sizeClasses; c++) { | ||
| float classProb = row[c]; | ||
| if (classProb > maxClassProb) { | ||
| maxClassProb = classProb; | ||
| maxIndex = c; | ||
| } | ||
| } | ||
|
|
||
| if (maxClassProb > threshold) { | ||
| float xPos = row[0]; // center x | ||
| float yPos = row[1]; // center y | ||
| float w = row[2]; | ||
| float h = row[3]; | ||
| final Rectangle rect = | ||
| new Rectangle(Math.max(0, xPos - w / 2), Math.max(0, yPos - h / 2), w, h); | ||
| intermediateResults.add( | ||
| new IntermediateResult( | ||
| classes.get(maxIndex), maxClassProb, maxIndex, rect)); | ||
| } | ||
| } | ||
| return nms(intermediateResults); | ||
| } | ||
|
|
||
| /** The builder for {@link YoloV8Translator}. */ | ||
| public static class Builder extends YoloV5Translator.Builder { | ||
| int maxBox = 8400; | ||
| /** | ||
| * Builds the translator. | ||
| * | ||
| * @return the new translator | ||
| */ | ||
| @Override | ||
| public YoloV8Translator build() { | ||
| if (pipeline == null) { | ||
| addTransform( | ||
| array -> array.transpose(2, 0, 1).toType(DataType.FLOAT32, false).div(255)); | ||
| } | ||
| validate(); | ||
| return new YoloV8Translator(this); | ||
| } | ||
|
|
||
| @Override | ||
| protected void configPostProcess(Map<String, ?> arguments) { | ||
| super.configPostProcess(arguments); | ||
| maxBox = ArgumentsUtil.intValue(arguments, "maxBox", 8400); | ||
| } | ||
| } | ||
| } | ||
| /* | ||
| * Copyright 2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance | ||
| * with the License. A copy of the License is located at | ||
| * | ||
| * http://aws.amazon.com/apache2.0/ | ||
| * | ||
| * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES | ||
| * OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions | ||
| * and limitations under the License. | ||
| */ | ||
| package ai.djl.modality.cv.translator; | ||
|
|
||
| import ai.djl.modality.cv.output.DetectedObjects; | ||
| import ai.djl.modality.cv.output.Rectangle; | ||
| import ai.djl.ndarray.NDArray; | ||
| import ai.djl.ndarray.NDList; | ||
| import ai.djl.ndarray.types.DataType; | ||
| import ai.djl.ndarray.types.Shape; | ||
| import ai.djl.translate.ArgumentsUtil; | ||
|
|
||
| import java.util.ArrayList; | ||
| import java.util.Map; | ||
|
|
||
| /** | ||
| * A translator for YoloV8 models. This was tested with ONNX exported Yolo models. For details check | ||
| * here: https://github.com/ultralytics/ultralytics | ||
| */ | ||
| public class YoloV8Translator extends YoloV5Translator { | ||
|
|
||
| private int maxBoxes; | ||
|
|
||
| /** | ||
| * Constructs an ImageTranslator with the provided builder. | ||
| * | ||
| * @param builder the data to build with | ||
| */ | ||
| protected YoloV8Translator(Builder builder) { | ||
| super(builder); | ||
| maxBoxes = builder.maxBox; | ||
| } | ||
|
|
||
| /** | ||
| * Creates a builder to build a {@code YoloV8Translator} with specified arguments. | ||
| * | ||
| * @param arguments arguments to specify builder options | ||
| * @return a new builder | ||
| */ | ||
| public static YoloV8Translator.Builder builder(Map<String, ?> arguments) { | ||
| YoloV8Translator.Builder builder = new YoloV8Translator.Builder(); | ||
| builder.configPreProcess(arguments); | ||
| builder.configPostProcess(arguments); | ||
|
|
||
| return builder; | ||
| } | ||
|
|
||
| /** {@inheritDoc} */ | ||
| @Override | ||
| protected DetectedObjects processFromBoxOutput(NDList list) { | ||
| NDArray rawResult = list.get(0); | ||
| NDArray reshapedResult = rawResult.transpose(); | ||
| Shape shape = reshapedResult.getShape(); | ||
| float[] buf = reshapedResult.toFloatArray(); | ||
| int numberRows = Math.toIntExact(shape.get(0)); | ||
| int nClasses = Math.toIntExact(shape.get(1)); | ||
|
|
||
| ArrayList<IntermediateResult> intermediateResults = new ArrayList<>(); | ||
| // reverse order search in heap; searches through #maxBoxes for optimization when set | ||
| for (int i = numberRows - 1; i > numberRows - maxBoxes; --i) { | ||
| int index = i * nClasses; | ||
| float maxClassProb = -1f; | ||
| int maxIndex = -1; | ||
| for (int c = 4; c < nClasses; c++) { | ||
| float classProb = buf[index + c]; | ||
| if (classProb > maxClassProb) { | ||
| maxClassProb = classProb; | ||
| maxIndex = c; | ||
| } | ||
| } | ||
|
|
||
| if (maxClassProb > threshold) { | ||
| float xPos = buf[index]; // center x | ||
| float yPos = buf[index + 1]; // center y | ||
| float w = buf[index + 2]; | ||
| float h = buf[index + 3]; | ||
| Rectangle rect = | ||
| new Rectangle(Math.max(0, xPos - w / 2), Math.max(0, yPos - h / 2), w, h); | ||
| intermediateResults.add( | ||
| new IntermediateResult( | ||
| classes.get(maxIndex), maxClassProb, maxIndex, rect)); | ||
| } | ||
| } | ||
| return nms(intermediateResults); | ||
| } | ||
|
|
||
| /** The builder for {@link YoloV8Translator}. */ | ||
| public static class Builder extends YoloV5Translator.Builder { | ||
|
|
||
| private int maxBox = 8400; | ||
|
|
||
| /** | ||
| * Builds the translator. | ||
| * | ||
| * @return the new translator | ||
| */ | ||
| @Override | ||
| public YoloV8Translator build() { | ||
| if (pipeline == null) { | ||
| addTransform( | ||
| array -> array.transpose(2, 0, 1).toType(DataType.FLOAT32, false).div(255)); | ||
| } | ||
| validate(); | ||
| return new YoloV8Translator(this); | ||
| } | ||
|
|
||
| /** {@inheritDoc} */ | ||
| @Override | ||
| protected void configPostProcess(Map<String, ?> arguments) { | ||
| super.configPostProcess(arguments); | ||
| maxBox = ArgumentsUtil.intValue(arguments, "maxBox", 8400); | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.