From 19c4eca16528c4cb960ce659c5d3732ea59d38bf Mon Sep 17 00:00:00 2001 From: Christian Tzolov Date: Thu, 25 Jun 2020 14:30:17 +0200 Subject: [PATCH] fix readme links --- .../image-recognition-function/README.adoc | 12 ++++++------ .../object-detection-function/README.adoc | 16 ++++++++-------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/functions/function/image-recognition-function/README.adoc b/functions/function/image-recognition-function/README.adoc index 7d2a7719..bba8e93d 100644 --- a/functions/function/image-recognition-function/README.adoc +++ b/functions/function/image-recognition-function/README.adoc @@ -1,4 +1,4 @@ -:images-asciidoc: https://raw.githubusercontent.com/tzolov/stream-applications/tensorflow-redesign/functions/function/image-recognition-function/src/main/resources/images/ +:images-asciidoc: https://raw.githubusercontent.com/spring-cloud/stream-applications/master/functions/function/image-recognition-function/src/main/resources/images/ # Image Recognition @@ -9,11 +9,11 @@ Provides real-time recognition of the https://dl.bintray.com/big-data/generic/im [cols="1,2",frame=none,grid=none] |=== | image:{images-asciidoc}/image-augmented.jpg[alt=Inception 1,width=100%] -|The https://github.com/tzolov/stream-applications/tree/tensorflow-redesign/functions/function/image-recognition-function/src/main/java/org/springframework/cloud/fn/image/recognition[ImageRecognition] takes an image and outputs a list of probable categories the image contains. The response is represented by https://github.com/tzolov/stream-applications/blob/tensorflow-redesign/functions/function/image-recognition-function/src/main/java/org/springframework/cloud/fn/image/recognition/RecognitionResponse.java[RecognitionResponse] class. +|The https://github.com/spring-cloud/stream-applications/blob/master/functions/function/image-recognition-function/src/main/java/org/springframework/cloud/fn/image/recognition/ImageRecognition.java[ImageRecognition] takes an image and outputs a list of probable categories the image contains. The response is represented by https://github.com/spring-cloud/stream-applications/blob/master/functions/function/image-recognition-function/src/main/java/org/springframework/cloud/fn/image/recognition/RecognitionResponse.java[RecognitionResponse] class. -The https://github.com/tzolov/stream-applications/blob/tensorflow-redesign/functions/common/tensorflow-common/src/main/java/org/springframework/cloud/fn/common/tensorflow/deprecated/JsonMapperFunction.java[JsonMapperFunction] permits +The https://github.com/spring-cloud/stream-applications/blob/master/functions/common/tensorflow-common/src/main/java/org/springframework/cloud/fn/common/tensorflow/deprecated/JsonMapperFunction.java[JsonMapperFunction] permits converting the `RecognitionResponse` into JSON objects and the -https://github.com/tzolov/stream-applications/blob/tensorflow-redesign/functions/function/image-recognition-function/src/main/java/org/springframework/cloud/fn/image/recognition/ImageRecognitionAugmenter.java[ImageRecognitionAugmenter] can augment the input image with the detected categories (as shown in pic. 1). +https://github.com/spring-cloud/stream-applications/blob/master/functions/function/image-recognition-function/src/main/java/org/springframework/cloud/fn/image/recognition/ImageRecognitionAugmenter.java[ImageRecognitionAugmenter] can augment the input image with the detected categories (as shown in pic. 1). |=== ## Usage @@ -50,13 +50,13 @@ List recognizedObjects = recognitionService.recognize(input Mind that on first attempt it will download few hundreds of MBs. The consecutive runs will use the cached copy (5) instead. The category labels for the MobileNetV2 are resolved from `src/main/resources/labels/mobilenet_labels.txt`. -<2> The wxh sieze of the input nomralized image. +<2> The wxh seize of the input normalized image. <3> Top K result to return. <4> Cache the model on the local file system. <5> Load the image to recognise. <6> Return a map of the top-k most probable category names and their probabilities. -The `ImageRecognition.mobilenetModeV1` and `ImageRecognition.inception` factory methods help to load and configure pretrained mobilenetModeV1 and and Inception models. +The `ImageRecognition.mobilenetModeV1` and `ImageRecognition.inception` factory methods help to load and configure pre-trained mobilenetModeV1 and and Inception models. Next you can convert the result in JSON format. diff --git a/functions/function/object-detection-function/README.adoc b/functions/function/object-detection-function/README.adoc index c2fcdac7..55091165 100644 --- a/functions/function/object-detection-function/README.adoc +++ b/functions/function/object-detection-function/README.adoc @@ -1,4 +1,4 @@ -:images-asciidoc: https://raw.githubusercontent.com/tzolov/stream-applications/tensorflow-redesign/functions/function/object-detection-function/src/main/resources/images/ +:images-asciidoc: https://raw.githubusercontent.com/spring-cloud/stream-applications/master/functions/function/object-detection-function/src/main/resources/images/ # Object Detection Function @@ -7,15 +7,15 @@ Java model inference library for the https://github.com/tensorflow/models/blob/m [cols="1,2", frame=none, grid=none] |=== | image:{images-asciidoc}/object_detection_1.jpg[alt=Object Detection 1, width=100%] -|The https://github.com/tzolov/stream-applications/blob/tensorflow-redesign/functions/function/object-detection-function/src/main/java/org/springframework/cloud/fn/object/detection/ObjectDetectionService.java[ObjectDetectionService] +|The https://github.com/spring-cloud/stream-applications/blob/master/functions/function/object-detection-function/src/main/java/org/springframework/cloud/fn/object/detection/ObjectDetectionService.java[ObjectDetectionService] takes an image or a batch of images and outputs a list of predicted objects bounding boxes -represented by https://github.com/tzolov/stream-applications/blob/tensorflow-redesign/functions/function/object-detection-function/src/main/java/org/springframework/cloud/fn/object/detection/domain/ObjectDetection.java[ObjectDetection]. +represented by https://github.com/spring-cloud/stream-applications/blob/master/functions/function/object-detection-function/src/main/java/org/springframework/cloud/fn/object/detection/domain/ObjectDetection.java[ObjectDetection]. For the models supporting https://github.com/tensorflow/models/tree/master/research/object_detection#february-9-2018[Instance Segmentation], the `ObjectDetectionService` can predict the instance segmentation `masks` in addition to object bounding boxes. -The https://github.com/tzolov/stream-applications/blob/tensorflow-redesign/functions/common/tensorflow-common/src/main/java/org/springframework/cloud/fn/common/tensorflow/deprecated/JsonMapperFunction.java[JsonMapperFunction] permits +The https://github.com/spring-cloud/stream-applications/blob/master/functions/common/tensorflow-common/src/main/java/org/springframework/cloud/fn/common/tensorflow/deprecated/JsonMapperFunction.java[JsonMapperFunction] permits converting the `List` into JSON objects and the -https://github.com/tzolov/stream-applications/blob/tensorflow-redesign/functions/function/object-detection-function/src/main/java/org/springframework/cloud/fn/object/detection/ObjectDetectionImageAugmenter.java[ObjectDetectionImageAugmenter] +https://github.com/spring-cloud/stream-applications/blob/master/functions/function/object-detection-function/src/main/java/org/springframework/cloud/fn/object/detection/ObjectDetectionImageAugmenter.java[ObjectDetectionImageAugmenter] allow to augment the input image with the detected bounding boxes and segmentation masks. |=== @@ -34,7 +34,7 @@ Add the `object-detection` dependency to the pom (use the latest version availab #### Example 1: Object Detection -The https://github.com/tzolov/stream-applications/blob/tensorflow-redesign/functions/function/object-detection-function/src/test/java/org/springframework/cloud/fn/object/detection/examples/ExampleObjectDetection.java[ExampleObjectDetection.java] +The https://github.com/spring-cloud/stream-applications/blob/master/functions/function/object-detection-function/src/test/java/org/springframework/cloud/fn/object/detection/examples/ExampleObjectDetection.java[ExampleObjectDetection.java] sample demonstrates how to use the `ObjectDetectionService` for detecting objects in input images. It also shows how to convert the result into JSON format and augment the input image with the detected object bounding boxes. @@ -78,7 +78,7 @@ System.out.println(jsonObjectDetections); {"name":"kite","estimate":0.988,"x1":0.206,"y1":0.263,"x2":0.225,"y2":0.314,"cid":38}]] ---- -Use the https://github.com/tzolov/stream-applications/blob/tensorflow-redesign/functions/function/object-detection-function/src/main/java/org/springframework/cloud/fn/object/detection/ObjectDetectionImageAugmenter.java[ObjectDetectionImageAugmenter] +Use the https://github.com/spring-cloud/stream-applications/blob/master/functions/function/object-detection-function/src/main/java/org/springframework/cloud/fn/object/detection/ObjectDetectionImageAugmenter.java[ObjectDetectionImageAugmenter] to draw the detected objects on top of the input image. [source,java,linenums] @@ -96,7 +96,7 @@ TIP: Set the `ObjectDetectionImageAugmenter#agnosticColors` property to `true` t #### Example 2: Instance Segmentation -The https://github.com/tzolov/stream-applications/blob/tensorflow-redesign/functions/function/object-detection-function/src/test/java/org/springframework/cloud/fn/object/detection/examples/ExampleInstanceSegmentation.java[ExampleInstanceSegmentation.java] +The https://github.com/spring-cloud/stream-applications/blob/master/functions/function/object-detection-function/src/test/java/org/springframework/cloud/fn/object/detection/examples/ExampleInstanceSegmentation.java[ExampleInstanceSegmentation.java] sample shows how to use the `ObjectDetectionService` for `Instance Segmentation`. NOTE: It requires a trained model that supports `Masks` as well as setting the instance segmentation (e.g. `useMasks`) flag to `true`.