Skip to content

Commit 4a8bb6b

Browse files
rkuesterrkuester
authored
fix(ci): properly pass variables to Make (#2993)
Fix the broken CI scripts, new in 23d626d, by passing variable values to Make as command line options rather than through the environment. Variables set in the environment are overridden by assignments in the Makefile, whereas variables set as command line options override assignments in the Makefile. BUG=fixes #2989 and fixes #2990
1 parent 23d626d commit 4a8bb6b

File tree

3 files changed

+133
-33
lines changed

3 files changed

+133
-33
lines changed

‎tensorflow/lite/micro/tools/ci_build/test_x86_default_with_compression.sh‎

Lines changed: 35 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,40 @@
2323
set -e
2424
set -x
2525

26-
export TENSORFLOW_ROOT=${1}
27-
export EXTERNAL_DIR=${2}
28-
export USE_TFLM_COMPRESSION=yes
29-
export GENERIC_BENCHMARK_MODEL_PATH=${TENSORFLOW_ROOT}tensorflow/lite/micro/models/person_detect.tflite
26+
TENSORFLOW_ROOT=${1}
27+
EXTERNAL_DIR=${2}
3028
MAKEFILE=${TENSORFLOW_ROOT}tensorflow/lite/micro/tools/make/Makefile
3129

32-
make -f ${MAKEFILE} third_party_downloads # TODO(b/143715361): first to allow parallel builds.
33-
make -f ${MAKEFILE} -j$(nproc) build
34-
make -f ${MAKEFILE} -j$(nproc) test
35-
make -f ${MAKEFILE} -j$(nproc) integration_tests
36-
make -f ${MAKEFILE} -j$(nproc) run_tflm_benchmark
30+
make -f ${MAKEFILE} \
31+
TENSORFLOW_ROOT=${TENSORFLOW_ROOT} \
32+
EXTERNAL_DIR=${EXTERNAL_DIR} \
33+
third_party_downloads # TODO(b/143715361): download first to allow parallel builds.
34+
35+
make -f ${MAKEFILE} \
36+
-j$(nproc) \
37+
TENSORFLOW_ROOT=${TENSORFLOW_ROOT} \
38+
EXTERNAL_DIR=${EXTERNAL_DIR} \
39+
USE_TFLM_COMPRESSION=yes \
40+
build
41+
42+
make -f ${MAKEFILE} \
43+
-j$(nproc) \
44+
TENSORFLOW_ROOT=${TENSORFLOW_ROOT} \
45+
EXTERNAL_DIR=${EXTERNAL_DIR} \
46+
USE_TFLM_COMPRESSION=yes \
47+
test
48+
49+
make -f ${MAKEFILE} \
50+
-j$(nproc) \
51+
TENSORFLOW_ROOT=${TENSORFLOW_ROOT} \
52+
EXTERNAL_DIR=${EXTERNAL_DIR} \
53+
USE_TFLM_COMPRESSION=yes \
54+
integration_tests
55+
56+
make -f ${MAKEFILE} \
57+
-j$(nproc) \
58+
TENSORFLOW_ROOT=${TENSORFLOW_ROOT} \
59+
EXTERNAL_DIR=${EXTERNAL_DIR} \
60+
GENERIC_BENCHMARK_MODEL_PATH=${TENSORFLOW_ROOT}tensorflow/lite/micro/models/person_detect.tflite \
61+
USE_TFLM_COMPRESSION=yes \
62+
run_tflm_benchmark

‎tensorflow/lite/micro/tools/ci_build/test_xtensa_hifi3z_with_compression.sh‎

Lines changed: 49 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -24,17 +24,54 @@ set -e
2424
set -x
2525
pwd
2626

27-
export TENSORFLOW_ROOT=${2}
28-
export EXTERNAL_DIR=${3}
29-
export TARGET=xtensa
30-
export TARGET_ARCH=hifi3
31-
export OPTIMIZED_KERNEL_DIR=xtensa
32-
export XTENSA_CORE=HIFI_190304_swupgrade
33-
export GENERIC_BENCHMARK_MODEL_PATH=${TENSORFLOW_ROOT}tensorflow/lite/micro/models/person_detect.tflite
34-
export USE_TFLM_COMPRESSION=yes
27+
TENSORFLOW_ROOT=${2}
28+
EXTERNAL_DIR=${3}
3529
MAKEFILE=${TENSORFLOW_ROOT}tensorflow/lite/micro/tools/make/Makefile
3630

37-
make -f ${MAKEFILE} third_party_downloads # TODO(b/143904317): first to allow parallel builds
38-
make -f ${MAKEFILE} -j$(nproc) build
39-
make -f ${MAKEFILE} -j$(nproc) test
40-
make -f ${MAKEFILE} -j$(nproc) run_tflm_benchmark
31+
TARGET=xtensa
32+
TARGET_ARCH=hifi3
33+
OPTIMIZED_KERNEL_DIR=xtensa
34+
XTENSA_CORE=HIFI_190304_swupgrade
35+
36+
make -f ${MAKEFILE} \
37+
TENSORFLOW_ROOT=${TENSORFLOW_ROOT} \
38+
EXTERNAL_DIR=${EXTERNAL_DIR} \
39+
TARGET=${TARGET} \
40+
TARGET_ARCH=${TARGET_ARCH} \
41+
OPTIMIZED_KERNEL_DIR=${OPTIMIZED_KERNEL_DIR} \
42+
XTENSA_CORE=${XTENSA_CORE} \
43+
third_party_downloads # TODO(b/143904317): first to allow parallel builds
44+
45+
make -f ${MAKEFILE} \
46+
-j$(nproc) \
47+
TENSORFLOW_ROOT=${TENSORFLOW_ROOT} \
48+
EXTERNAL_DIR=${EXTERNAL_DIR} \
49+
TARGET=${TARGET} \
50+
TARGET_ARCH=${TARGET_ARCH} \
51+
OPTIMIZED_KERNEL_DIR=${OPTIMIZED_KERNEL_DIR} \
52+
XTENSA_CORE=${XTENSA_CORE} \
53+
USE_TFLM_COMPRESSION=yes \
54+
build
55+
56+
make -f ${MAKEFILE} \
57+
-j$(nproc) \
58+
TENSORFLOW_ROOT=${TENSORFLOW_ROOT} \
59+
EXTERNAL_DIR=${EXTERNAL_DIR} \
60+
TARGET=${TARGET} \
61+
TARGET_ARCH=${TARGET_ARCH} \
62+
OPTIMIZED_KERNEL_DIR=${OPTIMIZED_KERNEL_DIR} \
63+
XTENSA_CORE=${XTENSA_CORE} \
64+
USE_TFLM_COMPRESSION=yes \
65+
test
66+
67+
make -f ${MAKEFILE} \
68+
-j$(nproc) \
69+
TENSORFLOW_ROOT=${TENSORFLOW_ROOT} \
70+
EXTERNAL_DIR=${EXTERNAL_DIR} \
71+
TARGET=${TARGET} \
72+
TARGET_ARCH=${TARGET_ARCH} \
73+
OPTIMIZED_KERNEL_DIR=${OPTIMIZED_KERNEL_DIR} \
74+
XTENSA_CORE=${XTENSA_CORE} \
75+
GENERIC_BENCHMARK_MODEL_PATH=${TENSORFLOW_ROOT}tensorflow/lite/micro/models/person_detect.tflite \
76+
USE_TFLM_COMPRESSION=yes \
77+
run_tflm_benchmark

‎tensorflow/lite/micro/tools/ci_build/test_xtensa_hifi5_with_compression.sh‎

Lines changed: 49 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -24,17 +24,54 @@ set -e
2424
set -x
2525
pwd
2626

27-
export TENSORFLOW_ROOT=${2}
28-
export EXTERNAL_DIR=${3}
29-
export TARGET=xtensa
30-
export TARGET_ARCH=hifi5
31-
export OPTIMIZED_KERNEL_DIR=xtensa
32-
export XTENSA_CORE=PRD_H5_RDO_07_01_2022
33-
export GENERIC_BENCHMARK_MODEL_PATH=${TENSORFLOW_ROOT}tensorflow/lite/micro/models/person_detect.tflite
34-
export USE_TFLM_COMPRESSION=yes
27+
TENSORFLOW_ROOT=${1}
28+
EXTERNAL_DIR=${2}
3529
MAKEFILE=${TENSORFLOW_ROOT}tensorflow/lite/micro/tools/make/Makefile
3630

37-
make -f ${MAKEFILE} third_party_downloads # TODO(b/143904317): first to allow parallel builds
38-
make -f ${MAKEFILE} -j$(nproc) build
39-
make -f ${MAKEFILE} -j$(nproc) test
40-
make -f ${MAKEFILE} -j$(nproc) run_tflm_benchmark
31+
TARGET=xtensa
32+
TARGET_ARCH=hifi5
33+
OPTIMIZED_KERNEL_DIR=xtensa
34+
XTENSA_CORE=PRD_H5_RDO_07_01_2022
35+
36+
make -f ${MAKEFILE} \
37+
TENSORFLOW_ROOT=${TENSORFLOW_ROOT} \
38+
EXTERNAL_DIR=${EXTERNAL_DIR} \
39+
TARGET=${TARGET} \
40+
TARGET_ARCH=${TARGET_ARCH} \
41+
OPTIMIZED_KERNEL_DIR=${OPTIMIZED_KERNEL_DIR} \
42+
XTENSA_CORE=${XTENSA_CORE} \
43+
third_party_downloads # TODO(b/143904317): first to allow parallel builds
44+
45+
make -f ${MAKEFILE} \
46+
-j$(nproc) \
47+
TENSORFLOW_ROOT=${TENSORFLOW_ROOT} \
48+
EXTERNAL_DIR=${EXTERNAL_DIR} \
49+
TARGET=${TARGET} \
50+
TARGET_ARCH=${TARGET_ARCH} \
51+
OPTIMIZED_KERNEL_DIR=${OPTIMIZED_KERNEL_DIR} \
52+
XTENSA_CORE=${XTENSA_CORE} \
53+
USE_TFLM_COMPRESSION=yes \
54+
build
55+
56+
make -f ${MAKEFILE} \
57+
-j$(nproc) \
58+
TENSORFLOW_ROOT=${TENSORFLOW_ROOT} \
59+
EXTERNAL_DIR=${EXTERNAL_DIR} \
60+
TARGET=${TARGET} \
61+
TARGET_ARCH=${TARGET_ARCH} \
62+
OPTIMIZED_KERNEL_DIR=${OPTIMIZED_KERNEL_DIR} \
63+
XTENSA_CORE=${XTENSA_CORE} \
64+
USE_TFLM_COMPRESSION=yes \
65+
test
66+
67+
make -f ${MAKEFILE} \
68+
-j$(nproc) \
69+
TENSORFLOW_ROOT=${TENSORFLOW_ROOT} \
70+
EXTERNAL_DIR=${EXTERNAL_DIR} \
71+
TARGET=${TARGET} \
72+
TARGET_ARCH=${TARGET_ARCH} \
73+
OPTIMIZED_KERNEL_DIR=${OPTIMIZED_KERNEL_DIR} \
74+
XTENSA_CORE=${XTENSA_CORE} \
75+
GENERIC_BENCHMARK_MODEL_PATH=${TENSORFLOW_ROOT}tensorflow/lite/micro/models/person_detect.tflite \
76+
USE_TFLM_COMPRESSION=yes \
77+
run_tflm_benchmark

0 commit comments

Comments
 (0)