Merge pull request #64 from cocoa-xu/cx-tensorflow-2.12.0

tensorflow 2.12.0

Author: cocoa-xu

CMakeLists.txt

@@ -34,7 +34,7 @@ if(UNIX AND APPLE)
     set(CMAKE_SHARED_LINKER_FLAGS "-flat_namespace -undefined suppress -undefined dynamic_lookup")
 endif()
 
-set(CMAKE_CXX_STANDARD 14)
+set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -Wno-comment")
 if(DEFINED ENV{TARGET_GCC_FLAGS})
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${TARGET_GCC_FLAGS}")

Makefile

@@ -23,7 +23,7 @@ endif
 # Tensorflow
 TFLITE_USE_GIT_HEAD ?= false
 TFLITE_GIT_REPO ?= "https://github.com/tensorflow/tensorflow.git"
-TFLITE_VER ?= 2.11.1
+TFLITE_VER ?= 2.12.0
 TFLITE_VER_V = v$(TFLITE_VER)
 ifneq ($(TFLITE_USE_GIT_HEAD), false)
 	TFLITE_VER_V=$(TFLITE_USE_GIT_BRANCH)

patches/apply_patch.py

@@ -10,7 +10,7 @@
 
 
 def patch_fix_RoundToNearest(tf_version: str, tf_src_root: str):
-    if tf_version not in ['2.11.0', '2.11.1']:
+    if tf_version not in ['2.11.0', '2.11.1', '2.12.0']:
         print(f"warning: skip applying `patch_fix_RoundToNearest` to tf version `{tf_version}`")
         return
 
@@ -38,8 +38,31 @@ def patch_fix_RoundToNearest(tf_version: str, tf_src_root: str):
             dst.truncate(0)
             dst.write(fixed.getvalue())
 
-patches = [patch_fix_RoundToNearest]
+def patch_compiling_telemetry_cc(tf_version: str, tf_src_root: str):
+    if tf_version not in ['2.12.0']:
+        print(f"warning: skip applying `patch_compiling_telemetry_cc` to tf version `{tf_version}`")
+        return
+    
+    cmakelists_txt = Path(tf_src_root) / 'CMakeLists.txt'
+    fixed = StringIO()
+    patched_1 = False
+    with open(cmakelists_txt, 'r') as source:
+        for line in source:
+            line_strip = line.strip()
+            if not patched_1 and line_strip == '${TFLITE_SOURCE_DIR}/profiling/telemetry/profiler.cc':
+                fixed.write(f"  {line_strip} # fixed\n")
+                fixed.write("  ${TFLITE_SOURCE_DIR}/profiling/telemetry/telemetry.cc\n")
+                patched_1 = True
+            else:
+                fixed.write(line)
+
+    if patched_1:
+        with open(cmakelists_txt, 'w') as dst:
+            dst.truncate(0)
+            dst.write(fixed.getvalue())
+
 
+patches = [patch_fix_RoundToNearest, patch_compiling_telemetry_cc]
 
 if __name__ == '__main__':
     tf_version = None