Added image reading function for runtime

runtime/CMakeLists.txt

@@ -29,6 +29,16 @@ if(USE_OPENCV)
   add_definitions(-DUSE_OPENCV=1)
 endif()
 
+option(USE_LIBPNG "use PNG library" OFF)
+if(NOT USE_OPENCV)
+  if(USE_LIBPNG)
+    find_package(PNG REQUIRED)
+    if(NOT PNG_FOUND)
+      message(SEND_ERROR "PNG library not found.")
+    endif()
+    add_definitions(-DUSE_LIBPNG=1)
+  endif()
+endif()
 
 # Add yaml cpp
 option(YAML_CPP_BUILD_TESTS "Enable testing" OFF)
@@ -49,13 +59,22 @@ file(GLOB SRCS "src/[a-zA-Z]*.cpp")
 file(GLOB PUBLIC_HEADERS "include/blueoil.hpp")
 file(GLOB PRIVATE_HEADERS "include/[a-zA-Z]*.hpp")
 if(NOT USE_OPENCV)
-  list(FILTER SRCS EXCLUDE REGEX ".*opencv.cpp$")
-  list(FILTER PRIVATE_HEADERS EXCLUDE REGEX ".*opencv.hpp$")
+  file(GLOB OPENCV_SRCS "src/*_opencv.cpp")
+  file(GLOB OPENCV_HEADERS "include/*_opencv.hpp")
+  list(REMOVE_ITEM SRCS ${OPENCV_SRCS})
+  list(REMOVE_ITEM PRIVATE_HEADERS ${OPENCV_HEADERS})
+endif()
+if(NOT USE_LIBPNG)
+  file(GLOB PNG_SRCS "src/*_png.cpp")
+  file(GLOB PNG_HEADERS "include/*_png.hpp")
+  list(REMOVE_ITEM SRCS ${PNG_SRCS})
+  list(REMOVE_ITEM PRIVATE_HEADERS ${PNG_HEADERS})
 endif()
 
 
 if(VERBOSE)
   message(STATUS "use_opencv: ${USE_OPENCV}")
+  message(STATUS "use_libpng: ${USE_LIBPNG}")
   message(STATUS "sources: ${SRCS}")
   message(STATUS "public_headers: ${PUBLIC_HEADERS}")
   message(STATUS "private_headers: ${PRIVATE_HEADERS}")
@@ -67,6 +86,9 @@ include_directories(include yaml-cpp/include)
 if(USE_OPENCV)
   include_directories(${OpenCV_INCLUDE_DIRS})
 endif()
+if(USE_PNG)
+  include_directories(${PNG_INCLUDE_DIRS})
+endif()
 
 
 # Add dlk static lib.

runtime/README.md

@@ -1,9 +1,16 @@
+# Import model with dlk library
+
+- Choose a model to try from blueoil/dlk/examples/
+   - for example: classification/lmnet_quantize_cifar10
+- make libdlk_x86.a with reference blueoil/dlk/README.md
+- put libdlk_x86.a & meta.yaml to blueoil/runtime/examples/
+
 # Build blueoil static lib
 ```
 $ mkdir build
 $ cd build
 # You can set `DLK_LIB_DIR` environment.
-$ DLK_LIB_DIR=`pwd`/../examples/dlk_lib/ cmake ../
+$ DLK_LIB_DIR=`pwd`/../examples/ cmake ../
 $ make
 $ make install
 $ tree output/
@@ -20,7 +27,7 @@ output/
 $ mkdir build
 $ cd build
 # -DBUILD_SHARED_LIBS=ON
-$ DLK_LIB_DIR=`pwd`/../examples/dlk_lib/ cmake -DBUILD_SHARED_LIBS=ON ../
+$ DLK_LIB_DIR=`pwd`/../examples/ cmake -DBUILD_SHARED_LIBS=ON ../
 $ make
 $ make install
 $ tree output/
@@ -41,59 +48,47 @@ $ cd examples
 $ cp -R ../build/output/* ./
 $ cmake .
 $ make
-$ ./a.out
+$ ./run -i cat.npy -c meta.yaml
 classes:
-0
-1
-2
-3
-4
-5
-6
-7
-8
-9
+airplane
+automobile
+bird
+cat
+deer
+dog
+frog
+horse
+ship
+truck
 task: IMAGE.CLASSIFICATION
 expected input shape:
 1
-128
-128
+32
+32
 3
 Run
 Results !
-0.100382
-0.0998879
-0.101126
-0.098727
-0.100418
-0.0999296
-0.100612
-0.0995238
-0.0996848
-0.0997096
+shape:1 10
+0.000105945 6.23502e-05 0.0323531 0.00360625 0.0124029 0.000231775 0.951004 8.7062e-05 9.84179e-05 4.80589e-05
 ```
 
-Currentlly pre/post-process functions are NOT correctly implemented. 
-The value of Results! 0.100382, 0.0998879 will be changed after correct implementation.
-
-
 # Unit tests
 
 ```
 $ cd build
-$ DLK_LIB_DIR=`pwd`/../examples/dlk_lib/ cmake -DBUILD_SHARED_LIBS=ON ../
+$ DLK_LIB_DIR=`pwd`/../examples/ cmake -DBUILD_SHARED_LIBS=ON ../
 $ make
 $ make test
 Running tests...
 Test project <repos_dir>/blueoil/runtime/build
     Start 1: blueoil-test-tensor
-1/4 Test #1: blueoil-test-tensor ..............   Passed    0.00 sec
+1/5 Test #1: blueoil-test-tensor ..............   Passed    0.00 sec
     Start 2: blueoil-test-image
-2/4 Test #2: blueoil-test-image ...............   Passed    0.00 sec
-    Start 3: blueoil-test-opencv
-3/4 Test #3: blueoil-test-opencv ..............   Passed    0.04 sec
+2/5 Test #2: blueoil-test-image ...............   Passed    0.00 sec
+    Start 3: blueoil-test-npy
+3/5 Test #3: blueoil-test-npy .................   Passed    0.00 sec
     Start 4: blueoil-test-resize
-4/4 Test #4: blueoil-test-resize ..............   Passed    0.04 sec
+4/5 Test #4: blueoil-test-resize ..............   Passed    0.00 sec
     Start 5: blueoil-test-data_processor
 5/5 Test #5: blueoil-test-data_processor ......   Passed    0.00 sec
 

runtime/examples/CMakeLists.txt

@@ -7,10 +7,30 @@ set(CMAKE_CXX_COMPILER g++)
 set(CMAKE_CXX_FLAGS "-Wall -O3")
 set(CMAKE_CXX_STANDARD "11")
 
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/meta.yaml meta.yaml COPYONLY)
-
 link_directories(${CMAKE_CURRENT_SOURCE_DIR}/lib)
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include)
 
-add_executable(a.out run.cpp)
-target_link_libraries(a.out blueoil pthread)
+add_executable(run run.cpp)
+
+if(USE_OPENCV)
+  find_package(OpenCV REQUIRED)
+  if(NOT OpenCV_FOUND)
+    message(SEND_ERROR "OpenCV library not found.")
+  endif()
+endif()
+if(USE_LIBPNG)
+  find_package(PNG REQUIRED)
+  if(NOT PNG_FOUND)
+    message(SEND_ERROR "PNG library not found.")
+  endif()
+endif()
+
+if(USE_OPENCV)
+  target_link_libraries(run blueoil ${OpenCV_LIBS})
+else()
+  if(USE_LIBPNG)
+    target_link_libraries(run blueoil png pthread)
+  else()
+    target_link_libraries(run blueoil pthread)
+  endif()
+endif()

runtime/examples/run.cpp

@@ -16,27 +16,34 @@ limitations under the License.
 #include <string>
 #include <iostream>
 #include <vector>
+#include <cstring>
 
 #include "blueoil.hpp"
 
-// TODO: delete this func. it is for debug.
-blueoil::Tensor RandomImage(int height, int width, int channel) {
-    blueoil::Tensor t({height, width, channel});
-    std::vector<float>& data = t.data();
-    unsigned seed = 0;
 
-    for (size_t i = 0; i < data.size(); ++i) {
-        const float f_rand = static_cast <float> (rand_r(&seed)) / static_cast <float> (RAND_MAX) * 255;
-        data[i] = f_rand;
+int main(int argc, char **argv) {
+  std::string imagefile, meta_yaml;
+
+  for (int i = 1; i < (argc-1); i++) {
+    char *arg = argv[i];
+    char *arg2 = argv[i+1];
+    if ((arg[0] == '-') && (std::strlen(arg) == 2) && (arg2[0] != '-')) {
+      switch (arg[1]) {
+        case 'i':  // image file (ex. raw_image.npy)
+          imagefile = std::string(arg2);
+          break;
+        case 'c':  // config file (meta.yaml)
+          meta_yaml = std::string(arg2);
+          break;
+      }
     }
+  }
 
-    return t;
-}
-
-
-
-int main() {
-  std::string meta_yaml = "meta.yaml";
+  if (imagefile.empty() || meta_yaml.empty()) {
+    std::cerr << "Usage: a.out -i <imagefile> -c <configfile>" << std::endl;
+    std::cerr << "ex) a.out -i raw_image.npy -c meta.yaml" << std::endl;
+    std::exit(1);
+  }
 
   blueoil::Predictor predictor = blueoil::Predictor(meta_yaml);
 
@@ -51,14 +58,13 @@ int main() {
   for (int j : predictor.expected_input_shape) {
     std::cout << j << "\n";
   }
-
-  blueoil::Tensor random_image = RandomImage(256, 256, 3);
+  blueoil::Tensor image = blueoil::Tensor_loadImage(imagefile);
 
   std::cout << "Run" << std::endl;
-  blueoil::Tensor output =  predictor.Run(random_image);
+  blueoil::Tensor output =  predictor.Run(image);
 
   std::cout << "Results !" << std::endl;
-  for (float j : output.data()) {
-    std::cout << j << std::endl;
-  }
+  output.dump();
+
+  std::exit(0);
 }

runtime/include/blueoil.hpp

@@ -69,6 +69,8 @@ class Tensor {
   bool allclose(const Tensor &tensor, float rtol, float atol) const;
 };
 
+Tensor Tensor_loadImage(std::string filename);
+
 
 // typedef Tensor (*TensorFunction)(Tensor&);
 typedef std::function<Tensor(const Tensor& input)> Processor;

runtime/include/blueoil_image.hpp

@@ -16,6 +16,7 @@ limitations under the License.
 #ifndef RUNTIME_INCLUDE_BLUEOIL_IMAGE_HPP_
 #define RUNTIME_INCLUDE_BLUEOIL_IMAGE_HPP_
 
+#include <string>
 #include "blueoil.hpp"
 
 namespace blueoil {
@@ -26,6 +27,8 @@ enum ResizeFilter {
                    RESIZE_FILTER_BI_LINEAR = 2,
 };
 
+Tensor LoadImage(const std::string filename);
+
 Tensor Resize(const Tensor& image, const int width, const int height,
               const enum ResizeFilter filter);
 

runtime/include/blueoil_npy.hpp

@@ -0,0 +1,30 @@
+/* Copyright 2019 The Blueoil Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+=============================================================================*/
+
+#ifndef RUNTIME_INCLUDE_BLUEOIL_NPY_HPP_
+#define RUNTIME_INCLUDE_BLUEOIL_NPY_HPP_
+
+#include <string>
+#include "blueoil.hpp"
+
+namespace blueoil {
+namespace npy {
+
+Tensor Tensor_fromNPYFile(const std::string filename);
+
+}  // namespace npy
+}  // namespace blueoil
+
+#endif  // RUNTIME_INCLUDE_BLUEOIL_NPY_HPP_

runtime/include/blueoil_png.hpp

@@ -0,0 +1,30 @@
+/* Copyright 2019 The Blueoil Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+=============================================================================*/
+
+#ifndef RUNTIME_INCLUDE_BLUEOIL_PNG_HPP_
+#define RUNTIME_INCLUDE_BLUEOIL_PNG_HPP_
+
+#include <string>
+#include "blueoil.hpp"
+
+namespace blueoil {
+namespace png {
+
+Tensor Tensor_fromPNGFile(const std::string filename);
+
+}  // namespace png
+}  // namespace blueoil
+
+#endif  // RUNTIME_INCLUDE_BLUEOIL_PNG_HPP_

runtime/src/blueoil.cpp

@@ -26,6 +26,7 @@ limitations under the License.
 #include <functional>
 
 #include "blueoil.hpp"
+#include "blueoil_image.hpp"
 #include "blueoil_data_processor.hpp"
 
 #include "yaml-cpp/yaml.h"
@@ -242,6 +243,10 @@ bool Tensor::allclose(const Tensor &tensor, float rtol, float atol) const {
   return true;
 }
 
+Tensor Tensor_loadImage(std::string filename) {
+  return blueoil::image::LoadImage(filename);
+}
+
 
 // mapping process node to functions vector.
 void MappingProcess(const YAML::Node processors_node, std::vector<Processor>* functions) {