platform/core/api/mediavision.git
3 months agomv_barcode: Clean duplicate parameter checker 74/304474/9
Kwanghoon Son [Thu, 18 Jan 2024 02:04:04 +0000 (11:04 +0900)]
mv_barcode: Clean duplicate parameter checker

Move check position and rename MEDIA_VISION_CHECK_ERR

Change-Id: I1b911b4ad341bc348ceea01f281209f54bb7ed20
Signed-off-by: Kwanghoon Son <k.son@samsung.com>
3 months agomv_machine_learning: merge mv_inference.cpp and mv_inference_open.cpp 46/304546/3
Vibhav Aggarwal [Fri, 19 Jan 2024 07:20:12 +0000 (16:20 +0900)]
mv_machine_learning: merge mv_inference.cpp and mv_inference_open.cpp

[Issue type] code cleanup

Change-Id: Icda88605c20ab7f764588c14a197a6cc5ed5e67e
Signed-off-by: Vibhav Aggarwal <v.aggarwal@samsung.com>
3 months agoSkip test when feature key not supported
Kwanghoon Son [Fri, 12 Jan 2024 09:09:53 +0000 (18:09 +0900)]
Skip test when feature key not supported

Change-Id: I577788343140913473405b7511620ab2914dac3f
Signed-off-by: Kwanghoon Son <k.son@samsung.com>
3 months agomv_machine_learning: memory optimization in loading dataset
Vibhav Aggarwal [Tue, 9 Jan 2024 12:06:47 +0000 (21:06 +0900)]
mv_machine_learning: memory optimization in loading dataset

[Issue type] code optimization

This patch alters the FaceRecognitionDSM::loadDataSet()
function to minimize memory copy. A small optimization
is also made in addDataSet() function.

Change-Id: I9ac18e38ba3201ff0c122b831904229f524eb4c3
Signed-off-by: Vibhav Aggarwal <v.aggarwal@samsung.com>
3 months agomv_machine_learning: rename .c to .cpp 13/304513/2
Vibhav Aggarwal [Thu, 18 Jan 2024 08:10:53 +0000 (17:10 +0900)]
mv_machine_learning: rename .c to .cpp

[Issue type] code cleanup

Change-Id: Ibb8aa92efc7e598ab29acec870354454c80ca707
Signed-off-by: Vibhav Aggarwal <v.aggarwal@samsung.com>
4 months agomv_machine_learning: change Tizen version of task API 78/304478/1
Inki Dae [Wed, 17 Jan 2024 05:55:19 +0000 (14:55 +0900)]
mv_machine_learning: change Tizen version of task API

[Issue type] : code cleanup

Change Tizen version of task API. New Task API support is targeted to
Tizen 9.0 so update the version information on header files.

Change-Id: I1d3147d41db47d99a52a6fedfe4559e67e9474d0
Signed-off-by: Inki Dae <inki.dae@samsung.com>
4 months agoFix clang-format 10/304410/2
Kwanghoon Son [Wed, 17 Jan 2024 04:26:07 +0000 (13:26 +0900)]
Fix clang-format

Change-Id: If210c34343b4da5080fea5360ae752705dda635e
Signed-off-by: Kwanghoon Son <k.son@samsung.com>
4 months agoMerge branch 'tizen_devel' into tizen accepted/tizen_unified_riscv accepted/tizen/unified/20240117.163249 accepted/tizen/unified/riscv/20240118.054558
Inki Dae [Wed, 17 Jan 2024 04:16:21 +0000 (13:16 +0900)]
Merge branch 'tizen_devel' into tizen

[Version] 0.33.0

Kwanghoon Son (4):
  barcode: Rename c files to cpp
  mv_barcode_gen: Change buffer type to cv::Mat
  Skip test when feature key not supported

Vibhav Aggarwal (2):
  mv_machine_learning: optimize FaceRecognition taskgroup
  mv_machine_learning: make testing more robust

Inki Dae (1):
  mv_machine_learning: rename file names

Change-Id: Id444995d0d733e4bd5c21f8bfa334eb6d4adc4ab
Signed-off-by: Inki Dae <inki.dae@samsung.com>
4 months agomv_machine_learning: rename file names
Inki Dae [Wed, 10 Jan 2024 06:36:35 +0000 (15:36 +0900)]
mv_machine_learning: rename file names

[Issue type] code clean

Rename file names of mv_machine_learning according to Tizen coding style
document.[1]

Below are rules used in this patch,
  - Class module refered by external modules uses "NanespaceClassname.*"
  - Class module used internally uses "Classname.*"
    . If "Classname" is duplicated with other task group then sub directory
  name can be added as a prefix.
  - Non class file referred by external modules uses "namespace_filename.*"
  - Non class file used internally uses "filename.*"
    . If "filename" is duplicated with other task group then sub directory
  name can be added as a prefix.

[1] https://wiki.tizen.org/Native_Platform_Coding_Idiom_and_Style_Guide

Change-Id: I0fe3a95a1b5b88b294e2d00ad1fe489143d6cd7d
Signed-off-by: Inki Dae <inki.dae@samsung.com>
4 months agoSkip test when feature key not supported
Kwanghoon Son [Fri, 12 Jan 2024 09:09:53 +0000 (18:09 +0900)]
Skip test when feature key not supported

Change-Id: I577788343140913473405b7511620ab2914dac3f
Signed-off-by: Kwanghoon Son <k.son@samsung.com>
4 months agomv_barcode_gen: Change buffer type to cv::Mat
Kwanghoon Son [Thu, 4 Jan 2024 06:21:55 +0000 (15:21 +0900)]
mv_barcode_gen: Change buffer type to cv::Mat

[Issue type] refactoring

opencv mat is a type for accurately indicating a buffer.
Also other small refactoring that remove Anonymous namespace
and un-used variable

Change-Id: I28cf707f44080cbfcb9c8b4e55609a59011f5d23
Signed-off-by: Kwanghoon Son <k.son@samsung.com>
4 months agomv_machine_learning: make testing more robust
Vibhav Aggarwal [Mon, 8 Jan 2024 07:07:18 +0000 (16:07 +0900)]
mv_machine_learning: make testing more robust

[Issue type] code improvement

This patch makes the testing more robust by checking
the return value of some native APIs and also fixes
some minor bugs.

Change-Id: I352599b86467ce885e171b4b071a28eb396c2161
Signed-off-by: Vibhav Aggarwal <v.aggarwal@samsung.com>
4 months agobarcode: Rename c files to cpp
Kwanghoon Son [Thu, 4 Jan 2024 06:01:04 +0000 (15:01 +0900)]
barcode: Rename c files to cpp

feature_keys needs to change std::string and this patch is for.
Also barcode_{gen,detect}_open function will be refactoring.

Change-Id: I9eccaec0b117f165c7c02ea294a185b803c97b4b
Signed-off-by: Kwanghoon Son <k.son@samsung.com>
4 months agomv_machine_learning: optimize FaceRecognition taskgroup
Vibhav Aggarwal [Tue, 19 Dec 2023 04:07:18 +0000 (13:07 +0900)]
mv_machine_learning: optimize FaceRecognition taskgroup

[Issue type] code optimization

This patch optimizes the FaceRecognition task in the following way:

Avoiding reloading of model files: The model files after training
were loaded into the inference engine every time inference was
requested. This patch modifies this behaviour to make the
files load only if they were changed (i.e. model was retrained).

Change-Id: Ia7c588e22672b26329e513416f7f177bddbb1da6
Signed-off-by: Vibhav Aggarwal <v.aggarwal@samsung.com>
4 months agomv_machine_learning: fix coverity issues 50/303550/1 accepted/tizen/unified/20240109.155354 accepted/tizen/unified/riscv/20240110.014526
Inki Dae [Tue, 2 Jan 2024 05:40:56 +0000 (14:40 +0900)]
mv_machine_learning: fix coverity issues

[Version] : 0.32.2
[Issue type] : bug fix

Fix coverity issues(AUTO_CAUSES_COPY), CID-1744030, CID-1749945, CID-1750084,
and CID-1750098.

Change-Id: Ib13700a9cfd41957f4a080cd5ca7f35a4e8bc9f2
Signed-off-by: Inki Dae <inki.dae@samsung.com>
4 months agomv_common: fix coverity issues 46/303546/4
Inki Dae [Tue, 2 Jan 2024 05:14:59 +0000 (14:14 +0900)]
mv_common: fix coverity issues

[Version] : 0.32.1
[Issue type] : bug fix

Fix coverity issues(AUTO_CAUSES_COPY), CID-1741334 and CID-1743817.

Change-Id: I72277b828295b331d23f7e7f0d6cbfc9e72c1c4d
Signed-off-by: Inki Dae <inki.dae@samsung.com>
4 months agoMerge branch 'tizen_devel' into tizen
Kwanghoon Son [Wed, 27 Dec 2023 03:23:45 +0000 (12:23 +0900)]
Merge branch 'tizen_devel' into tizen

[Version] 0.32.0

Inki Dae (5):
  mv_machine_learning: drop the use of template type from itask
  mv_machine_learning: add multiple tasks support to
    MachineLearningNative module
  mv_machine_learning: use MachineLearningNative module for other task
    groups
  mv_machine_learning: change feature vector manager for face
    recognition
  mv_machine_learning: pack MachineLearningType.h header file

Kwanghoon Son (3):
  clean up unittest script
  Stop build assessment and testsuite
  gcov: Remove un-used code and exclude case

Vibhav Aggarwal (7):
  mv_machine_learning: drop setInput() function
  mv_machine_learning: fix FaceRecognition paths
  mv_machine_learning: enable FaceRecognition tests
  mv_machine_learning: replace char arrays by std::string
  mv_machine_learning: convert char* to string and change return types
  mv_machine_learning: add virtual destructor
  mv_machine_learning: give input type as template parameter

Change-Id: Ic6cb9576812bdf82573a079cfe5b9aedb831a6ac

4 months agomv_machine_learning: pack MachineLearningType.h header file
Inki Dae [Thu, 21 Dec 2023 04:52:07 +0000 (13:52 +0900)]
mv_machine_learning: pack MachineLearningType.h header file

[Issue type] : bug fix

Pack MachineLearningType.h header file. External plugin modules such as
object detection and image segmentation task groups refer to
the MachineLearningType.h header file.

Change-Id: I5a636ad6dba2df717121f85d19be25dddc85d449
Signed-off-by: Inki Dae <inki.dae@samsung.com>
4 months agomv_machine_learning: change feature vector manager for face recognition
Inki Dae [Mon, 18 Dec 2023 07:58:42 +0000 (16:58 +0900)]
mv_machine_learning: change feature vector manager for face recognition

[Issue type] : code enhancement

Change feature vector manager including some code cleanups for face recognition
task group.

With this patch, the header data of the feature vector is now stored at the
beginning of the feature vector file, while the feature vector data is stored
at the end of the file. This change makes it easier to manage feature vectors
without having to worry about moving the file pointer.
In the previous version, the header data was stored at the end of the file,
and the feature vector data was stored at the beginning of the file.

Additionally, this patch skips an unnecessary process in the deleteLabel
function and cleans up the existing code.

Change-Id: I9ef2c0f5603788ea1907002bacf25d9f4fba68ed
Signed-off-by: Inki Dae <inki.dae@samsung.com>
4 months agogcov: Remove un-used code and exclude case
Kwanghoon Son [Wed, 20 Dec 2023 04:19:09 +0000 (13:19 +0900)]
gcov: Remove un-used code and exclude case

Change-Id: Ica4496ab1e8102bd8b60e7d1b9cc468d586d427f
Signed-off-by: Kwanghoon Son <k.son@samsung.com>
4 months agoStop build assessment and testsuite
Kwanghoon Son [Tue, 19 Dec 2023 02:18:32 +0000 (11:18 +0900)]
Stop build assessment and testsuite

Assessment and testsuite tests before mv_test are rarely maintained because
they are not used well and not measured during coverage.
If want to run another case, must integrate it into mv_test.

Change-Id: Idf007f7d4b1c2ea53897e78daeef1eed0b764579
Signed-off-by: Kwanghoon Son <k.son@samsung.com>
4 months agomv_machine_learning: use MachineLearningNative module for other task groups
Inki Dae [Wed, 13 Dec 2023 07:52:23 +0000 (16:52 +0900)]
mv_machine_learning: use MachineLearningNative module for other task groups

[Issue type] : code cleanup

Use MachineLearningNative module for image segmentation and object detection
3d task groups to drop code duplication.

Change-Id: Ief662f216143a1463fd01a6a909e96799c07aff1
Signed-off-by: Inki Dae <inki.dae@samsung.com>
4 months agomv_machine_learning: add multiple tasks support to MachineLearningNative module
Inki Dae [Fri, 8 Dec 2023 07:18:03 +0000 (16:18 +0900)]
mv_machine_learning: add multiple tasks support to MachineLearningNative module

[Issue type] : new feature

Add multiple tasks support to MachineLearningNative module. In case of
face recognition task group, two tasks - facenet and face_recognition -
are needed. Therefore, this patch adds a new API,
machine_learning_native_add() which adds a given task object to
the given context, to MachineLearningNative module, changes return type of
machine_learning_native_create() to void * type for API consistency, and
updates other task groups to call this API.

In addition, this patch drops a redundant parameter, task_name, from
machine_learning_native_destroy().

Change-Id: I9c3ca2645dc876a3c7eb31bb9ce0aca56d376ad9
Signed-off-by: Inki Dae <inki.dae@samsung.com>
4 months agoclean up unittest script
Kwanghoon Son [Wed, 13 Dec 2023 04:29:55 +0000 (13:29 +0900)]
clean up unittest script

Change-Id: I46f310cadfe5dca36edaa3b010afc2df5b49a601
Signed-off-by: Kwanghoon Son <k.son@samsung.com>
4 months agomv_machine_learning: give input type as template parameter
Vibhav Aggarwal [Mon, 11 Dec 2023 08:15:07 +0000 (17:15 +0900)]
mv_machine_learning: give input type as template parameter

[Issue type] code refactoring

This patch adds the input type in the template declaration of the
AsyncManager class to drop template from the individual functions.

Change-Id: I37fe087d253383db87eff46e634a688ffba9a83c
Signed-off-by: Vibhav Aggarwal <v.aggarwal@samsung.com>
4 months agomv_machine_learning: add virtual destructor
Vibhav Aggarwal [Mon, 11 Dec 2023 03:55:34 +0000 (12:55 +0900)]
mv_machine_learning: add virtual destructor

[Issue type] code refactoring

This patch adds the virtual destructor in the InputBaseType
and OutputBaseType classes.

Change-Id: I24dac2b279cdf1c3d9c164020acf394755a6de84
Signed-off-by: Vibhav Aggarwal <v.aggarwal@samsung.com>
4 months agomv_machine_learning: convert char* to string and change return types
Vibhav Aggarwal [Mon, 11 Dec 2023 03:40:40 +0000 (12:40 +0900)]
mv_machine_learning: convert char* to string and change return types

[Issue type] code refactoring

This patch changes the char arrays to std::string and also
changes the return type of getXYZ() functions from void to
the type of data they return.

Change-Id: I2e6a1998b148721f4f868b23d144d24c7c09bf78
Signed-off-by: Vibhav Aggarwal <v.aggarwal@samsung.com>
4 months agomv_machine_learning: replace char arrays by std::string
Vibhav Aggarwal [Tue, 5 Dec 2023 06:25:26 +0000 (15:25 +0900)]
mv_machine_learning: replace char arrays by std::string

[Issue type] code refactoring

This patch is the first step in refactoring the
mv_machine_learning module to replace char* by std::string.
The refactoring will take place in a bottom-up fashion-
meaning that the individual task group classes will be refactored
first, and finally, the ITask class will be modified along with
all the adapter classes. This patch applies this change to the
ImageClassification task group.

Change-Id: If74f788758e2744bb9f1b27c6c607fbb41813512
Signed-off-by: Vibhav Aggarwal <v.aggarwal@samsung.com>
4 months agomv_machine_learning: enable FaceRecognition tests
Vibhav Aggarwal [Mon, 4 Dec 2023 05:11:54 +0000 (14:11 +0900)]
mv_machine_learning: enable FaceRecognition tests

[Issue type] code testing

This patch enables face recognition tests which were
disabled in [1] since the memory leak bug is now
believed to be resolved [2].

[1] https://review.tizen.org/gerrit/#/c/platform/core/api/mediavision/+/301888/
[2] https://review.tizen.org/gerrit/#/c/platform/core/api/mediavision/+/302117/

Change-Id: I3d3184dd71aa8a39b76fc44acd8c74373275b757
Signed-off-by: Vibhav Aggarwal <v.aggarwal@samsung.com>
4 months agomv_machine_learning: fix FaceRecognition paths
Vibhav Aggarwal [Thu, 30 Nov 2023 05:36:03 +0000 (14:36 +0900)]
mv_machine_learning: fix FaceRecognition paths

[Issue type] bug fix

Fix the resource paths used for training and testing FaceRecognition task group.

Change-Id: I660786521ff5dcc56a2c23782d7ee5924774e2eb
Signed-off-by: Vibhav Aggarwal <v.aggarwal@samsung.com>
4 months agomv_machine_learning: drop setInput() function
Vibhav Aggarwal [Thu, 7 Dec 2023 04:27:38 +0000 (13:27 +0900)]
mv_machine_learning: drop setInput() function

[Issue type] code refactoring

This patch drops the setInput() function of the ITask class
and passes the input directly in the perform() function.

Change-Id: I7ba5932f73e33006315fb7a51b581ecafbd50fdd
Signed-off-by: Vibhav Aggarwal <v.aggarwal@samsung.com>
4 months agomv_machine_learning: drop the use of template type from itask
Inki Dae [Tue, 5 Dec 2023 08:53:32 +0000 (17:53 +0900)]
mv_machine_learning: drop the use of template type from itask

[Issue type] : code cleanup

Drop the use of template type from itask and its child classes.
Finally, we have broken the template jail by introducing common
input and output structures, InputBaseType and OutputBaseType.

This patch also includes some updates to the task groups which don't use
MachineLearningNative module yet.

Change-Id: I96abdd94dc715e3f24717e14ad92533c9451f861
Signed-off-by: Inki Dae <inki.dae@samsung.com>
4 months agoUse common feature key checking function 10/302810/4
Vibhav Aggarwal [Thu, 14 Dec 2023 03:52:44 +0000 (12:52 +0900)]
Use common feature key checking function

[Issue type] code refactoring

This patch replaces all the individual feature key checking
functions by a common function mv_check_feature_key().

Change-Id: I7c63131af0d6b481c1ecfd8d859362328fa3657d
Signed-off-by: Vibhav Aggarwal <v.aggarwal@samsung.com>
5 months agomv_machine_learning: add a new feature key checking function 66/301966/4
Inki Dae [Mon, 27 Nov 2023 09:30:17 +0000 (18:30 +0900)]
mv_machine_learning: add a new feature key checking function

[Version] : 0.31.1
[Issue type] : bug fix

Add a new feature key checking function for machine learning based face
recognition API.

In the previous version of face recognition API, we used below key only.
http://tizen.org/feature/vision.inference.face

However, the key is used by face detection and other API - key checking
duplicated. So add a new feature key checking function so that the face
recognition API can check four keys,
- http://tizen.org/feature/vision.inference
- http://tizen.org/feature/vision.training
- http://tizen.org/feature/vision.inference.face_recognition
- http://tizen.org/feature/vision.training.face_recognition

Change-Id: I79ca9465bdec810029298323ea4c11e1ede36dee
Signed-off-by: Inki Dae <inki.dae@samsung.com>
5 months agoFix pthread_mutex_trylock usage 80/302680/4
Kwanghoon Son [Tue, 12 Dec 2023 04:33:24 +0000 (13:33 +0900)]
Fix pthread_mutex_trylock usage

[Issue type] svace

svace warn UNREACHABLE_CODE.EXECUTED_ONCE.
WID:60896000 Loop body cannot be executed more than once

Change-Id: I2ee503bdab93b285e99eca9d23c9548dfec46486
Signed-off-by: Kwanghoon Son <k.son@samsung.com>
5 months agoRemove profile check for supported platform version 01/302601/2
Kwanghoon Son [Mon, 11 Dec 2023 06:19:45 +0000 (15:19 +0900)]
Remove profile check for supported platform version

Change-Id: I1e8abc0037baa1996b31db299744fea61eee4011
Signed-off-by: Kwanghoon Son <k.son@samsung.com>
5 months agoDelete Unreachable code 03/302603/1
Kwanghoon Son [Mon, 11 Dec 2023 06:40:47 +0000 (15:40 +0900)]
Delete Unreachable code

[Issue type] SVACE

Model object already checked and can not be null.

Change-Id: Ie4ce60c6221a8639a1f000966c23f3282b05cad3
Signed-off-by: Kwanghoon Son <k.son@samsung.com>
5 months agoMerge branch 'tizen_devel' into tizen accepted/tizen/unified/20231206.103842 accepted/tizen/unified/20231206.151824 accepted/tizen/unified/riscv/20231211.234031
Kwanghoon Son [Wed, 6 Dec 2023 01:37:12 +0000 (10:37 +0900)]
Merge branch 'tizen_devel' into tizen

[Version] 0.31.0

Inki Dae (8):
  mv_machine_learning: drop input and output type dependency from image
    classification
  mv_machine_learning: introduce config file for external plugin
  mv_machine_learning: use plugin config file for object detection
  mv_machine_learning: introduce MachineLearningNative module
  mv_machine_learning: drop input and output type dependency from
    landmark detection
  mv_machine_learning: drop code duplication from landmark detection
  mv_machine_learning: drop input and output type dependency from object
    detection
  mv_machine_learning: drop code duplication from object detection

Kwanghoon Son (1):
  Drop ml_only flag build

Vibhav Aggarwal (12):
  mv_machine_learning: add template to Adapter::create() function
  mv_machine_learning: convert LandmarkDetection class into template
    class
  mv_machine_learning: convert ImageClassification class into template
    class
  mv_machine_learning: refactor ImageSegmentation task group
  mv_test: integrate machine learning testcases into mv_test
  mv_machine_learning: check value range in FaceRecognition testcase
  mv_machine_learning: bug fix for invalid memory access
  mv_machine_learning: disable tests
  mv_machine_learning: update image path
  mv_machine_learing: enable inference-based tests
  mv_machine_learning: bug fix for memory leak
  mv_machine_learning: add testcase to mv_test

sangho park (2):
  mv_machine_learning: add verifying result data
  mv_machine_learning: improve comparison of selfie-segmentation result

Change-Id: Ibd8f978e8aa874f58131b574a02d63e1cd4e5fc1

5 months agomv_machine_learning: improve comparison of selfie-segmentation result
sangho park [Tue, 5 Dec 2023 06:12:57 +0000 (15:12 +0900)]
mv_machine_learning: improve comparison of selfie-segmentation result

[Issue type] code improvement

Change the judgment criteria from simple binary comparison to ssim

Change-Id: Idef31272464de702a3339674b858d9fe43935150
Signed-off-by: sangho park <sangho.g.park@samsung.com>
5 months agomv_machine_learning: drop code duplication from object detection
Inki Dae [Fri, 1 Dec 2023 08:05:31 +0000 (17:05 +0900)]
mv_machine_learning: drop code duplication from object detection

[Issue type] : code cleanup

Drop code duplication from the object detection task group by making the
this task group use MachineLearningNative module instead of internal code
for context management. In addition, this patch fixes user given model issue
by passing the user given model to each task group correctly.

Change-Id: I15993c841ae9ec5b9b1900089f88295d77b0629c
Signed-off-by: Inki Dae <inki.dae@samsung.com>
5 months agomv_machine_learning: add testcase to mv_test
Vibhav Aggarwal [Thu, 30 Nov 2023 10:49:28 +0000 (19:49 +0900)]
mv_machine_learning: add testcase to mv_test

[Issue type] code improvement

Add the FaceRecognitionAccuracy testcase to mv_test.
It is disabled by default since its execution time is high.

Change-Id: I99e789e7ee8456a5fcc56d2e3d7edd6f4264529b
Signed-off-by: Vibhav Aggarwal <v.aggarwal@samsung.com>
5 months agomv_machine_learning: bug fix for memory leak
Vibhav Aggarwal [Thu, 30 Nov 2023 10:45:40 +0000 (19:45 +0900)]
mv_machine_learning: bug fix for memory leak

[Issue type] bug fix

In SimpleShot::configureModel() function, old model was not
being destroyed before creating the new model. This led to
memory leak detected by ASAN. This patch fixes the issue.

Change-Id: I6a8c3bf3df50c4b1eb39f2e7c94c777b39633323
Signed-off-by: Vibhav Aggarwal <v.aggarwal@samsung.com>
5 months agomv_machine_learning: drop input and output type dependency from object detection
Inki Dae [Thu, 30 Nov 2023 06:34:24 +0000 (15:34 +0900)]
mv_machine_learning: drop input and output type dependency from object detection

[Issue type] : code refactoring

Drop input and output type dependency from object detection task group
by making the input and output types specific to the object detection
task group to be inherited from the common types,
 and then by making adapter class of the object detection task group
to use the common type instead of specific one.

Change-Id: Ie1a397cd8fc05bd507497f04637d606815c5cccc
Signed-off-by: Inki Dae <inki.dae@samsung.com>
5 months agomv_machine_learning: drop code duplication from landmark detection
Inki Dae [Wed, 29 Nov 2023 07:46:28 +0000 (16:46 +0900)]
mv_machine_learning: drop code duplication from landmark detection

[Issue type] : code cleanup

Drop code duplucation from the landmark detection task group by making the
this task group use MachineLearningNative module instead of internal code
for context management.

Change-Id: I990edccfe92cde801e665f9fc43f9f566f33c124
Signed-off-by: Inki Dae <inki.dae@samsung.com>
5 months agomv_machine_learning: drop input and output type dependency from landmark detection
Inki Dae [Wed, 29 Nov 2023 06:19:45 +0000 (15:19 +0900)]
mv_machine_learning: drop input and output type dependency from landmark detection

[Issue type] : code refactoring

Drop input and output type dependency from landmark detection task group
by making the input and output types specific to the landmark detection
task group to be inherited from the common types,
and then by making adapter class of the landmark detection task group
to use the common type instead of specific one.

Change-Id: Ie366cab3919bdbbbf315263188f4ca4f6516cd33
Signed-off-by: Inki Dae <inki.dae@samsung.com>
5 months agoDrop ml_only flag build
Kwanghoon Son [Wed, 29 Nov 2023 06:17:35 +0000 (15:17 +0900)]
Drop ml_only flag build

It was added due to the yocto-based requirements, but it is no longer used.

Change-Id: Ie238e0dc4e8fed18b2a3e2c077c9b2c7ed1007ff
Signed-off-by: Kwanghoon Son <k.son@samsung.com>
5 months agomv_machine_learning: add verifying result data
sangho park [Wed, 22 Nov 2023 23:27:21 +0000 (08:27 +0900)]
mv_machine_learning: add verifying result data

[Issue type] code improvement

verifying result data of selfie-segmentation external plugin
by restoring result data to opencv Mat and storing image file

Change-Id: I13a6f18a9bf8ec45b78fd2ae57f7e33c54c185fc
Signed-off-by: sangho park <sangho.g.park@samsung.com>
5 months agomv_machine_learing: enable inference-based tests
Vibhav Aggarwal [Mon, 27 Nov 2023 09:43:59 +0000 (18:43 +0900)]
mv_machine_learing: enable inference-based tests

[Issue type] code improvement

This patch re-enables some of the testcases which were
disabled in [1]. Specifically, all the machine learning
testcases except Face Recognition and Image Segmentation
task groups have been enabled. For Face Recognition,
there are still some memory leaks related to NNTrainer
and further investigation is required. Image Segmentation
testcases are still under development [2].

[1] https://review.tizen.org/gerrit/#/c/platform/core/api/mediavision/+/301888/
[2] https://review.tizen.org/gerrit/#/c/platform/core/api/mediavision/+/301785/

Change-Id: If97012b42165f210b1f67aaaf4a28e169c16303f
Signed-off-by: Vibhav Aggarwal <v.aggarwal@samsung.com>
5 months agomv_machine_learning: update image path
Vibhav Aggarwal [Tue, 28 Nov 2023 05:11:26 +0000 (14:11 +0900)]
mv_machine_learning: update image path

[Issue type] bug fix

Update the path of sample images used for testing
in the Landmark Detection task group.

Change-Id: Ie0b4d6975a708fc77f2011504ed29a5e05984796
Signed-off-by: Vibhav Aggarwal <v.aggarwal@samsung.com>
5 months agomv_machine_learning: introduce MachineLearningNative module
Inki Dae [Mon, 27 Nov 2023 01:52:12 +0000 (10:52 +0900)]
mv_machine_learning: introduce MachineLearningNative module

[Issue type] : new feature

Introduce MachineLearningNative module which can be used commonly
for all task groups for context management.

This patch allows us to eliminate the duplicated code within each task's native
API implementation module, where the module name begin with the "mv_" prefix.
By consolidating all task management code into the common module
- MachineLearningNative.cpp - and utilizing this module instead of creating
separate implementations in each task's native API module, we can streamline
development and reduce redundancy.

As a starting point, this patch makes the image classification task group
utilize the common module rather than its own internal code.
The goal of this change is to determine whether or not we can offer a unified
interface for all task groups. If successful, this will allow us to apply
the same native module to other task groups as well.

If our initial tests prove successful, we can move forward with implementing
a task manager that utilizes a inference and training pipeline graph approach
to manage individual tasks.

Change-Id: I4cf4f2a06294acae7ac94d3f562958d2ad3d0770
Signed-off-by: Inki Dae <inki.dae@samsung.com>
5 months agomv_machine_learning: use plugin config file for object detection
Inki Dae [Thu, 23 Nov 2023 04:04:45 +0000 (13:04 +0900)]
mv_machine_learning: use plugin config file for object detection

[Issue type] : new feature

Use config files for object detection external plugin by adding
face_detection_plugin.json and object_detection_plugin.json files, parsing
plugin information from the config files, and use the information
according to user desired TASK api - face detection and object detection.

With this patch, external plugin relevant code has no dependency of
the config file for object detection task group. So this patch
checks if external plugin should be used or not based on the plugin flag
value which is loaded from each plugin config file.

In case object detection task group, each task API - face detection and
object detection - supports both model types - FD_TRIV2 and OD_TRIV2 - for
external plugin because the supported external plugin supports both of them
internally. Therefore, the behavior may be changed later according to use
case change.

Change-Id: I2a82000e5d7049bb91a661711dc2cdc3ef37c57c
Signed-off-by: Inki Dae <inki.dae@samsung.com>
5 months agomv_machine_learning: disable tests
Vibhav Aggarwal [Mon, 27 Nov 2023 03:58:06 +0000 (12:58 +0900)]
mv_machine_learning: disable tests

[Issue type] temporary fix

Some memory related bug in mv_machine_learning task
groups is causing the testcases to fail. This came to
notice after machine learning testcases were integrated
into mv_test[1] and the Tizen MMFW bot reported an error
after running the testcases with ASan enabled.

This patch temporarily disables those testcases until
the issue is resolved.

[1] https://review.tizen.org/gerrit/#/c/platform/core/api/mediavision/+/301594/

Change-Id: I4f69c6a2b2eded914a5422696d3af85f3ed0be00
Signed-off-by: Vibhav Aggarwal <v.aggarwal@samsung.com>
5 months agomv_machine_learning: bug fix for invalid memory access
Vibhav Aggarwal [Wed, 22 Nov 2023 03:47:35 +0000 (12:47 +0900)]
mv_machine_learning: bug fix for invalid memory access

[Issue type] bug fix

In the result() function of LandmarkDetection, ObjectDetection
and ObjectDetection3d task groups, the _result struct
was being cleared using memset to set all bytes to 0.
However, the structs include some vectors so this approach
of clearing the struct becomes invalid and resulted in
invalid memory access.

Change-Id: I98ed3e427e77b276145adbf461b3eaca44c752f6
Signed-off-by: Vibhav Aggarwal <v.aggarwal@samsung.com>
5 months agomv_machine_learning: check value range in FaceRecognition testcase
Vibhav Aggarwal [Tue, 21 Nov 2023 06:19:26 +0000 (15:19 +0900)]
mv_machine_learning: check value range in FaceRecognition testcase

[Issue type] code refactoring

In the FaceRecognition.RawResultAfterInferenceShouldBeOk testcase,
check if the output raw values lie inside an acceptable range,
instead of comparing them with the exact value. The exact value
may change based on many factors like the underlying engine version.

Change-Id: Id917bb94716c6dda369dbe8ba4de1bf6311d6e73
Signed-off-by: Vibhav Aggarwal <v.aggarwal@samsung.com>
5 months agomv_test: integrate machine learning testcases into mv_test
Vibhav Aggarwal [Mon, 20 Nov 2023 09:32:12 +0000 (18:32 +0900)]
mv_test: integrate machine learning testcases into mv_test

[Issue type] code refactoring

Change-Id: I881586381c9957d15cf97331c2a44ad52df75847
Signed-off-by: Vibhav Aggarwal <v.aggarwal@samsung.com>
5 months agomv_machine_learning: introduce config file for external plugin
Inki Dae [Tue, 21 Nov 2023 00:38:19 +0000 (09:38 +0900)]
mv_machine_learning: introduce config file for external plugin

[Issue type] : new feature

Introduce a config file for image segmentation external plugin by adding
selfie_segmentation_plugin.json file, parsing plugin information from
the config file, and use the information.

With this patch, external plugin relevant code has no dependency of
the config file for image segmentation task group. So this patch
checks if external plugin should be used or not based on the plugin flag
value which is read from the plugin config file after reading the plugin file
name from the plugin config file.

Change-Id: I126ca1706ce021257c187f76ff54615c3d0be743
Signed-off-by: Inki Dae <inki.dae@samsung.com>
5 months agomv_machine_learning: drop input and output type dependency from image classification
Inki Dae [Wed, 15 Nov 2023 10:31:30 +0000 (19:31 +0900)]
mv_machine_learning: drop input and output type dependency from image classification

[Issue type] : code refactoring

Drop input and output type dependency from image classification task group
by introducing new common input and output types, InputBaseType and
OutputBaseType, which is located in mv_machine_learning/common directory,
and by making the input and output types specific to the image
classification task group to be inherited from the common types,
and then by making adapter class of the image classification task group
to use the common type instead of specific one.

In MachineLearningType.h which is a new common header file,
struct InputBaseType {
...
};

struct OutputBaseType {
...
};

And in image_classification_type.h which is specific to image classification
task group,
struct ImageClassificationInput : public InputBaseType {
...
};

struct ImageClassificationOutput : public OutputBaseType {
...
};

With this, native API implementation - mv_image_classification.c - of the image
classification task group has no any dependency on the file so that we can
make all native implementation portions - the code in the module files starting
with 'mv_' prefix - to use common function in the mv_machine_learning/common
directory. The common function will be introduced soon.

This is a first step to drop the code duplication from the native API
implementation module of the each task group. And it's a time for second phase
since the completion of dropping the meta file dependency from the concrete
class of each task group.

Change-Id: I14764253aeafc36d4e0f39b204b35985b3ecc73a
Signed-off-by: Inki Dae <inki.dae@samsung.com>
5 months agomv_machine_learning: refactor ImageSegmentation task group
Vibhav Aggarwal [Wed, 15 Nov 2023 05:25:38 +0000 (14:25 +0900)]
mv_machine_learning: refactor ImageSegmentation task group

[Issue type] code refactoring

Lift parsing dependency from ImageSegmentation class to
ImageSegmentationAdapter and convert ImageSegmentation
into a template class.

Change-Id: I349ac7ba04f7d0193765e8cb72b6ca1a3fb7830d
Signed-off-by: Vibhav Aggarwal <v.aggarwal@samsung.com>
5 months agomv_machine_learning: convert ImageClassification class into template class
Vibhav Aggarwal [Tue, 14 Nov 2023 11:01:23 +0000 (20:01 +0900)]
mv_machine_learning: convert ImageClassification class into template class

[Issue type] code refactoring

Change-Id: I07a76684aece1773a3ef9dd2b3abbb430dad2394
Signed-off-by: Vibhav Aggarwal <v.aggarwal@samsung.com>
5 months agomv_machine_learning: convert LandmarkDetection class into template class
Vibhav Aggarwal [Tue, 14 Nov 2023 09:39:21 +0000 (18:39 +0900)]
mv_machine_learning: convert LandmarkDetection class into template class

[Issue type] code refactoring

Change-Id: Ib4a040c5a6b97fd19ab3696247e2b9df11ce9ea0
Signed-off-by: Vibhav Aggarwal <v.aggarwal@samsung.com>
5 months agomv_machine_learning: add template to Adapter::create() function
Vibhav Aggarwal [Tue, 14 Nov 2023 05:04:39 +0000 (14:04 +0900)]
mv_machine_learning: add template to Adapter::create() function

[Issue type] code refactoring

Convert the Adapter::create() function into a template function
to avoid nesting of switch cases for data type and task type.
This patch applies this change to ObjectDetection and
ObjectDetection3d task groups.

Change-Id: I1c65f844f8dd6bb646d3806fa898161db3c347e9
Signed-off-by: Vibhav Aggarwal <v.aggarwal@samsung.com>
5 months agoFix wrong input setting 31/302031/2
Kwanghoon Son [Thu, 30 Nov 2023 00:53:30 +0000 (09:53 +0900)]
Fix wrong input setting

[Issue type] bug fix

MobilenetV1 has ASAN bug which is caused from wrong input.

==1368962==AddressSanitizer CHECK failed: ../../../../libsanitizer/asan/asan_allocator.cpp:191 "((old)) == ((kAllocBegMagic))" (0x3f1f9fa03ecececf, 0xcc6e96b9cc6e96b9)
    #0 0x7f823855f4  (/lib64/libasan.so+0xca5f4)
    #1 0x7f823a2a80  (/lib64/libasan.so+0xe7a80)
    #2 0x7f822ecfe8  (/lib64/libasan.so+0x31fe8)
    #3 0x7f822ed8c8  (/lib64/libasan.so+0x328c8)
    #4 0x7f822ede1c  (/lib64/libasan.so+0x32e1c)
    #5 0x7f8237cb50 in __interceptor_free (/lib64/libasan.so+0xc1b50)
    #6 0x7f3698d0c8 in xnn_delete_operator (/lib64/libinference-engine-tflite.so+0x5350c8)
    #7 0x7f36961d48 in xnn_delete_runtime (/lib64/libinference-engine-tflite.so+0x509d48)
    #8 0x7f3690644c  (/lib64/libinference-engine-tflite.so+0x4ae44c)
    #9 0x7f368084a0 in tflite::Subgraph::CleanupNode(int) (/lib64/libinference-engine-tflite.so+0x3b04a0)

Change-Id: I029d2354f4a96e9b362703e18febc8e6d2b68c45
Signed-off-by: Kwanghoon Son <k.son@samsung.com>
5 months agoFix dlog format specifier 87/301887/1
Kwanghoon Son [Mon, 27 Nov 2023 03:56:02 +0000 (12:56 +0900)]
Fix dlog format specifier

Change-Id: I4dc0da1cee660822b9bd9c3ce19214d20c64bb9f
Signed-off-by: Kwanghoon Son <k.son@samsung.com>
6 months agoMerge branch 'tizen_devel' into tizen accepted/tizen/unified/20231115.024850
Kwanghoon Son [Tue, 14 Nov 2023 07:53:58 +0000 (16:53 +0900)]
Merge branch 'tizen_devel' into tizen

[Version] 0.30.0

Inki Dae (11):
  mv_machine_learning: add image segmentation task group support
  mv_machine_learning: use DEFAULT_MODEL_NAME for face detection task
  mv_machine_learning: use DEFAULT_MODEL_NAME for landmark detection
    task group
  mv_machine_learning: drop parsing dependency from landmark detection
  test: fix answer table values for landmark detection
  mv_machine_learning: drop unused code
  mv_machine_learning: drop parsing dependency from object detection 3d
  mv_machine_learning: introduce MachineLearningConfig class
  mv_machine_learning: drop setTaskType member function
  mv_machine_learning: use MachineLearningConfig class for other task
    groups
  mv_machine_learning: move meta directory into common one

Kwanghoon Son (2):
  Fix wrong log level
  Update cmake version to 3.13

Seungbae Shin (1):
  mv_machine_learning: initialize class/structure member properly

Vibhav Aggarwal (10):
  mv_machine_learning: bug fix in decision weight threshold
  mv_machine_learning: reallocate parser on changing meta file
  mv_machine_learning: drop parsing dependency from object detection
  mv_machine_learning: drop parsing dependency from image classification
  mv_machine_learning: drop template from MachineLearningConfig class
  mv_machine_learning: parse label file name in
    MachineLearningConfig::parseConfigFile()
  mv_machine_learning: replace ObjectDetectionConfig by
    MachineLearningConfig
  mv_machine_learning: load meta and label files in configure()
  mv_machine_learning: convert ObjectDetection3d into a template class
  mv_machine_learning: convert ObjectDetection class into template class

sangho park (1):
  Fix build break

Change-Id: Ica0db898b2d79febeb287e03ce83b323b4cbb7cc

6 months agoUpdate cmake version to 3.13
Kwanghoon Son [Mon, 13 Nov 2023 04:24:52 +0000 (13:24 +0900)]
Update cmake version to 3.13

Range version supported from 3.12 so just set minimum version to 3.13

Change-Id: Ied6872be4fff447318709e816d84ca08ee4219dd
Signed-off-by: Kwanghoon Son <k.son@samsung.com>
6 months agomv_machine_learning: convert ObjectDetection class into template class
Vibhav Aggarwal [Fri, 10 Nov 2023 11:27:23 +0000 (20:27 +0900)]
mv_machine_learning: convert ObjectDetection class into template class

[Issue type] code refactoring

Change-Id: Ib84f8211a919c82e389659bdce1b652f4419e2fb
Signed-off-by: Vibhav Aggarwal <v.aggarwal@samsung.com>
6 months agomv_machine_learning: move meta directory into common one
Inki Dae [Mon, 13 Nov 2023 05:29:15 +0000 (14:29 +0900)]
mv_machine_learning: move meta directory into common one

[Issue type] : code cleanup

Move meta directory into common one. The meta directory contains
common code to parse task own config and meta information from given files
including preprocessing and postprocessing.

However, current directory structure made it to build each task group
with the code in meta directory. It led building-duplication.

Therefore, this patch moves the meta directory into common one to combine
meta and common code. As a reault, common directory will provide one so
library - mv_ml_common.so - to each task group, and the each task group
will include only relevant header files in the common and meta directories.

Change-Id: Ib9172761ddaad0b9044f6ec02cfc71dfecb59890
Signed-off-by: Inki Dae <inki.dae@samsung.com>
6 months agomv_machine_learning: use MachineLearningConfig class for other task groups
Inki Dae [Fri, 10 Nov 2023 04:03:59 +0000 (13:03 +0900)]
mv_machine_learning: use MachineLearningConfig class for other task groups

[Issue type] : code refactoring

Use MachineLearningConfig class for other task groups instead of internal ones.

We have introduced a new common config class[1] and object detection and
object detection 3d task groups use already it. So this patch makes
other task groups - which not use the common config class - to use the
common class instead of internal ones, and drop the internal config class.

In addition, this patch applies confidence threshold config key for
landmark detection task group to MachineLearningConfig class.

[1] https://review.tizen.org/gerrit/#/c/platform/core/api/mediavision/+/301043/

Change-Id: I6e77ce33349bbdcb22f64102a7ec3f8808249b1c
Signed-off-by: Inki Dae <inki.dae@samsung.com>
6 months agomv_machine_learning: convert ObjectDetection3d into a template class
Vibhav Aggarwal [Fri, 10 Nov 2023 10:10:07 +0000 (19:10 +0900)]
mv_machine_learning: convert ObjectDetection3d into a template class

[Issue type] code refactoring

After the introduction of MachineLearningConfig, it is now possible
to convert each task group's object class into a template class.
This patch introduces this change to the object detection 3d task group.

Change-Id: Ib887846b4b1466f70d9131079f6f7ce62598fbb5
Signed-off-by: Vibhav Aggarwal <v.aggarwal@samsung.com>
6 months agomv_machine_learning: load meta and label files in configure()
Vibhav Aggarwal [Fri, 10 Nov 2023 06:37:54 +0000 (15:37 +0900)]
mv_machine_learning: load meta and label files in configure()

[Issue type] bug fix

Load the model meta and label files in configure() function
instead during the object construction.

Change-Id: I0e77fb27074ebe4d6402f66d671eee37bce855f6
Signed-off-by: Vibhav Aggarwal <v.aggarwal@samsung.com>
6 months agoFix wrong log level
Kwanghoon Son [Fri, 10 Nov 2023 07:38:20 +0000 (16:38 +0900)]
Fix wrong log level

[Issue type] Fix

Change-Id: Icdfc7f071f95be8b11b256c7ff8de3716466402a
Signed-off-by: Kwanghoon Son <k.son@samsung.com>
6 months agomv_machine_learning: replace ObjectDetectionConfig by MachineLearningConfig
Vibhav Aggarwal [Thu, 9 Nov 2023 05:03:52 +0000 (14:03 +0900)]
mv_machine_learning: replace ObjectDetectionConfig by MachineLearningConfig

[Issue type] code refactoring

This patch makes the ObjectDetection task group use
MachineLearningConfig class to reduce code duplication
across different task groups.

Change-Id: I07d8482ae761faa7918f4c66f5fc492ffe8debe5
Signed-off-by: Vibhav Aggarwal <v.aggarwal@samsung.com>
6 months agomv_machine_learning: parse label file name in MachineLearningConfig::parseConfigFile()
Vibhav Aggarwal [Fri, 10 Nov 2023 05:53:54 +0000 (14:53 +0900)]
mv_machine_learning: parse label file name in MachineLearningConfig::parseConfigFile()

[Issue type] code improvement

Get the label file name from config file during parsing
to support the task groups that rely on a label file.

Change-Id: Ice7c8108c09b10643dfcf8573b0c4a302e98ce97
Signed-off-by: Vibhav Aggarwal <v.aggarwal@samsung.com>
6 months agomv_machine_learning: drop template from MachineLearningConfig class
Vibhav Aggarwal [Fri, 10 Nov 2023 03:45:39 +0000 (12:45 +0900)]
mv_machine_learning: drop template from MachineLearningConfig class

[Issue type] code refactoring

MachineLearningConfig class introduced in [1] required the
ParserType template to initialize the _parser. This resulted in
the inclusion of parser header files of each task group in the
higher level MachineLearningConfig class which led to code smell.

This patch drops the use of template and as a first step,
modifies the object detection 3d task group to work with this
new version.

[1] https://review.tizen.org/gerrit/#/c/platform/core/api/mediavision/+/301043/

Change-Id: I90971294c89615d85ae61e789fa6200e53d367c9
Signed-off-by: Vibhav Aggarwal <v.aggarwal@samsung.com>
6 months agomv_machine_learning: drop setTaskType member function
Inki Dae [Wed, 8 Nov 2023 06:23:38 +0000 (15:23 +0900)]
mv_machine_learning: drop setTaskType member function

[Issue type] : code refactoring

Drop setTaskType member function from MetaParser and its child classes.

The setTaskType member function was used to give model specific parser object
to MetaParser class so that the MetaParser can parse model specific meta
information which describes how to parse the postprocess node of each model
specific meta file.

However, we can give the specific parser object when task group specific
parser class is created so drop the setTaskType member function and update
the object at constructor of task group specific parser class.

As of now, only object detection task group will set the specific task type
for various models support. For other task groups, 0 is used in default.

Change-Id: I7156660481f1e42daf89093f0fb1097943bbae05
Signed-off-by: Inki Dae <inki.dae@samsung.com>
6 months agomv_machine_learning: introduce MachineLearningConfig class
Inki Dae [Tue, 7 Nov 2023 11:07:51 +0000 (20:07 +0900)]
mv_machine_learning: introduce MachineLearningConfig class

[Issue type] : new feature

Introduce MachineLearningConfig class which parses configuration
and meta files for each task group.

Until now, we have fixed the code smell, divergent change, of each task group
by extracting parsing portion from each concrete class of each task group,
and we conformed that the parsing portions can be used commonly for all
task groups.

This patch introduces a new common configuration class, MachineLearningConfig
by moving all parsing portions to this class. As a first use case,
this patch makes ObjectDetection3d task group to use the MachineLarningConfig
class instead of internal code, ObjectDetection3dConfig class so it drops
all relevant internal code - finally, we can drop the ugly code duplication.

Change-Id: I8f6a3c276e61903350fd1ae4390f7b125931b2b3
Signed-off-by: Inki Dae <inki.dae@samsung.com>
6 months agomv_machine_learning: drop parsing dependency from object detection 3d
Inki Dae [Mon, 6 Nov 2023 07:05:46 +0000 (16:05 +0900)]
mv_machine_learning: drop parsing dependency from object detection 3d

[Issue type] : code refactoring

Drop the configuration and meta file parsing dependency from ObjectDetection3d
class.

Until now, the concrete class of each task group got the task group
configuration information from its own configuration file, and also
included a MetaParser class object to get the tensor information,
which is corresponding to a given model file.

However, these dependencies led code smell, divergent change[1] even though
the concrete class has no any dependency from parsing the configuration and
meta files - needed only information after parsed.

As a first refactoring work, this patch extracts parsing portion from
ObjectDetection3d class and introduces as a new class, ObjectDetection3dConfig
class.

With this, adapter classes of the object detection 3d task group will parse
the configuration and meta files before creating ObjectDetection3d class.
And then it will create ObjectDetection3d class with needed information.
As a result, we could manage the ObjectDetection3d class without any
dependency on parsing work.

[1] https://refactoring.guru/smells/divergent-change

Change-Id: Ia3955a841179c802437f175e783762affc258b4d
Signed-off-by: Inki Dae <inki.dae@samsung.com>
6 months agomv_machine_learning: drop parsing dependency from image classification
Vibhav Aggarwal [Tue, 7 Nov 2023 10:01:57 +0000 (19:01 +0900)]
mv_machine_learning: drop parsing dependency from image classification

[Issue type] : code refactoring

Drop the configuration and meta file parsing dependency from ImageClassification
class.

Until now, the concrete class of each task group got the task group
configuration information from its own configuration file, and also
included a MetaParser class object to get the tensor information,
which is corresponding to a given model file.

However, these dependencies led code smell, divergent change[1] even though
the concrete class has no any dependency from parsing the configuration and
meta files - needed only information after parsed.

As a first refactoring work, this patch extracts parsing portion from
ImageClassification class and introduces as a new class, ImageClassificationConfig
class.

With this, adapter classes of the image classification task group will parse
the configuration and meta files before creating ImageClassification class.
And then it will create ImageClassification class with needed information.
As a result, we could manage the ImageClassification class without any
dependency on parsing work.

[1] https://refactoring.guru/smells/divergent-change

Change-Id: I421dcd6f796e6865dde3e5fed597ef83e7e5bc12
Signed-off-by: Vibhav Aggarwal <v.aggarwal@samsung.com>
6 months agomv_machine_learning: drop parsing dependency from object detection
Vibhav Aggarwal [Mon, 6 Nov 2023 09:59:32 +0000 (18:59 +0900)]
mv_machine_learning: drop parsing dependency from object detection

[Issue type] : code refactoring

Drop the configuration and meta file parsing dependency from ObjectDetection
class.

Until now, the concrete class of each task group got the task group
configuration information from its own configuration file, and also
included a MetaParser class object to get the tensor information,
which is corresponding to a given model file.

However, these dependencies led code smell, divergent change[1] even though
the concrete class has no any dependency from parsing the configuration and
meta files - needed only information after parsed.

As a first refactoring work, this patch extracts parsing portion from
ObjectDetection class and introduces as a new class, ObjectDetectionConfig
class.

With this, adapter classes of the object detection task group will parse
the configuration and meta files before creating ObjectDetection class.
And then it will create ObjectDetection class with needed information.
As a result, we could manage the ObjectDetection class without any
dependency on parsing work.

[1] https://refactoring.guru/smells/divergent-change

Change-Id: I526d58e0012ba4daae8eb6eb7ef99bb3cf8545d6
Signed-off-by: Vibhav Aggarwal <v.aggarwal@samsung.com>
6 months agomv_machine_learning: reallocate parser on changing meta file
Vibhav Aggarwal [Mon, 6 Nov 2023 09:32:59 +0000 (18:32 +0900)]
mv_machine_learning: reallocate parser on changing meta file

[Issue type] bug fix

The MetaParser needs to be reallocated when the user
calls mv_facial_landmark_set_model() or mv_pose_landmark_set_model().

Change-Id: I7f21c7d36b3ffb9b869a1998bcd8ee19a365fd38
Signed-off-by: Vibhav Aggarwal <v.aggarwal@samsung.com>
6 months agomv_machine_learning: initialize class/structure member properly
Seungbae Shin [Fri, 27 Oct 2023 08:49:30 +0000 (17:49 +0900)]
mv_machine_learning: initialize class/structure member properly

[Issue type] : code cleanup

Change-Id: I3bdc0c98836ea4adf0f840ce6e3290685c1d2b6d

6 months agomv_machine_learning: drop unused code
Inki Dae [Mon, 6 Nov 2023 06:28:13 +0000 (15:28 +0900)]
mv_machine_learning: drop unused code

[Issue type] : code cleanup

Drop unused member functions from LandmarkDetection class.

Change-Id: Id6c6b33fbe79f1b381a18111f1fe201df543a46e
Signed-off-by: Inki Dae <inki.dae@samsung.com>
6 months agomv_machine_learning: bug fix in decision weight threshold
Vibhav Aggarwal [Thu, 2 Nov 2023 04:53:04 +0000 (13:53 +0900)]
mv_machine_learning: bug fix in decision weight threshold

[Issue type] bug fix

There was a minor bug in FaceRecognition::checkResult()
in which the decision weight threshold check fails to
identify the cases where multiple elements have highest
raw data value.

Change-Id: Ie859e95a72af39bc80af8dd2621f959bb0ad79d6
Signed-off-by: Vibhav Aggarwal <v.aggarwal@samsung.com>
6 months agotest: fix answer table values for landmark detection
Inki Dae [Thu, 2 Nov 2023 02:21:50 +0000 (11:21 +0900)]
test: fix answer table values for landmark detection

[Issue type] bug fix

Fix answer table values for landmark detection test case.
With a new patch[1], 'confidence_threshold' value is used to check
valid detection result for pose detection task - its specific class is PldCpm
class. Without this patch, landmark detection test cases will fail.
This patch updates the answer table values of relevant test cases correctly.

[1] https://review.tizen.org/gerrit/#/c/platform/core/api/mediavision/+/300755/

Change-Id: Id0219912d9c912bb4f4b597a968a3ba9213bfa9d
Signed-off-by: Inki Dae <inki.dae@samsung.com>
6 months agomv_machine_learning: drop parsing dependency from landmark detection
Inki Dae [Tue, 31 Oct 2023 03:45:56 +0000 (12:45 +0900)]
mv_machine_learning: drop parsing dependency from landmark detection

[Issue type] : code refactoring

Drop the configuration and meta file parsing dependency from LandmarkDetection
class.

Until now, the concrete class of each task group got the task group
configuration information from its own configuration file, and also
included a MetaPaser class object to get the tensor information,
which is corresponding to a given model file.

However, these dependencies led code smell, divergent change[1] even though
the concrete class has no any dependency from parsing the configuration and
meta files - needed only information after parsed.

As a first refactoring work, this patch extracts parsing portion from
LandmarkDetection class and introduces as a new class, LandmarkDetectionConfig
class.

With this, adapter classes of the landmark detection task group will parse
the configuration and meta files before creating LandmarkDetection class.
And then it will create LandmarkDetection class with needed information.
As a result, we could manage the LandmarkDetection class without any
dependency on parsing work.

[1] https://refactoring.guru/smells/divergent-change

Change-Id: I29f2d684e2b6e698dcf36a8294c608e90dda67c0
Signed-off-by: Inki Dae <inki.dae@samsung.com>
6 months agomv_machine_learning: use DEFAULT_MODEL_NAME for landmark detection task group
Inki Dae [Wed, 25 Oct 2023 11:07:07 +0000 (20:07 +0900)]
mv_machine_learning: use DEFAULT_MODEL_NAME for landmark detection task group

[Issue type] : new feature

Use the meta file for landmark detection tasks to set the default model

With this patch, a proper concrete class object will be created
at the constructor of FacialLandmarkAdapter and PoseLandmarkAdapter classes
according to the default model names which are parsed from each meta file,
facial_landmark.json and pose_landmark.json files.

And also this patch calls the member function, create, to create the concrete
class object corresponding to the default model name instead of creating
a default concrete class object directly.

Finally, we can create user-desired concrete class object without rebuilding
by simply modifying the meta files.

Change-Id: I4ef045fe1ae24177ae4ebc7a3f48ae6e136c01dc
Signed-off-by: Inki Dae <inki.dae@samsung.com>
6 months agomv_machine_learning: use DEFAULT_MODEL_NAME for face detection task
Inki Dae [Wed, 25 Oct 2023 06:48:25 +0000 (15:48 +0900)]
mv_machine_learning: use DEFAULT_MODEL_NAME for face detection task

[Issue type] : new feature

Use the meta file for face detection task to set the default model

With this patch, a proper concrete class object will be created
at the constructor of FaceDetectionAdapter class according to the default
model name which is parsed from face_detection.json file.

And also this patch calls the member function, create, to create the concrete
class object corresponding to the default model name instead of creating
a default concrete class object directly.

Finally, we can create user-desired concrete class object without rebuilding
by simply modifying the meta file, face_detection.json.

Change-Id: Iaddd0a820180332707852bbea51afcafb49238fa
Signed-off-by: Inki Dae <inki.dae@samsung.com>
6 months agomv_machine_learning: add image segmentation task group support
Inki Dae [Tue, 17 Oct 2023 05:15:22 +0000 (14:15 +0900)]
mv_machine_learning: add image segmentation task group support

[Issue type] : new feature

Add image segmentation task group support. As a first specific task,
this patch adds a selfie segmentation task which uses the external plugin
module via ImageSegmentationExternal class instead of internal one.
Regarding the internal task, I will update it later.

Selfie segmentation task uses image data as input source and makes also image
data as output result.

Change-Id: I6d19e176164c0187bfe710ec41a050839fa90091
Signed-off-by: Inki Dae <inki.dae@samsung.com>
6 months agoFix build break
sangho park [Mon, 13 Nov 2023 05:59:06 +0000 (14:59 +0900)]
Fix build break

[Issue type] Fix

add 'mv_private.h' for fixing build braek regarding 'dlog.h' and clean up duplicate include.

Change-Id: If5ae377f1bd3ecb53279277ace834d5d4ed1209c
Signed-off-by: sangho park <sangho.g.park@samsung.com>
6 months agoMerge branch 'tizen_devel' into tizen accepted/tizen/unified/20231025.093310 accepted/tizen/unified/20231025.120201
Kwanghoon Son [Wed, 25 Oct 2023 01:54:49 +0000 (10:54 +0900)]
Merge branch 'tizen_devel' into tizen

[Version] 0.29.0

Inki Dae (16):
  mv_machine_learning: move inferenceThreadLoop into class
  mv_machine_learning: use template type for outgoing_queue
  mv_machine_learning: introduce common asynchronous inference manager
  mv_machine_learning: drop redundant member variables
  mv_machine_learning: code refactoring to AsyncManager
  mv_machine_learning: embed AsyncManager into each task group
  mv_machine_learning: drop mv_image_classification_open.h header file
  mv_machine_learning: move member functions to private
  mv_machine_learning: drop Mediavision dependency from image
    classification adapter
  mv_machine_learning: add async API for image classification task group
  mv_machine_learning: move member functions to private
  mv_machine_learning: drop Mediavision dependency from landmark
    detection adapters
  mv_machine_learning: drop FaceRecognitionRegisterInput structure
  mv_machine_learning: add  add async API for landmark detection task
    group
  mv_machine_learning: drop importLabel wrapper
  mv_machine_learning: clean up mv_private.h header inclusion

Vibhav Aggarwal (4):
  mv_machine_learning: bug fix for setting backend type and target
    device
  mv_machine_learning: clearing up resources in the beginning of each
    test case
  mv_machine_learning: bug fix when no label is registered
  mv_machine_learning: return NO_DATA error

Change-Id: I8b1b169e3d1e5092d95ce8ad9fb87a3f476f98d1

6 months agomv_machine_learning: clean up mv_private.h header inclusion
Inki Dae [Mon, 23 Oct 2023 03:04:51 +0000 (12:04 +0900)]
mv_machine_learning: clean up mv_private.h header inclusion

[Issue type] : code cleanup

Clean up the header inclusion by making mv_private.h to be included by
machine_learning_preprocess.cpp instead of machine_learning_preprocess.h
because the header inclusion is needed to use LOG_TAG but only needed by
machine_learning_preprocess.cpp file.

Change-Id: I656f00a1508ce68487d63ba2a3c1fc3d62922549
Signed-off-by: Inki Dae <inki.dae@samsung.com>
6 months agomv_machine_learning: drop importLabel wrapper
Inki Dae [Wed, 18 Oct 2023 11:11:50 +0000 (20:11 +0900)]
mv_machine_learning: drop importLabel wrapper

[Issue type] : code cleanup

Drop importLabel member function of FaceRecognition class. This wrapper
function isn't needed anymore so we can call the importLabel function of
LabelManager class instead.

And also change return type to void including removeLabel().
It's enough with throwing an exception in error case, and return NO_DATA
if label file doesn't exist when we called recognitionFace() - it means
that we tried to recognize a given input but didn't find a proper label.

Change-Id: Ib49b72261a1b8be029d58f8088507e8bece0c674
Signed-off-by: Inki Dae <inki.dae@samsung.com>
6 months agomv_machine_learning: return NO_DATA error
Vibhav Aggarwal [Fri, 13 Oct 2023 09:13:10 +0000 (18:13 +0900)]
mv_machine_learning: return NO_DATA error

[Issue type] : bug fix

When the user does not register any face,
or unregisters all the faces, inference should
return MEDIA_VISION_ERROR_NO_DATA.

Change-Id: Ie66ffc8e8ba0357983103125bf6278b79703df2e
Signed-off-by: Vibhav Aggarwal <v.aggarwal@samsung.com>
6 months agomv_machine_learning: bug fix when no label is registered
Vibhav Aggarwal [Tue, 17 Oct 2023 04:46:48 +0000 (13:46 +0900)]
mv_machine_learning: bug fix when no label is registered

[Issue type] : bug fix

LabelManager::removeLabel had a bug where it did not remove
a label if it was the only label registered.
Additionally, LabelManager::importLabel did not clear the
_labels vector when label file doesn't exist.
This patch fixes this behaviour.

Change-Id: I628d3a6bfff41dbfd782d39c1b573175ce974b38
Signed-off-by: Vibhav Aggarwal <v.aggarwal@samsung.com>
6 months agomv_machine_learning: clearing up resources in the beginning of each test case
Vibhav Aggarwal [Fri, 13 Oct 2023 05:27:01 +0000 (14:27 +0900)]
mv_machine_learning: clearing up resources in the beginning of each test case

[Issue type] : bug fix

The RemoveModelResources() function is being called at the end
of the testcases to remove the model files. However, when a
test case fails due to failed assertion, the model files are not
getting removed and this can affect the next testcase.
This patch removes the model files in the beginning as well.

Change-Id: Ib94e894f168c35fe783f6195366369e1b8d18dd5
Signed-off-by: Vibhav Aggarwal <v.aggarwal@samsung.com>
6 months agomv_machine_learning: bug fix for setting backend type and target device
Vibhav Aggarwal [Tue, 10 Oct 2023 03:12:07 +0000 (12:12 +0900)]
mv_machine_learning: bug fix for setting backend type and target device

[Issue type] : bug fix

The set_model and set_engine APIs should have higher precedence
over the default config file, whenever used. However, for the
tasks landmark_detection, objection_detection and
object_detection_3d, the config file was overwriting model
and engine info. This patch fixes this behaviour.

Change-Id: Iafdfbbd86df98ea60d301fda2d2d8053074ac2ab
Signed-off-by: Vibhav Aggarwal <v.aggarwal@samsung.com>
6 months agomv_machine_learning: add add async API for landmark detection task group
Inki Dae [Wed, 27 Sep 2023 06:52:36 +0000 (15:52 +0900)]
mv_machine_learning: add  add async API for landmark detection task group

[Issue type] : new feature

Add two asynchronous API, mv_facial_landmark_inference_async and
mv_pose_landmark_inference_async, for landmark detection task group
using AsyncManger class which is a common class for asynchronous API support
including test case.

In addition, this patch drops the use of mutex lock due to the dead lock issue
as known-issue mentioned already through the patch[1]

[1] commit-id : fdbd84f1ff3b30c9f18598b65da777f65611e4cb

Change-Id: Ifbf5a58d5053ca0226caff14913f4a0d3ba1c45e
Signed-off-by: Inki Dae <inki.dae@samsung.com>
6 months agomv_machine_learning: drop FaceRecognitionRegisterInput structure
Inki Dae [Tue, 26 Sep 2023 07:32:37 +0000 (16:32 +0900)]
mv_machine_learning: drop FaceRecognitionRegisterInput structure

[Issue type] : code cleanup

Drop FaceRecognitionRegisterInput structure. We can use inputs and labels
members of FaceRecognitionInput structure for register instead of
FaceRecognitionRegisterInput one.

Change-Id: I62fdfad7dee351baf5b4e64af59780ac2cce9165
Reported-by: Vibhav Aggarwal <v.aggarwal@samsung.com>
Signed-off-by: Inki Dae <inki.dae@samsung.com>
6 months agomv_machine_learning: drop Mediavision dependency from landmark detection adapters
Inki Dae [Mon, 25 Sep 2023 07:55:03 +0000 (16:55 +0900)]
mv_machine_learning: drop Mediavision dependency from landmark detection adapters

[Issue type] : code refactoring

Drop Mediavision dependency from adapter classies of landmark detection task
group. There is a use case that pre-trained model file is used in private.
Therefore, the model relevant code cannot be opened. And even such users want
to configure the inference or training engines in their way.

In this case, we need to manage it properly by providing plugin approach of
behavior class. And this patch is a first step for supporting plugin based
behavior class which can be delivered as separate package.

Change-Id: I54a3f2f8de86290718129b8a44a724d3d9a3f246
Signed-off-by: Inki Dae <inki.dae@samsung.com>
6 months agomv_machine_learning: move member functions to private
Inki Dae [Mon, 25 Sep 2023 07:27:41 +0000 (16:27 +0900)]
mv_machine_learning: move member functions to private

[Issue type] : code cleanup

Move two member functions inference and preprocess from protected to private.
They are used only in LandmarkDetection class.

Change-Id: I5890575da6c926fcfb6c164c27e071bea68a3752
Signed-off-by: Inki Dae <inki.dae@samsung.com>