Fix TF backwards compatibility issues (#333)

* Enable Grappler only for TF version >=2.6

* Fix type conversion errors for TF 2.4.4

* Fix type conversion issues for TF 2.4.4

* Make base version of TF for Grappler support 2.8

* Fix code formatting

Author: sspintel

openvino_tensorflow/CMakeLists.txt

@@ -50,6 +50,19 @@ set(SRC
    grappler/costs/cost_analyzer.cc
 )
 
+string(REPLACE "." ";" TF_VERSION_LIST ${TensorFlow_VERSION})
+list(GET TF_VERSION_LIST 0 TF_MAJOR_VERSION)
+list(GET TF_VERSION_LIST 1 TF_MINOR_VERSION)
+
+# Enable Grappler only for TF >= 2.8
+if(NOT ((TF_MAJOR_VERSION STRGREATER_EQUAL "2") AND (TF_MINOR_VERSION STRGREATER_EQUAL "8")))
+   list(REMOVE_ITEM SRC grappler/ovtf_optimizer.cc)
+   list(REMOVE_ITEM SRC grappler/add_identityn.cc)
+   list(REMOVE_ITEM SRC grappler/costs/measuring_cost_estimator.cc)
+   list(REMOVE_ITEM SRC grappler/costs/robust_stats.cc)
+   list(REMOVE_ITEM SRC grappler/costs/cost_analyzer.cc)
+endif()
+
 if(OPENVINO_BUILD_VERSION)
     add_compile_definitions(OPENVINO_BUILD_VERSION="${OPENVINO_BUILD_VERSION}")
 endif()
@@ -87,8 +100,6 @@ target_compile_definitions(
 
 target_include_directories(${LIB_NAME} PUBLIC "${NGRAPH_INSTALL_DIR}/include")
 
-string(REPLACE "." ";" TF_VERSION_LIST ${TensorFlow_VERSION})
-list(GET TF_VERSION_LIST 0 TF_MAJOR_VERSION)
 add_compile_definitions(TF_VERSION=${TF_MAJOR_VERSION})
 
 #------------------------------------------------------------------------------

openvino_tensorflow/deassign_clusters.cc

@@ -399,7 +399,7 @@ Status DeassignClusters(Graph* graph) {
       pair_idx_cost.first = cluster_idx;
       pair_idx_cost.second = 0;
       for (auto n : g.nodes()) {
-        int64_t node_cost = 0;
+        tensorflow::int64 node_cost = 0;
         if (GetNodeAttr(n->attrs(), "cost", &node_cost) != Status::OK())
           continue;
         pair_idx_cost.second += node_cost;

openvino_tensorflow/encapsulate_clusters.cc

@@ -348,7 +348,7 @@ Status Encapsulator::AnalysisPass() {
     }
     // This snippet is required only for Grappler pass
     if (!api::IsRewritePassEnabled()) {
-      int64_t node_cost = 0;
+      tensorflow::int64 node_cost = 0;
       if (GetNodeAttr(node->attrs(), "cost", &node_cost) != Status::OK())
         continue;
       cluster_cost_map_in_ms[cluster_idx] += node_cost;
@@ -470,7 +470,7 @@ Status Encapsulator::RewritePass(
             .Attr("Targuments", input_types)
             .Attr("Tresults", cluster_output_dt_map[cluster_idx])
             .Attr("ngraph_graph_id", graph_id)
-            .Attr("cluster_cost", cluster_cost_map_in_ms[cluster_idx])
+            .Attr("cluster_cost", (int)cluster_cost_map_in_ms[cluster_idx])
             .Device(device_name_map[cluster_idx])
             .Input(inputs);
     if (!device_config.empty()) {

openvino_tensorflow/kernels/encapsulate_op.cc

@@ -72,7 +72,7 @@ class NGraphEncapsulateOp : public OpKernel {
   std::shared_ptr<tensorflow::Session> m_session;
   std::vector<std::string> m_session_input_names;
   std::vector<std::string> m_session_output_names;
-  int64_t m_cluster_cost_in_ms;
+  tensorflow::int64 m_cluster_cost_in_ms;
   static std::map<size_t, bool> s_tf_timing_run_enabled_map;
   static std::map<size_t, float> s_ovtf_cluster_timings_map;
   int64_t m_iter;
@@ -135,8 +135,8 @@ NGraphEncapsulateOp::NGraphEncapsulateOp(OpKernelConstruction* ctx)
   }
 
   if (!api::IsRewritePassEnabled()) {
-    OP_REQUIRES_OK(
-        ctx, ctx->GetAttr<int64_t>("cluster_cost", &m_cluster_cost_in_ms));
+    OP_REQUIRES_OK(ctx, ctx->GetAttr<tensorflow::int64>("cluster_cost",
+                                                        &m_cluster_cost_in_ms));
   }
 
   //
@@ -211,9 +211,9 @@ void NGraphEncapsulateOp::Compute(OpKernelContext* ctx) {
   if (api::IsRewritePassEnabled() &&
       s_tf_timing_run_enabled_map[m_cluster_id]) {
     // Measure the timing of cluster through force TF run
-    int64_t start_ns = profiler::GetCurrentTimeNanos();
+    int64_t start_ns = absl::GetCurrentTimeNanos();
     OP_REQUIRES_OK(ctx, Fallback(ctx));
-    int64_t duration_in_ms = (profiler::GetCurrentTimeNanos() - start_ns) / 1e6;
+    int64_t duration_in_ms = (absl::GetCurrentTimeNanos() - start_ns) / 1e6;
     OVTF_VLOG(1) << "Iter: " << m_iter;
     OVTF_VLOG(1) << "TF: Cluster " << m_cluster_id << " took " << duration_in_ms
                  << " ms.";
@@ -409,10 +409,9 @@ void NGraphEncapsulateOp::Compute(OpKernelContext* ctx) {
       OVTF_VLOG(4) << "NGraphEncapsulateOp::Compute call starting for cluster "
                    << m_cluster_id;
       try {
-        int64_t start_ns = profiler::GetCurrentTimeNanos();
+        int64_t start_ns = absl::GetCurrentTimeNanos();
         ng_exec->Call(ng_inputs, ng_func_outputs, multi_req_execution);
-        int64_t duration_in_ms =
-            (profiler::GetCurrentTimeNanos() - start_ns) / 1e6;
+        int64_t duration_in_ms = (absl::GetCurrentTimeNanos() - start_ns) / 1e6;
         OVTF_VLOG(1) << "Iter: " << m_iter;
         OVTF_VLOG(1) << "OVTF: Cluster " << m_cluster_id << " took "
                      << duration_in_ms << " ms.";

python/openvino_tensorflow/__init__.in.py

@@ -71,6 +71,8 @@
 TF_GIT_VERSION = tf.version.GIT_VERSION
 TF_VERSION_NEEDED = "${TensorFlow_VERSION}"
 TF_GIT_VERSION_BUILT_WITH = "${TensorFlow_GIT_VERSION}"
+TF_MAJOR_VERSION = int(TF_VERSION.split(".")[0])
+TF_MINOR_VERSION = int(TF_VERSION.split(".")[1])
 
 rewriter_config = rewriter_config_pb2.RewriterConfig()
 rewriter_config.meta_optimizer_iterations = (rewriter_config_pb2.RewriterConfig.ONE)
@@ -263,6 +265,9 @@ def optimize_graph_with_openvino_tf1(frozen_model_file,
           The optimized GraphDef
         """
 
+        if not ((TF_MAJOR_VERSION >= 2) and (TF_MINOR_VERSION >= 8)):
+            raise AssertionError("Only TF Versions >= 2.8.x are supported for the optimize_graph APIs")
+
         if not os.path.exists(frozen_model_file):
             raise AssertionError("Could not find frozen model path")
 
@@ -346,6 +351,9 @@ def optimize_graph_with_openvino_tf2(saved_model_dir,
         """
 
         #[TODO] Add support for taking direct tf.Graph or tf.function inputs
+
+        if not ((TF_MAJOR_VERSION >= 2) and (TF_MINOR_VERSION >= 8)):
+            raise AssertionError("Only TF Versions >= 2.8.x are supported for the optimize_graph APIs")
 
         if not os.path.exists(saved_model_dir):
           raise AssertionError("Could not find saved model path")