Fix: NCNN input issues.

jolibrain · Dec 14, 2018 · 111269a · 111269a
1 parent f254c71
commit 111269a
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 0 deletions.
diff --git a/src/imginputfileconn.h b/src/imginputfileconn.h
@@ -565,6 +565,10 @@ namespace dd
 #include "backends/dlib/dlibinputconns.h"
 #endif
 
+#ifdef USE_NCNN
+#include "backends/ncnn/ncnninputconns.h"
+#endif
+
 #ifdef USE_CAFFE2
 #include "backends/caffe2/caffe2inputconns.h"
 #endif

diff --git a/src/jsonapi.cc b/src/jsonapi.cc
@@ -493,6 +493,32 @@ namespace dd
 	}
 
 #endif // USE_CAFFE2
+
+#ifdef USE_NCNN
+  else if (mllib == "ncnn")
+  {
+    NCNNModel ncnnmodel(ad_model);
+    if (type == "supervised")
+    {
+      if (input == "image")
+        add_service(sname, std::move(MLService<NCNNLib,ImgNCNNInputFileConn,SupervisedOutput,NCNNModel>(sname,ncnnmodel,description)), ad);
+      else return dd_input_connector_not_found_1004();
+      if (JsonAPI::store_json_blob(ncnnmodel._repo, jstr))
+        _logger->error("couldn't write {} file in model repository {}", JsonAPI::_json_blob_fname, ncnnmodel._repo);
+      // store model configuration json blob
+      if (store_config && JsonAPI::store_json_config_blob(ncnnmodel._repo, jstr)) {
+	_logger->error("couldn't write {} file in model repository {}",
+		       JsonAPI::_json_config_blob_fname, ncnnmodel._repo);
+      }
+    }
+    else
+      {
+	// unknown type
+	return dd_service_bad_request_1006();
+      }
+  }
+#endif // USE_NCNN
+
 #ifdef USE_TF
 	else if (mllib == "tensorflow" || mllib == "tf")
 	  {