Add dnn:: namespace

JDAI-CV · May 24, 2019 · a6fd498 · a6fd498
1 parent 6ea82ea
commit a6fd498
Show file tree

Hide file tree

Showing 16 changed files with 43 additions and 7 deletions.
diff --git a/binaries/dnn_benchmark.cpp b/binaries/dnn_benchmark.cpp
@@ -19,6 +19,9 @@ using std::cout;
 using std::endl;
 using std::string;
 using Clock = std::chrono::high_resolution_clock;
+using dnn::DaqReader;
+using dnn::Model;
+using dnn::ModelBuilder;
 
 auto GetModel(css &daq_name, const bool allow_fp16,
               const PreferenceCode &compile_preference) {

diff --git a/binaries/dnn_retrieve_result.cpp b/binaries/dnn_retrieve_result.cpp
@@ -23,6 +23,10 @@ using std::cout;
 using std::endl;
 using std::string;
 using Clock = std::chrono::high_resolution_clock;
+using dnn::DaqReader;
+using dnn::Model;
+using dnn::ModelBuilder;
+using dnn::OnnxReader;
 
 bool hasEnding(std::string const &fullString, std::string const &ending) {
     if (fullString.length() >= ending.length()) {

diff --git a/binaries/ex_model_builder.cpp b/binaries/ex_model_builder.cpp
@@ -9,8 +9,10 @@
 #include <dnnlibrary/ModelBuilder.h>
 #include <glog/logging.h>
 
+using namespace android::nn::wrapper;
+using dnn::ModelBuilder;
+
 int main() {
-    using namespace android::nn::wrapper;
     ModelBuilder builder;
     builder.Prepare();
     const bool quant8 = true;

diff --git a/dnnlibrary/src/DaqReader.cpp b/dnnlibrary/src/DaqReader.cpp
@@ -14,6 +14,7 @@
 #include <flatbuffers_helper.h>
 #include <glog/logging.h>
 
+namespace dnn {
 void ReadDaqImpl(const uint8_t *buf, ModelBuilder &builder);
 
 std::string layer_type_to_str(DNN::LayerType type) {
@@ -358,3 +359,4 @@ void ReadDaqImpl(const uint8_t *buf, ModelBuilder &builder) {
     AddInputs(*model, builder);
     AddLayers(*model, builder);
 }
+}
diff --git a/dnnlibrary/src/JavaWrapper.cpp b/dnnlibrary/src/JavaWrapper.cpp
@@ -5,11 +5,13 @@
 #include <map>
 #include <vector>
 
-#include <DaqReader.h>
 #include <android/asset_manager_jni.h>
-#include "ModelBuilder.h"
+#include <dnnlibrary/DaqReader.h>
+#include <dnnlibrary/ModelBuilder.h>
 #include "jni_handle.h"
 
+using dnn::DaqReader;
+using dnn::ModelBuilder;
 using std::map;
 using std::string;
 

diff --git a/dnnlibrary/src/Model.cpp b/dnnlibrary/src/Model.cpp
@@ -12,6 +12,7 @@
 #include <common/helper.h>
 #include <glog/logging.h>
 
+namespace dnn {
 template void Model::Predict<float>(const std::vector<float> &);
 template void Model::Predict<uint8_t>(const std::vector<uint8_t> &);
 template void Model::Predict<float>(const std::vector<std::vector<float>> &);
@@ -164,3 +165,4 @@ void Model::Predict(const std::vector<T *> &inputs) {
     }
     PredictAfterSetInputBuffer();
 }
+}
diff --git a/dnnlibrary/src/ModelBuilder.cpp b/dnnlibrary/src/ModelBuilder.cpp
@@ -34,6 +34,7 @@
             std::string(", ") + (note));                                  \
     }
 
+namespace dnn {
 using std::array;
 using std::ifstream;
 using std::ios;
@@ -947,3 +948,4 @@ ModelBuilder &ModelBuilder::AllowFp16(const bool allowed) {
 #endif
     return *this;
 }
+}
diff --git a/dnnlibrary/src/OnnxReader.cpp b/dnnlibrary/src/OnnxReader.cpp
@@ -4,6 +4,7 @@
 
 #include <tools/onnx2daq/OnnxConverter.h>
 
+namespace dnn {
 void OnnxReader::ReadOnnx(const std::string &filepath, ModelBuilder &builder) {
     ONNX_NAMESPACE::ModelProto model_proto;
     {
@@ -28,3 +29,4 @@ void OnnxReader::ReadOnnx(const ONNX_NAMESPACE::ModelProto &model_proto, ModelBu
     DaqReader daq_reader;
     daq_reader.ReadDaq(std::move(buf), builder);
 }
+}
diff --git a/include/dnnlibrary/DaqReader.h b/include/dnnlibrary/DaqReader.h
@@ -12,6 +12,7 @@
 #include <common/daq_generated.h>
 #include <flatbuffers/flatbuffers.h>
 
+namespace dnn {
 class DaqReader {
    public:
     void ReadDaq(const std::string &filepath, ModelBuilder &builder,
@@ -21,5 +22,6 @@ class DaqReader {
     void ReadDaq(std::unique_ptr<uint8_t[]> buf, ModelBuilder &builder);
     void ReadDaq(const uint8_t *buf, ModelBuilder &builder);
 };
+}
 
 #endif  // DNNLIBRARY_DAQREADER_H
diff --git a/include/dnnlibrary/Model.h b/include/dnnlibrary/Model.h
@@ -9,10 +9,11 @@
 #include <memory>
 #include <vector>
 
-#include <dnnlibrary/NeuralNetworksWrapper.h>
 #include <common/Shaper.h>
 #include <common/StrKeyMap.h>
+#include <dnnlibrary/NeuralNetworksWrapper.h>
 
+namespace dnn {
 class Model {
     friend class ModelBuilder;
 
@@ -34,7 +35,8 @@ class Model {
     void AddOutput(const std::string &name, const Shaper::Shape &shape);
     void SetInputBuffer(const int32_t index, const float *buffer);
     void SetInputBuffer(const int32_t index, const uint8_t *buffer);
-    void SetInputBuffer(const int32_t index, const void *buffer, const size_t elemsize);
+    void SetInputBuffer(const int32_t index, const void *buffer,
+                        const size_t elemsize);
     void PrepareForExecution();
     void PredictAfterSetInputBuffer();
     bool prepared_for_exe_;
@@ -54,11 +56,13 @@ class Model {
     void SetOutputBuffer(const int32_t index, float *buffer);
     void SetOutputBuffer(const int32_t index, uint8_t *buffer);
     void SetOutputBuffer(const int32_t index, char *buffer);
-    void SetOutputBuffer(const int32_t index, void *buffer, const size_t elemsize);
+    void SetOutputBuffer(const int32_t index, void *buffer,
+                         const size_t elemsize);
     size_t GetSize(const std::string &name);
     Shaper::Shape GetShape(const std::string &name);
     std::vector<std::string> GetInputs();
     std::vector<std::string> GetOutputs();
 };
+}
 
 #endif  // NNAPIEXAMPLE_MODEL_H
diff --git a/include/dnnlibrary/ModelBuilder.h b/include/dnnlibrary/ModelBuilder.h
@@ -18,6 +18,7 @@
 #include <common/StrKeyMap.h>
 #include <dnnlibrary/Model.h>
 
+namespace dnn {
 class ModelBuilder {
    public:
     using Index = uint32_t;
@@ -279,4 +280,5 @@ class ModelBuilder {
         (indexes.push_back(OperandFromScalar(args)), ...);
     }
 };
+}
 #endif  // NNAPIEXAMPLE_MODELBUILDER_H
diff --git a/include/dnnlibrary/OnnxReader.h b/include/dnnlibrary/OnnxReader.h
@@ -14,11 +14,13 @@
 #include <flatbuffers/flatbuffers.h>
 #include <onnx/onnx_pb.h>
 
+namespace dnn {
 class OnnxReader {
    public:
     void ReadOnnx(const std::string &filepath, ModelBuilder &builder);
     void ReadOnnx(const uint8_t *buf, const size_t size, ModelBuilder &builder);
     void ReadOnnx(const ONNX_NAMESPACE::ModelProto &model_proto, ModelBuilder &builder);
 };
+}
 
 #endif  // DNNLIBRARY_ONNXREADER_H
diff --git a/include/tools/onnx2daq/OnnxConverter.h b/include/tools/onnx2daq/OnnxConverter.h
@@ -5,6 +5,7 @@
 #include <onnx/onnx_pb.h>
 #include "optional.h"
 
+namespace dnn {
 class OnnxConverter {
    private:
     Shaper shaper_;
@@ -178,3 +179,4 @@ class OnnxConverter {
     void Save(const std::string &filename);
     std::unique_ptr<uint8_t[]> GetBuf();
 };
+}  // namespace dnn
diff --git a/tools/onnx2daq/OnnxConverter.cpp b/tools/onnx2daq/OnnxConverter.cpp
@@ -16,6 +16,7 @@ using std::string;
 using std::vector;
 using Shape = Shaper::Shape;
 
+namespace dnn {
 std::string OnnxConverter::m(const std::string &str) {
     if (name_map_.find(str) != name_map_.end()) {
         return name_map_[str];
@@ -1053,3 +1054,4 @@ std::unique_ptr<uint8_t[]> OnnxConverter::GetBuf() {
     memcpy(ptr.get(), builder_.GetBufferPointer(), builder_.GetSize());
     return std::move(ptr);
 }
+}  // namespace dnn
diff --git a/tools/onnx2daq/onnx2daq.cpp b/tools/onnx2daq/onnx2daq.cpp
@@ -6,11 +6,13 @@
 #include <glog/logging.h>
 #include "tools/onnx2daq/OnnxConverter.h"
 
+using dnn::OnnxConverter;
 using std::string;
 using std::vector;
 
 void usage(const std::string &filename) {
-    std::cout << "Usage: " << filename << " onnx_model output_filename [table_file]" << std::endl;
+    std::cout << "Usage: " << filename
+              << " onnx_model output_filename [table_file]" << std::endl;
 }
 
 int main(int argc, char **argv) {

diff --git a/tools/onnx2daq/pywrapper.cpp b/tools/onnx2daq/pywrapper.cpp
@@ -3,6 +3,7 @@
 #include <tools/onnx2daq/OnnxConverter.h>
 
 namespace py = pybind11;
+using dnn::OnnxConverter;
 
 void convert(const std::string &model_str,
                             const std::string &filepath,