Merge branch 'AfaqSabirIBEX-AddSessionConfigOptions'

Author: serizba

examples/load_model/create_config_options.py

@@ -0,0 +1,15 @@
+import tensorflow as tf
+
+def create_serialized_options(fraction, growth):
+    gpu_options = tf.GPUOptions(per_process_gpu_memory_fraction=fraction, allow_growth=growth)
+    config = tf.ConfigProto(gpu_options=gpu_options)
+    serialized = config.SerializeToString()
+    return '{' + ','.join(list(map(hex, serialized))) + '}'
+
+if __name__ == "__main__":
+    print("Create serialized options which allow TF to use a certain percentage of GPU memory and allow TF to expand this memory if required.")
+    for i in range(1, 10):
+        memory_fraction_to_use = 0.1
+        enable_memory_growth = True
+        print("GPU memory to be used: ", i * 10.0, "%")
+        print(create_serialized_options(memory_fraction_to_use, enable_memory_growth))

examples/load_model/create_model.py

@@ -13,7 +13,7 @@ def example_1():
     i = tf.initializers.global_variables()
 
     # Write the model definition
-    with open('models/load_model.pb', 'wb') as f:
+    with open('load_model.pb', 'wb') as f:
         f.write(tf.get_default_graph().as_graph_def().SerializeToString())
 
 

examples/load_model/main.cpp

@@ -9,6 +9,13 @@
 #include <iomanip>
 
 int main() {
+    // Load model with a path to the .pb file. 
+    // An optional std::vector<uint8_t> parameter can be used to supply Tensorflow with
+    // session options. The vector must represent a serialized ConfigProto which can be 
+    // generated manually in python. See create_config_options.py.
+    // Example:
+    // const std::vector<uint8_t> ModelConfigOptions = { 0x32, 0xb, 0x9, 0x9a, 0x99, 0x99, 0x99, 0x99, 0x99, 0xb9, 0x3f, 0x20, 0x1 };
+    // Model model("../model.pb", ModelConfigOptions);
     Model model("../model.pb");
     model.init();
 

include/Model.h

@@ -19,7 +19,8 @@ class Tensor;
 
 class Model {
 public:
-    explicit Model(const std::string&);
+    // Pass a path to the model file and optional Tensorflow config options. See examples/load_model/main.cpp.
+    explicit Model(const std::string& model_filename, const std::vector<uint8_t>& config_options = {});
 
     // Rule of five, moving is easy as the pointers can be copied, copying not as i have no idea how to copy
     // the contents of the pointer (i guess dereferencing won't do a deep copy)

src/Model.cpp

@@ -4,14 +4,19 @@
 
 #include "../include/Model.h"
 
-Model::Model(const std::string& model_filename) {
-
+Model::Model(const std::string& model_filename, const std::vector<uint8_t>& config_options) {
     this->status = TF_NewStatus();
     this->graph = TF_NewGraph();
 
     // Create the session.
     TF_SessionOptions* sess_opts = TF_NewSessionOptions();
 
+    if (!config_options.empty())
+    {
+        TF_SetConfig(sess_opts, static_cast<const void*>(config_options.data()), config_options.size(), this->status);
+        this->status_check(true);
+    }
+
     this->session = TF_NewSession(this->graph, sess_opts, this->status);
     TF_DeleteSessionOptions(sess_opts);