From 9e51cdefb1f6f99b2bf36529d382595cde1f443c Mon Sep 17 00:00:00 2001
From: Sadik Armagan <sadik.armagan@arm.com>
Date: Thu, 1 Oct 2020 17:12:17 +0100
Subject: IVGCVSW-5173 'Upgrade from v1.15 of tensorflow to v2.3'

* Updated the generate_tensorflow_protobuf script to search for .proto
  files in tensorflow directory instead of getting from a file
* Updated BuildGuideAndroidNDK.md to clone Tensorflow 2.3.1

Signed-off-by: Sadik Armagan <sadik.armagan@arm.com>
Change-Id: I8d2b0f0a04327f930784648e9e8f7f25895d53d1
---
 scripts/generate_tensorflow_protobuf.sh | 28 +++++++++-------------------
 1 file changed, 9 insertions(+), 19 deletions(-)

(limited to 'scripts')

diff --git a/scripts/generate_tensorflow_protobuf.sh b/scripts/generate_tensorflow_protobuf.sh
index df0d7bad86..36fffc0846 100755
--- a/scripts/generate_tensorflow_protobuf.sh
+++ b/scripts/generate_tensorflow_protobuf.sh
@@ -52,22 +52,12 @@ then
   exit 1
 fi
 
-
-TF_PROTO_FILES=tensorflow/contrib/makefile/tf_proto_files.txt
-if [ -r $TF_PROTO_FILES ]
-then
-  OLD_LD_LIBRARY_PATH=$LD_LIBRARY_PATH
-  for i in `cat $TF_PROTO_FILES`
-  do
-    LD_LIBRARY_PATH=$OLD_LD_LIBRARY_PATH:${PROTOBUF_INSTALL_DIR}/lib \
-    $PROTOBUF_INSTALL_DIR/bin/protoc $i \
-      --proto_path=. \
-      --proto_path=${PROTOBUF_INSTALL_DIR}/include \
-      --cpp_out $OUTPUT_DIR
-  done
-else
-  echo "Couldn't find $TF_PROTO_FILES. This script should be run from the"
-  echo "tensorflow source directory."
-  exit 1
-fi
-
+OLD_LD_LIBRARY_PATH=$LD_LIBRARY_PATH
+#hardware_types.proto and autotuning.proto not required
+find tensorflow -type f -name '*.proto' | grep -v autotuning | grep -v hardware_types | while read i; do
+  LD_LIBRARY_PATH=$OLD_LD_LIBRARY_PATH:${PROTOBUF_INSTALL_DIR}/lib $PROTOBUF_INSTALL_DIR/bin/protoc $i \
+    --proto_path=. \
+    --proto_path=${PROTOBUF_INSTALL_DIR}/include \
+    --cpp_out $OUTPUT_DIR
+  AssertZeroExitCode "Failed to make proto files"
+done
\ No newline at end of file
-- 
cgit v1.2.1