[ML][Common] Minor fixes

ACR: TWDAPI-273/TWDAPI-274

This commit adds 2 missing logs and replaces one variable name with a
proper one.

[Verification] Tested with below snippets, works as expected

// This snippets  triggers the added log:
var pipeline_def = "videotestsrc num-buffers=3 ! videoconvert"
                   + " ! tensor_converter ! tensor_sink name=sinkx";

var pipeline = tizen.ml.pipeline.createPipeline(pipeline_def,
                                      function(state) {console.log(state);});
// READY
// PAUSED

pipeline.registerSinkListener('sinkx', function(sinkName, data) {
    console.log('SinkListener for "' + sinkName + '" sink called');
    console.log(data);
})

pipeline.start()
// registered SinkListener is called 3 times

///////////////////////////////////////////////////////////

// This snippet no longer triggers the changed log:
var outputTI = new tizen.ml.TensorsInfo();
outputTI.addTensorInfo('ti1', 'UINT8', [1200]);
var outputTD = outputTI.getTensorsData();

outputTD.dispose()

///////////////////////////////////////////////////////////

// This snippet triggers the exception which message is now correct:

var outputTI = new tizen.ml.TensorsInfo();
outputTI.addTensorInfo('ti1', 'UINT8', [1200]);
var outputTD = outputTI.getTensorsData();
outputTD.setTensorRawData(0, 'invalid data');

Change-Id: Iec192971882b094cc93679f2104499568dc43777
Signed-off-by: Pawel Wasowski <p.wasowski2@samsung.com>

diff --git a/src/ml/js/ml_common.js b/src/ml/js/ml_common.js
index 699cddfbd460457a198ae0d1d464a4af025167ae..ef54ca2b6c54241210db7933a6d7258e5de4305b 100755 (executable)
--- a/src/ml/js/ml_common.js
+++ b/src/ml/js/ml_common.js
@@ -218,7 +218,7 @@ function ValidateBufferForTensorsData(tensorsData, index, buffer) {
             'buffer array has incompatible type, expected: ' +
                 ArrayType.name +
                 ', got: ' +
-                x.constructor.name
+                buffer.constructor.name
         );
     }
     return ret;

diff --git a/src/ml/ml_tensors_data_manager.cc b/src/ml/ml_tensors_data_manager.cc
index 0551073c4369f85f9633677f50a47deddbac8d41..dd7d774703a2a49b356d66174d798aff7972e739 100644 (file)
--- a/src/ml/ml_tensors_data_manager.cc
+++ b/src/ml/ml_tensors_data_manager.cc
@@ -30,7 +30,7 @@ TensorsData::TensorsData(ml_tensors_data_h handle, int id, TensorsInfo* tensors_
 
 TensorsData::~TensorsData() {
   ScopeLogger();
-  if (this->NativeDestroy()) {
+  if (!this->NativeDestroy()) {
     LoggerE("TensorsData NativeDestroy failed");
   }
   // TensorsDataManager releases tensors_info_

diff --git a/src/ml/ml_tensors_info_manager.cc b/src/ml/ml_tensors_info_manager.cc
index 80c03a2ac97d4ed550ba53086d83ed81d711351d..0557ff8979a4c2333e3006a15e8b367d92076722 100644 (file)
--- a/src/ml/ml_tensors_info_manager.cc
+++ b/src/ml/ml_tensors_info_manager.cc
@@ -456,6 +456,7 @@ TensorsData* TensorsInfoManager::CloneNativeTensorWithData(ml_tensors_info_h ten
     DisposeTensorsInfo(tensors_info_clone);
     return nullptr;
   }
+  LoggerD("ml_tensors_info_clone() succeeded");
 
   auto* tensors_data_clone = tensors_data_manager_->CreateTensorsData(tensors_info_clone);
   if (!tensors_data_clone) {