From 900a453a4ff22b88d171a0dbf804808c7c2efda6 Mon Sep 17 00:00:00 2001 From: Leonardo Lontra Date: Sun, 2 Aug 2020 20:21:09 -0300 Subject: [PATCH] uses armeabi cpu for aarch64. --- build_tensorflow/configs/beagle_black.conf | 2 +- build_tensorflow/configs/nitrogen6x.conf | 2 +- build_tensorflow/configs/odroidc1.conf | 2 +- build_tensorflow/configs/odroidxu4.conf | 2 +- build_tensorflow/configs/rpi.conf | 2 +- build_tensorflow/configs/rpi_one.conf | 2 +- .../configs/rpi_one_openblas.conf | 2 +- .../v2.3.0/0001-fix-cpuinfo-aarch64.patch | 26 +++++++++++++++++++ 8 files changed, 33 insertions(+), 7 deletions(-) create mode 100644 build_tensorflow/patch/tensorflow/v2.3.0/0001-fix-cpuinfo-aarch64.patch diff --git a/build_tensorflow/configs/beagle_black.conf b/build_tensorflow/configs/beagle_black.conf index 02766ad..0e2beb2 100644 --- a/build_tensorflow/configs/beagle_black.conf +++ b/build_tensorflow/configs/beagle_black.conf @@ -1,4 +1,4 @@ -TF_PATCH="yes" +TF_PATCH="no" TF_VERSION="v2.3.0" # export tensorflow variables to configure diff --git a/build_tensorflow/configs/nitrogen6x.conf b/build_tensorflow/configs/nitrogen6x.conf index ee17fef..b68f0e9 100644 --- a/build_tensorflow/configs/nitrogen6x.conf +++ b/build_tensorflow/configs/nitrogen6x.conf @@ -1,4 +1,4 @@ -TF_PATCH="yes" +TF_PATCH="no" TF_VERSION="v2.3.0" # export tensorflow variables to configure diff --git a/build_tensorflow/configs/odroidc1.conf b/build_tensorflow/configs/odroidc1.conf index cff4819..4f2b4d3 100644 --- a/build_tensorflow/configs/odroidc1.conf +++ b/build_tensorflow/configs/odroidc1.conf @@ -1,4 +1,4 @@ -TF_PATCH="yes" +TF_PATCH="no" TF_VERSION="v2.3.0" # export tensorflow variables to configure diff --git a/build_tensorflow/configs/odroidxu4.conf b/build_tensorflow/configs/odroidxu4.conf index 6b4a04e..cba4609 100644 --- a/build_tensorflow/configs/odroidxu4.conf +++ b/build_tensorflow/configs/odroidxu4.conf @@ -1,4 +1,4 @@ -TF_PATCH="yes" +TF_PATCH="no" TF_VERSION="v2.3.0" # export tensorflow variables to configure diff --git a/build_tensorflow/configs/rpi.conf b/build_tensorflow/configs/rpi.conf index f3ff5fa..b4551a8 100644 --- a/build_tensorflow/configs/rpi.conf +++ b/build_tensorflow/configs/rpi.conf @@ -1,4 +1,4 @@ -TF_PATCH="yes" +TF_PATCH="no" TF_VERSION="v2.3.0" # export tensorflow variables to configure diff --git a/build_tensorflow/configs/rpi_one.conf b/build_tensorflow/configs/rpi_one.conf index 6132800..146ade6 100644 --- a/build_tensorflow/configs/rpi_one.conf +++ b/build_tensorflow/configs/rpi_one.conf @@ -1,4 +1,4 @@ -TF_PATCH="yes" +TF_PATCH="no" TF_VERSION="v2.3.0" # export tensorflow variables to configure diff --git a/build_tensorflow/configs/rpi_one_openblas.conf b/build_tensorflow/configs/rpi_one_openblas.conf index b4b4b1e..a4999b9 100644 --- a/build_tensorflow/configs/rpi_one_openblas.conf +++ b/build_tensorflow/configs/rpi_one_openblas.conf @@ -1,7 +1,7 @@ # using openblas for pi-{one,zero} OPENBLAS_PATH="/tmp/openblas_install" -TF_PATCH="yes" +TF_PATCH="no" TF_VERSION="v2.3.0" # export tensorflow variables to configure diff --git a/build_tensorflow/patch/tensorflow/v2.3.0/0001-fix-cpuinfo-aarch64.patch b/build_tensorflow/patch/tensorflow/v2.3.0/0001-fix-cpuinfo-aarch64.patch new file mode 100644 index 0000000..5edc6d1 --- /dev/null +++ b/build_tensorflow/patch/tensorflow/v2.3.0/0001-fix-cpuinfo-aarch64.patch @@ -0,0 +1,26 @@ +From d46ddcae126dcb146bcfb7d575879d895ea3d50a Mon Sep 17 00:00:00 2001 +From: Leonardo Lontra +Date: Sun, 2 Aug 2020 20:19:07 -0300 +Subject: [PATCH] fix cpuinfo aarch64 + +--- + third_party/cpuinfo/BUILD.bazel | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/third_party/cpuinfo/BUILD.bazel b/third_party/cpuinfo/BUILD.bazel +index 15cfcd1c4e..2dd9c6b5da 100644 +--- a/third_party/cpuinfo/BUILD.bazel ++++ b/third_party/cpuinfo/BUILD.bazel +@@ -100,8 +100,7 @@ cc_library( + ":linux_arm": COMMON_SRCS + ARM_SRCS + LINUX_SRCS + LINUX_ARM32_SRCS, + ":linux_armhf": COMMON_SRCS + ARM_SRCS + LINUX_SRCS + LINUX_ARM32_SRCS, + ":linux_armv7a": COMMON_SRCS + ARM_SRCS + LINUX_SRCS + LINUX_ARM32_SRCS, +- ":linux_armeabi": COMMON_SRCS + ARM_SRCS + LINUX_SRCS + LINUX_ARM32_SRCS, +- ":linux_aarch64": COMMON_SRCS + ARM_SRCS + LINUX_SRCS + LINUX_ARM64_SRCS, ++ ":linux_armeabi": COMMON_SRCS + ARM_SRCS + LINUX_SRCS + LINUX_ARM64_SRCS, + ":macos_x86_64": COMMON_SRCS + X86_SRCS + MACH_SRCS + MACH_X86_SRCS, + ":windows_x86_64": COMMON_SRCS + X86_SRCS + WINDOWS_X86_SRCS, + ":android_armv7": COMMON_SRCS + ARM_SRCS + LINUX_SRCS + LINUX_ARM32_SRCS + ANDROID_ARM_SRCS, +-- +2.20.1 +