Enable build of execute network in build tool.
* Help with issue https://github.com/ARM-software/armnn/issues/758
Signed-off-by: Cathal Corbett <cathal.corbett@arm.com>
Change-Id: Ic9f4ff54e1e5a26b16c3d869815d09036ce5806c
diff --git a/build-tool/scripts/build-armnn.sh b/build-tool/scripts/build-armnn.sh
index d9e89a2..a73773b 100755
--- a/build-tool/scripts/build-armnn.sh
+++ b/build-tool/scripts/build-armnn.sh
@@ -113,6 +113,11 @@
build_armnn()
{
+ if [ "$flag_clean" -eq 1 ]; then
+ echo -e "\n***** Clean flag detected: removing existing Arm NN build *****"
+ rm -rf "$ARMNN_BUILD_TARGET"
+ fi
+
mkdir -p "$ARMNN_BUILD_TARGET"
cd "$ARMNN_BUILD_TARGET"
@@ -148,11 +153,6 @@
;;
esac
- if [ "$flag_clean" -eq 1 ]; then
- echo -e "\n***** Clean flag detected: removing existing Arm NN build *****"
- rm -rf "$ARMNN_BUILD_TARGET"
- fi
-
echo -e "\n***** Building Arm NN for $TARGET_ARCH *****"
local flatbuffers_root="$FLATBUFFERS_BUILD_TARGET"
@@ -186,6 +186,7 @@
-DFLATC_DIR="$FLATBUFFERS_BUILD_HOST" \
-DONNX_GENERATED_SOURCES="$ONNX_BUILD_TARGET" \
-DPROTOBUF_ROOT="$protobuf_root" \
+ -DBUILD_TESTS=1 \
"$armnn_cmake_args" \
"$ARMNN_SRC"
@@ -234,6 +235,9 @@
cp -r "$SOURCE_DIR"/armnn/delegate/opaque/include ./include/armnnDelegate/armnn/delegate/opaque/
fi
+ # move ExecuteNetwork to outer directory
+ mv tests/ExecuteNetwork .
+
echo -e "\n***** Built Arm NN for $TARGET_ARCH *****"
local tarball_path="$ROOT_DIR/armnn_$ARMNN_BUILD_DIR_NAME.tar.gz"
diff --git a/build-tool/scripts/install-packages.sh b/build-tool/scripts/install-packages.sh
index 4a461a0..dea138b 100755
--- a/build-tool/scripts/install-packages.sh
+++ b/build-tool/scripts/install-packages.sh
@@ -120,9 +120,6 @@
echo -e "\n***** $name: Installing system-wide packages required by setup-armnn.sh and build-armnn.sh *****"
echo -e "\nINFO: This script downloads and builds CMake from source in the current directory from which this script is called"
echo -e "\nINFO: CMake and other apt packages will be installed system-wide once this script has completed execution"
-echo -e "\nScript execution will begin in 10 seconds..."
-
-sleep 10
install_apt_packages
diff --git a/build-tool/scripts/setup-armnn.sh b/build-tool/scripts/setup-armnn.sh
index a445356..05d1280 100755
--- a/build-tool/scripts/setup-armnn.sh
+++ b/build-tool/scripts/setup-armnn.sh
@@ -437,7 +437,7 @@
echo " target-arch: $TARGET_ARCH"
echo " host-arch: $HOST_ARCH"
echo "tflite-classic-delegate: $flag_tflite_classic_delegate"
-echo "tflite-opaque-delegate : $flag_tflite_opaque_delegate"
+echo " tflite-opaque-delegate: $flag_tflite_opaque_delegate"
echo " tflite-parser: $flag_tflite_parser"
echo " onnx-parser: $flag_onnx_parser"
echo " num-threads: $NUM_THREADS"
@@ -449,10 +449,6 @@
echo -e "\n***** WARNING: Running script inside a git repository. To avoid nested repos, call this script from outside of this repo. *****"
fi
-echo -e "\nScript execution will begin in 10 seconds..."
-
-sleep 10
-
mkdir -p "$SOURCE_DIR"
mkdir -p "$BUILD_DIR"