Remove unnecessary dim_type metadata

Change-Id: Ied3b116ad0e34becd9e87caafa59de8069f2639f
Signed-off-by: Tae-Young Chung <ty83.chung@samsung.com>

diff --git a/meta-template/pld_mobilenet_v1_posenet_multi_257x257.json b/meta-template/pld_mobilenet_v1_posenet_multi_257x257.json
index a65951a..76f7f13 100644 (file)
--- a/meta-template/pld_mobilenet_v1_posenet_multi_257x257.json
+++ b/meta-template/pld_mobilenet_v1_posenet_multi_257x257.json
@@ -54,7 +54,6 @@
                 "name" : "MobilenetV1/offset_2/BiasAdd",
                 "index" : [-1, 1, 1, 1],
                 "shape_type" : "NHWC",
-                "dim_type" : 2
             }
         ],
         "displacement" : [
@@ -62,14 +61,12 @@
                 "name" : "MobilenetV1/displacement_fwd_2/BiasAdd",
                 "index" : [-1, 1, 1, 1],
                 "shape_type" : "NHWC",
-                "dim_type" : 2,
                 "type" : "FORWARD"
             },
             {
                 "name" : "MobilenetV1/displacement_bwd_2/BiasAdd",
                 "index" : [-1, 1, 1, 1],
                 "shape_type" : "NHWC",
-                "dim_type" : 2,
                 "type" : "BACKWARD"
             }
         ],

diff --git a/mv_machine_learning/mv_inference/inference/include/OutputMetadata.h b/mv_machine_learning/mv_inference/inference/include/OutputMetadata.h
index 97c8821..ca4df80 100644 (file)
--- a/mv_machine_learning/mv_inference/inference/include/OutputMetadata.h
+++ b/mv_machine_learning/mv_inference/inference/include/OutputMetadata.h
@@ -329,14 +329,12 @@ namespace inference
                std::string name;
                DimInfo dimInfo;
                int shapeType;
-               int dimType;
        public:
                OffsetVec() = default;
                ~OffsetVec() = default;
                std::string GetName() { return name; }
                DimInfo GetDimInfo() { return dimInfo; }
                int GetShapeType() { return shapeType; }
-               int GetDimType() { return dimType; }
 
                int ParseOffset(JsonObject *root);
        };
@@ -348,7 +346,6 @@ namespace inference
                DimInfo dimInfo;
                inference_displacement_type_e type;
                int shapeType;
-               int dimType;
                std::map<std::string, inference_displacement_type_e> supportedDispTypes;
        public:
                DispVec();
@@ -357,7 +354,6 @@ namespace inference
                DimInfo GetDimInfo() { return dimInfo; }
                inference_displacement_type_e GetType() { return type; }
                int GetShapeType() { return shapeType; }
-               int GetDimType() { return dimType; }
 
                int ParseDisplacement(JsonObject *root);
        };

diff --git a/mv_machine_learning/mv_inference/inference/src/OutputMetadata.cpp b/mv_machine_learning/mv_inference/inference/src/OutputMetadata.cpp
index d04daff..8dec322 100755 (executable)
--- a/mv_machine_learning/mv_inference/inference/src/OutputMetadata.cpp
+++ b/mv_machine_learning/mv_inference/inference/src/OutputMetadata.cpp
@@ -920,8 +920,6 @@ namespace inference
                                return MEDIA_VISION_ERROR_INVALID_OPERATION;
                        }
 
-                       dimType = static_cast<int>(json_object_get_int_member(pObject, "dim_type"));
-                       LOGI("dim type: %d", dimType);
                }
 
                LOGI("LEAVE");
@@ -948,8 +946,7 @@ namespace inference
                        name(),
                        dimInfo(),
                        type(INFERENCE_DISPLACEMENT_TYPE_FORWARD),
-                       shapeType(INFERENCE_TENSOR_SHAPE_NCHW),
-                       dimType(2)
+                       shapeType(INFERENCE_TENSOR_SHAPE_NCHW)
        {
                supportedDispTypes.insert({"FORWARD", INFERENCE_DISPLACEMENT_TYPE_FORWARD});
                supportedDispTypes.insert({"BACKWARD", INFERENCE_DISPLACEMENT_TYPE_BACKWARD});
@@ -978,9 +975,6 @@ namespace inference
                        return MEDIA_VISION_ERROR_INVALID_OPERATION;
                }
 
-               dimType = static_cast<int>(json_object_get_int_member(root, "dim_type"));
-               LOGI("dim type: %d", dimType);
-
                LOGI("LEAVE");
                return MEDIA_VISION_ERROR_NONE;
        }

diff --git a/packaging/capi-media-vision.spec b/packaging/capi-media-vision.spec
index cf01750..78ccc9b 100644 (file)
--- a/packaging/capi-media-vision.spec
+++ b/packaging/capi-media-vision.spec
@@ -1,7 +1,7 @@
 Name:        capi-media-vision
 Summary:     Media Vision library for Tizen Native API
 Version:     0.8.14
-Release:     0
+Release:     1
 Group:       Multimedia/Framework
 License:     Apache-2.0 and BSD-3-Clause
 Source0:     %{name}-%{version}.tar.gz