diff options
6 files changed, 15 insertions, 6 deletions
diff --git a/mv_machine_learning/common/include/native_capi.h b/mv_machine_learning/common/include/native_capi.h index b9be5050..377d2cba 100644 --- a/mv_machine_learning/common/include/native_capi.h +++ b/mv_machine_learning/common/include/native_capi.h @@ -31,6 +31,7 @@ namespace machine_learning { void *machine_learning_native_create(); void machine_learning_native_add(void *handle, const std::string &task_name, mediavision::common::ITask *task); +void machine_learning_native_remove(void *handle, const std::string &task_name); void machine_learning_native_destroy(void *handle); void machine_learning_native_configure(void *handle, const std::string &task_name); void machine_learning_native_prepare(void *handle, const std::string &task_name); diff --git a/mv_machine_learning/common/meta/include/Postprocess.h b/mv_machine_learning/common/meta/include/Postprocess.h index e0a19bf6..6038bec7 100644 --- a/mv_machine_learning/common/meta/include/Postprocess.h +++ b/mv_machine_learning/common/meta/include/Postprocess.h @@ -30,8 +30,6 @@ private: float getScaledWidth() const; float getScaledHeight() const; - float sigmoid(float value) const; - float dequant(float value, float scale, float zeropoint) const; public: Postprocess(InputSizeInfo info) : _sizeInfo(info) @@ -41,6 +39,9 @@ public: size_t getScaledX(float input_x) const; size_t getScaledY(float input_y) const; + static float sigmoid(float value); + static float dequant(float value, float scale, float zeropoint); + /** * Add new postprocess functions here. */ diff --git a/mv_machine_learning/common/meta/src/Postprocess.cpp b/mv_machine_learning/common/meta/src/Postprocess.cpp index 54f87c9a..99f00ea1 100644 --- a/mv_machine_learning/common/meta/src/Postprocess.cpp +++ b/mv_machine_learning/common/meta/src/Postprocess.cpp @@ -45,12 +45,12 @@ size_t Postprocess::getScaledY(float input_y) const return static_cast<size_t>(input_y * getScaledHeight()); } -float Postprocess::sigmoid(float value) const +float Postprocess::sigmoid(float value) { return 1.0 / (1.0 + exp(-value)); } -float Postprocess::dequant(float value, float scale, float zeropoint) const +float Postprocess::dequant(float value, float scale, float zeropoint) { return value / scale + zeropoint; } diff --git a/mv_machine_learning/common/src/native_capi.cpp b/mv_machine_learning/common/src/native_capi.cpp index 868f8e34..5d028b01 100644 --- a/mv_machine_learning/common/src/native_capi.cpp +++ b/mv_machine_learning/common/src/native_capi.cpp @@ -47,6 +47,13 @@ void machine_learning_native_add(void *handle, const string &task_name, ITask *t context->__tasks.insert(make_pair(task_name, task)); } +void machine_learning_native_remove(void *handle, const string &task_name) +{ + auto context = static_cast<Context *>(handle); + + context->__tasks.erase(task_name); +} + void machine_learning_native_destroy(void *handle) { auto context = static_cast<Context *>(handle); diff --git a/mv_machine_learning/image_classification/src/ImageClassificationDefault.cpp b/mv_machine_learning/image_classification/src/ImageClassificationDefault.cpp index 648db603..df11b028 100644 --- a/mv_machine_learning/image_classification/src/ImageClassificationDefault.cpp +++ b/mv_machine_learning/image_classification/src/ImageClassificationDefault.cpp @@ -55,7 +55,7 @@ template<typename T> ImageClassificationResult &ImageClassificationDefault<T>::r if (decodingScore->type == ScoreType::SIGMOID) { for (size_t idx = 0; idx < output_vec.size(); ++idx) - output_vec[idx] = PostProcess::sigmoid(output_vec[idx]); + output_vec[idx] = Postprocess::sigmoid(output_vec[idx]); } set<pair<float, int> > topScore; diff --git a/packaging/capi-media-vision.spec b/packaging/capi-media-vision.spec index 5aced201..4cac3c45 100644 --- a/packaging/capi-media-vision.spec +++ b/packaging/capi-media-vision.spec @@ -1,6 +1,6 @@ Name: capi-media-vision Summary: Media Vision library for Tizen Native API -Version: 0.35.1 +Version: 1.0.0 Release: 0 Group: Multimedia/Framework License: Apache-2.0 |