Make AddLayer*Impl private

JDAI-CV · Nov 18, 2019 · e97b9db · e97b9db
1 parent fa28ade
commit e97b9db
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 5 deletions.
diff --git a/generate_code.py b/generate_code.py
@@ -394,8 +394,14 @@ def generate_model_builder():
             # A hack
             params.append(('const dnn::optional<QuantInfo> &', 'output_quant_info=dnn::nullopt'))
         params_str = ', '.join(map(lambda param: "{} {}".format(*param), params))
-        cogoutl("void AddLayer{}{}({});".format(
-            op['nnapi'], '' if op['builder_simple'] else 'Impl', params_str))
+        if op['builder_simple']:
+            cogoutl("void AddLayer{}({});".format(
+                op['nnapi'], params_str))
+        else:
+            cogoutl('private:')
+            cogoutl("void AddLayer{}Impl({});".format(
+                op['nnapi'], params_str))
+            cogoutl('public:')
     update_code('include/dnnlibrary/ModelBuilder.h', 'ModelBuilder auto generated methods')
 
 

diff --git a/include/dnnlibrary/ModelBuilder.h b/include/dnnlibrary/ModelBuilder.h
@@ -179,8 +179,12 @@ class ModelBuilder {
     void AddLayerTANH(const std::string &input, const std::string &output);
     void AddLayerFLOOR(const std::string &input, const std::string &output);
     void AddLayerLOGISTIC(const std::string &input, const std::string &output);
+
+   private:
     void AddLayerPRELUImpl(const std::string &input, const std::string &alpha,
                            const std::string &output);
+
+   public:
     void AddLayerPOW(const std::string &input, const std::string &exp,
                      const std::string &output);
     void AddLayerNEG(const std::string &input, const std::string &output);
@@ -190,9 +194,8 @@ class ModelBuilder {
                          const std::string &output);
     void AddLayerLOG(const std::string &input, const std::string &output);
     // ModelBuilder auto generated methods end
-    void AddLayerPRELU(const std::string &input,
-                                      const std::string &alpha,
-                                      const std::string &output);
+    void AddLayerPRELU(const std::string &input, const std::string &alpha,
+                       const std::string &output);
     Index AddTensorFromPersistentBuffer(
         const std::string &name, const void *buffer,
         const android::nn::wrapper::OperandType &operand_type);