[Application] Setup meson file for libyolov2_loss_layer.so

Setup meson file for making libyolov2_loss_layer.so in yolo v2
application.

**Self evaluation:**
1. Build test:	 [X]Passed [ ]Failed [ ]Skipped
2. Run test:	 [X]Passed [ ]Failed [ ]Skipped

Signed-off-by: Seungbaek Hong <sb92.hong@samsung.com>

diff --git a/Applications/YOLO/jni/meson.build b/Applications/YOLO/jni/meson.build
index cc0ac96..310b08d 100644 (file)
--- a/Applications/YOLO/jni/meson.build
+++ b/Applications/YOLO/jni/meson.build
@@ -1,15 +1,28 @@
-layer_reorg_src = files('reorg_layer.cpp')
+# build command for lib_yolov2_loss_layer.so
+yolov2_loss_src = files('yolo_v2_loss.cpp')
+yolov2_loss_layer = shared_library('yolov2_loss_layer',
+  yolov2_loss_src,
+  dependencies: [nntrainer_dep, nntrainer_ccapi_dep],
+  include_directories: include_directories('./'),
+  install: true,
+  install_dir: nntrainer_libdir/'nntrainer'/'layers',
+  cpp_args: '-DPLUGGABLE'
+)
+yolov2_loss_layer_dep = declare_dependency(
+  link_with: yolov2_loss_layer,
+  include_directories: include_directories('./')
+)
 
 # build command for lib_reorg_layer.so
+layer_reorg_src = files('reorg_layer.cpp')
 reorg_layer = shared_library('reorg_layer',
   layer_reorg_src,
   dependencies: [nntrainer_dep, nntrainer_ccapi_dep],
   include_directories: include_directories('./'),
   install: true,
-  install_dir: application_install_dir,
+  install_dir: nntrainer_libdir/'nntrainer'/'layers',
   cpp_args: '-DPLUGGABLE'
 )
-
 reorg_layer_dep = declare_dependency(
   link_with: reorg_layer,
   include_directories: include_directories('./')
@@ -25,6 +38,7 @@ yolo_sources = [
 yolo_dependencies = [app_utils_dep,
   nntrainer_dep,
   nntrainer_ccapi_dep,
+  yolov2_loss_layer_dep,
   reorg_layer_dep
 ]
 

diff --git a/Applications/YOLO/jni/yolo_v2_loss.cpp b/Applications/YOLO/jni/yolo_v2_loss.cpp
index 88234ae..df4a832 100644 (file)
--- a/Applications/YOLO/jni/yolo_v2_loss.cpp
+++ b/Applications/YOLO/jni/yolo_v2_loss.cpp
@@ -12,7 +12,7 @@
  */
 
 #include "yolo_v2_loss.h"
-#include <iostream>
+#include <nntrainer_log.h>
 
 namespace custom {
 
@@ -607,7 +607,7 @@ void YoloV2LossLayer::forwarding(nntrainer::RunLayerContext &context,
   float class_loss = mse(masked_class_pred, masked_class_gt);
 
   float loss = 5 * bbox_loss + confidence_loss + class_loss;
-  std::cout << "\nCurrent iteration loss: " << loss << std::endl;
+  ml_logd("Current iteration loss: %f", loss);
 }
 
 void YoloV2LossLayer::calcDerivative(nntrainer::RunLayerContext &context) {

diff --git a/debian/nntrainer-applications.install b/debian/nntrainer-applications.install
index ca932a2..21f5206 100644 (file)
--- a/debian/nntrainer-applications.install
+++ b/debian/nntrainer-applications.install
@@ -1 +1,2 @@
 /usr/lib/nntrainer/bin/*
+/usr/lib/*/nntrainer/layers/*

diff --git a/packaging/nntrainer.spec b/packaging/nntrainer.spec
index 0d9c008..5c2f359 100644 (file)
--- a/packaging/nntrainer.spec
+++ b/packaging/nntrainer.spec
@@ -617,6 +617,7 @@ cp -r result %{buildroot}%{_datadir}/nntrainer/unittest/
 %defattr(-,root,root,-)
 %license LICENSE
 %{_libdir}/nntrainer/bin/applications/*
+%{_libdir}/nntrainer/layers/*layer.so
 
 %if 0%{?gcov:1}
 %files gcov