aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNikhil Raj <nikhil.raj@arm.com>2023-04-20 15:19:05 +0100
committerNikhil Raj Arm <nikhil.raj@arm.com>2023-04-27 11:21:03 +0000
commit0d2945394d6c3a08b906eeef4a16735dbf96c9c0 (patch)
treead64144183e492365882dd96607dc95c6c55527c
parentb2831c5d179c5853c884280107d2420904441a2c (diff)
downloadarmnn-0d2945394d6c3a08b906eeef4a16735dbf96c9c0.tar.gz
IVGCVSW-7687 Update TF SHA in build-tool
* Updating TF to the 2.12 SHA Arm NN will be using * Turn Off JNI build Signed-off-by: Nikhil Raj <nikhil.raj@arm.com> Change-Id: Ib75e16687ac3a2dd4a77ed68f97bf14fdd86eec0
-rwxr-xr-xbuild-tool/scripts/build-armnn.sh2
-rwxr-xr-xbuild-tool/scripts/common.sh2
2 files changed, 3 insertions, 1 deletions
diff --git a/build-tool/scripts/build-armnn.sh b/build-tool/scripts/build-armnn.sh
index 7e15517a94..61cd36967a 100755
--- a/build-tool/scripts/build-armnn.sh
+++ b/build-tool/scripts/build-armnn.sh
@@ -98,6 +98,7 @@ build_armnn()
cmake -DCMAKE_BUILD_TYPE="$build_type" \
-DBUILD_CLASSIC_DELEGATE="$flag_tflite_delegate" \
-DBUILD_TF_LITE_PARSER="$flag_tflite_parser" \
+ -DBUILD_DELEGATE_JNI_INTERFACE="$flag_jni" \
-DBUILD_ONNX_PARSER="$flag_onnx_parser" \
-DARMCOMPUTENEON="$flag_neon_backend" \
-DARMCOMPUTECL="$flag_cl_backend" \
@@ -256,6 +257,7 @@ flag_cl_backend=0
flag_ref_backend=0
flag_clean=0
flag_debug=0
+flag_jni=0
# Empty strings for optional additional args by default
armnn_cmake_args=""
diff --git a/build-tool/scripts/common.sh b/build-tool/scripts/common.sh
index f0e02df9c9..6c1ce8a16b 100755
--- a/build-tool/scripts/common.sh
+++ b/build-tool/scripts/common.sh
@@ -46,7 +46,7 @@ FLATBUFFERS_BUILD_TARGET="$FLATBUFFERS_BUILD_ROOT"/"$TARGET_ARCH"_build
FLATBUFFERS_BUILD_HOST="$FLATBUFFERS_BUILD_ROOT"/"$HOST_ARCH"_build # Location of flatc compiler
# Tensorflow
-TENSORFLOW_VERSION="tags/v2.10.0"
+TENSORFLOW_VERSION="6f692f73cb2043b4a0b0446539cd8c15b3dd9220" #2.12 RC1 + PR #60015 to fix Cmake build.
TENSORFLOW_SRC="$SOURCE_DIR"/tensorflow
TFLITE_SRC="$TENSORFLOW_SRC"/tensorflow/lite
SCHEMA_SRC="$TFLITE_SRC"/schema/schema.fbs