Add inline declaration to avoid ODR violation. A test is also included.

Author: ljn917

examples/tensor/CMakeLists.txt

@@ -5,6 +5,6 @@ find_library(TENSORFLOW_LIB tensorflow HINT $ENV{HOME}/libtensorflow2/lib)
 
 set(CMAKE_CXX_STANDARD 17)
 
-add_executable(example main.cpp)
+add_executable(example main.cpp odr.cpp)
 target_include_directories(example PRIVATE ../../include $ENV{HOME}/libtensorflow2/include)
 target_link_libraries(example "${TENSORFLOW_LIB}")

examples/tensor/odr.cpp

@@ -0,0 +1,4 @@
+#include "cppflow/cppflow.h"
+
+// Do NOT remove this file
+// test ODR violation

include/cppflow/context.h

@@ -14,7 +14,7 @@
 
 namespace cppflow {
 
-    bool status_check(TF_Status* status) {
+    inline bool status_check(TF_Status* status) {
         if (TF_GetCode(status) != TF_OK) {
             throw std::runtime_error(TF_Message(status));
         }

include/cppflow/cppflow.h

@@ -28,7 +28,7 @@ namespace cppflow {
  ******************************/
 
 namespace cppflow {
-    std::string version() {
+    inline std::string version() {
         return "TensorFlow: " + std::string(TF_Version()) + " CppFlow: 2.0.0";
     }
 }

include/cppflow/datatype.h

@@ -13,7 +13,7 @@ namespace cppflow {
      * @return A string representing dt
      *
      */
-    std::string to_string(datatype dt) {
+    inline std::string to_string(datatype dt) {
         switch (dt) {
             case TF_FLOAT:
                 return "TF_FLOAT";
@@ -103,7 +103,7 @@ namespace cppflow {
      * @return  The stream os after inserting the string representation of dt
      *
      */
-    std::ostream& operator<<(std::ostream& os, datatype dt) {
+    inline std::ostream& operator<<(std::ostream& os, datatype dt) {
         os << to_string(dt);
         return os;
     }

include/cppflow/model.h

@@ -42,7 +42,7 @@ namespace cppflow {
 
 namespace cppflow {
 
-    model::model(const std::string &filename) {
+    inline model::model(const std::string &filename) {
         this->graph = {TF_NewGraph(), TF_DeleteGraph};
 
         // Create the session.
@@ -64,7 +64,7 @@ namespace cppflow {
         status_check(context::get_status());
     }
 
-    std::vector<std::string> model::get_operations() const {
+    inline std::vector<std::string> model::get_operations() const {
         std::vector<std::string> result;
         size_t pos = 0;
         TF_Operation* oper;
@@ -76,12 +76,12 @@ namespace cppflow {
         return result;
     }
 
-    std::tuple<std::string, int> parse_name(const std::string& name) {
+    inline std::tuple<std::string, int> parse_name(const std::string& name) {
         auto idx = name.find(':');
         return (idx == -1 ? std::make_tuple(name, 0) : std::make_tuple(name.substr(0, idx), std::stoi(name.substr(idx + 1))));
     }
 
-    std::vector<tensor> model::operator()(std::vector<std::tuple<std::string, tensor>> inputs, std::vector<std::string> outputs) {
+    inline std::vector<tensor> model::operator()(std::vector<std::tuple<std::string, tensor>> inputs, std::vector<std::string> outputs) {
 
         std::vector<TF_Output> inp_ops(inputs.size());
         std::vector<TF_Tensor*> inp_val(inputs.size(), nullptr);
@@ -128,7 +128,7 @@ namespace cppflow {
         return result;
     }
 
-    tensor model::operator()(const tensor& input) {
+    inline tensor model::operator()(const tensor& input) {
         return (*this)({{"serving_default_input_1", input}}, {"StatefulPartitionedCall"})[0];
     }
 }

include/cppflow/ops.h

@@ -56,29 +56,29 @@ namespace cppflow {
 
     // Operators
 
-    tensor operator+(const tensor& x, const tensor& y) {
+    inline tensor operator+(const tensor& x, const tensor& y) {
         return add(x, y);
     }
 
-    tensor operator-(const tensor& x, const tensor& y) {
+    inline tensor operator-(const tensor& x, const tensor& y) {
         return sub(x, y);
     }
 
-    tensor operator*(const tensor& x, const tensor& y) {
+    inline tensor operator*(const tensor& x, const tensor& y) {
         return mul(x, y);
     }
 
-    tensor operator/(const tensor& x, const tensor& y) {
+    inline tensor operator/(const tensor& x, const tensor& y) {
         return div(x, y);
     }
 
-    std::ostream& operator<<(std::ostream& os, const cppflow::tensor& t) {
+    inline std::ostream& operator<<(std::ostream& os, const cppflow::tensor& t) {
         std::string res =  to_string(t);
         return os << res;
     }
 
 
-    std::string to_string(const tensor &t) {
+    inline std::string to_string(const tensor &t) {
         auto res_tensor = string_format({t.shape(), t}, "(tensor: shape=%s, data=\n%s)");
         auto res_tensor_h = res_tensor.get_tensor();
 

include/cppflow/ops_generator/generator.py

@@ -142,7 +142,7 @@ def code(self):
         # C++ function body
         template = textwrap.dedent('''
         {}
-        {} {}({}{}) {{
+        inline {} {}({}{}) {{
 
             // Define Op
             std::unique_ptr<TFE_Op, decltype(&TFE_DeleteOp)> op(TFE_NewOp(context::get_context(), "{}", context::get_status()), &TFE_DeleteOp);