Date
1 - 7 of 7
[meta-tensorflow][PATCH 8/25] tensorflow-estimator: 1.13 -> 2.4
|
hongxu
Signed-off-by: Hongxu Jia <hongxu.jia@...>
--- .../0001-customize-for-yocto.patch | 28 +++++++++++++++++++ .../tensorflow/tensorflow-estimator_1.13.bb | 12 ++++++-- 2 files changed, 37 insertions(+), 3 deletions(-) create mode 100644 recipes-framework/tensorflow/tensorflow-estimator/0001-customize-for-yocto.patch diff --git a/recipes-framework/tensorflow/tensorflow-estimator/0001-customize-for-yocto.patch b/recipes-framework/tensorflow/tensorflow-estimator/0001-customize-for-yocto.patch new file mode 100644 index 0000000..e9b66d5 --- /dev/null +++ b/recipes-framework/tensorflow/tensorflow-estimator/0001-customize-for-yocto.patch @@ -0,0 +1,28 @@ +From a1bcf09a43fc44ad5e04c441ee45cc23d16cf7d2 Mon Sep 17 00:00:00 2001 +From: Hongxu Jia <hongxu.jia@...> +Date: Wed, 9 Dec 2020 17:59:01 +0800 +Subject: [PATCH] customize for yocto + +Upstream-Status: Inappropriate [oe specific] + +Signed-off-by: Hongxu Jia <hongxu.jia@...> +--- + tensorflow_estimator/tools/pip_package/build_pip_package.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tensorflow_estimator/tools/pip_package/build_pip_package.sh b/tensorflow_estimator/tools/pip_package/build_pip_package.sh +index d4953a6..e08cd8a 100755 +--- a/tensorflow_estimator/tools/pip_package/build_pip_package.sh ++++ b/tensorflow_estimator/tools/pip_package/build_pip_package.sh +@@ -38,7 +38,7 @@ function prepare_src() { + + # Verifies all expected files are in pip. + # Creates init files in all directory in pip. +- python tensorflow_estimator/tools/pip_package/create_pip_helper.py --pip-root "${TMPDIR}/tensorflow_estimator/" --bazel-root "./tensorflow_estimator" ++ nativepython3 tensorflow_estimator/tools/pip_package/create_pip_helper.py --pip-root "${TMPDIR}/tensorflow_estimator/" --bazel-root "./tensorflow_estimator" + } + + function build_wheel() { +-- +2.18.2 + diff --git a/recipes-framework/tensorflow/tensorflow-estimator_1.13.bb b/recipes-framework/tensorflow/tensorflow-estimator_1.13.bb index f3a5098..5b2fe5d 100644 --- a/recipes-framework/tensorflow/tensorflow-estimator_1.13.bb +++ b/recipes-framework/tensorflow/tensorflow-estimator_1.13.bb @@ -3,9 +3,10 @@ learning programming." LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=01e86893010a1b87e69a213faa753ebd" -SRC_URI = "git://github.com/tensorflow/estimator.git;branch=r1.13 \ +SRC_URI = "git://github.com/tensorflow/estimator.git;branch=r2.4 \ + file://0001-customize-for-yocto.patch \ " -SRCREV = "340703eed78ba4854862f749ed94f91598826e79" +SRCREV = "c3e7f2b5bbcc35185ef71797955a28cadce28f60" S = "${WORKDIR}/git" inherit python3native bazel @@ -19,12 +20,18 @@ DEPENDS += " \ python3-astor-native \ python3-gast-native \ python3-termcolor-native \ + python3-wrapt-native \ + python3-opt-einsum-native \ + python3-astunparse-native \ + flatbuffers-native \ tensorflow-native \ " do_compile () { unset CC export TMPDIR="${WORKDIR}" + export PYTHON_BIN_PATH="${PYTHON}" + ${BAZEL} build \ --subcommands --explain=${T}/explain.log \ --verbose_explanations --verbose_failures \ @@ -32,7 +39,6 @@ do_compile () { --python_path="${PYTHON}" \ //tensorflow_estimator/tools/pip_package:build_pip_package - PYTHON_BIN_PATH="${PYTHON}" \ ${S}/bazel-bin/tensorflow_estimator/tools/pip_package/build_pip_package \ ${WORKDIR}/estimator_pip } -- 2.21.0 |
|
|
|
Marek Belisko
Hi Hongxu,
On Wed, Dec 16, 2020 at 2:09 PM Hongxu Jia <hongxu.jia@...> wrote: I'm getting issue when building tensorflow-estimator (I add small changes to be able to build this patches on top of dunfell) and I'm getting: | /bin/bash -c 'source external/bazel_tools/tools/genrule/genrule-setup.sh; bazel-out/k8-opt-exec-2B5CBBC6/bin/tensorflow_estimator/python/estimator/api/create_tensorflow_estimator.python.estimator_api_1_estimator_python_api_gen_compat_v1 --apidir=bazel-out/k8-fastbuild/bin/tensorflow_estimator/python/estimator/api_v1/ --apiname=estimator --apiversion=1 --package=tensorflow_estimator.python.estimator --output_package=tensorflow_estimator.python.estimator.api._v1 bazel-out/k8-fastbuild/bin/tensorflow_estimator/python/estimator/api/_v1/v1.py bazel-out/k8-fastbuild/bin/tensorflow_estimator/python/estimator/api/_v1/estimator/__init__.py bazel-out/k8-fastbuild/bin/tensorflow_estimator/python/estimator/api/_v1/estimator/experimental/__init__.py bazel-out/k8-fastbuild/bin/tensorflow_estimator/python/estimator/api/_v1/estimator/export/__init__.py bazel-out/k8-fastbuild/bin/tensorflow_estimator/python/estimator/api/_v1/estimator/inputs/__init__.py bazel-out/k8-fastbuild/bin/tensorflow_estimator/python/estimator/api/_v1/estimator/tpu/__init__.py bazel-out/k8-fastbuild/bin/tensorflow_estimator/python/estimator/api/_v1/estimator/tpu/experimental/__init__.py') | Execution platform: @local_config_platform//:host | /home/ubuntu/projects/test/build/tmp/work/aarch64-poky-linux/tensorflow-estimator/2.4-r0/recipe-sysroot-native/usr/lib/python3.8/site-packages/h5py/__init__.py:72: UserWarning: h5py is running against HDF5 1.8.21 when it was built against 1.8.19, this may cause problems | _warn(("h5py is running against HDF5 {0} when it was built against {1}, " | Traceback (most recent call last): | File "/home/ubuntu/projects/test/build/tmp/work/aarch64-poky-linux/tensorflow-estimator/2.4-r0/bazel/output_base/execroot/org_tensorflow_estimator/bazel-out/k8-opt-exec-2B5CBBC6/bin/tensorflow_estimator/python/estimator/api/create_tensorflow_estimator.python.estimator_api_1_estimator_python_api_gen_compat_v1.runfiles/org_tensorflow_estimator/tensorflow_estimator/python/estimator/api/create_python_api_wrapper.py", line 26, in <module> | from tensorflow_estimator.python.estimator import estimator_lib # pylint: disable=unused-import | File "/home/ubuntu/projects/test/build/tmp/work/aarch64-poky-linux/tensorflow-estimator/2.4-r0/bazel/output_base/execroot/org_tensorflow_estimator/bazel-out/k8-opt-exec-2B5CBBC6/bin/tensorflow_estimator/python/estimator/api/create_tensorflow_estimator.python.estimator_api_1_estimator_python_api_gen_compat_v1.runfiles/org_tensorflow_estimator/tensorflow_estimator/python/estimator/estimator_lib.py", line 22, in <module> | from tensorflow_estimator.python.estimator.canned.baseline import BaselineClassifier | File "/home/ubuntu/projects/test/build/tmp/work/aarch64-poky-linux/tensorflow-estimator/2.4-r0/bazel/output_base/execroot/org_tensorflow_estimator/bazel-out/k8-opt-exec-2B5CBBC6/bin/tensorflow_estimator/python/estimator/api/create_tensorflow_estimator.python.estimator_api_1_estimator_python_api_gen_compat_v1.runfiles/org_tensorflow_estimator/tensorflow_estimator/python/estimator/canned/baseline.py", line 53, in <module> | import tensorflow as tf | File "/home/ubuntu/projects/test/build/tmp/work/aarch64-poky-linux/tensorflow-estimator/2.4-r0/recipe-sysroot-native/usr/lib/python3.8/site-packages/tensorflow/__init__.py", line 55, in <module> | from ._api.v2 import compat | File "/home/ubuntu/projects/test/build/tmp/work/aarch64-poky-linux/tensorflow-estimator/2.4-r0/recipe-sysroot-native/usr/lib/python3.8/site-packages/tensorflow/_api/v2/compat/__init__.py", line 39, in <module> | from . import v1 | File "/home/ubuntu/projects/test/build/tmp/work/aarch64-poky-linux/tensorflow-estimator/2.4-r0/recipe-sysroot-native/usr/lib/python3.8/site-packages/tensorflow/_api/v2/compat/v1/__init__.py", line 34, in <module> | from . import compat | File "/home/ubuntu/projects/test/build/tmp/work/aarch64-poky-linux/tensorflow-estimator/2.4-r0/recipe-sysroot-native/usr/lib/python3.8/site-packages/tensorflow/_api/v2/compat/v1/compat/__init__.py", line 39, in <module> | from . import v1 | File "/home/ubuntu/projects/test/build/tmp/work/aarch64-poky-linux/tensorflow-estimator/2.4-r0/recipe-sysroot-native/usr/lib/python3.8/site-packages/tensorflow/_api/v2/compat/v1/compat/v1/__init__.py", line 51, in <module> | from tensorflow._api.v2.compat.v1 import lite | File "/home/ubuntu/projects/test/build/tmp/work/aarch64-poky-linux/tensorflow-estimator/2.4-r0/recipe-sysroot-native/usr/lib/python3.8/site-packages/tensorflow/_api/v2/compat/v1/lite/__init__.py", line 11, in <module> | from . import experimental | File "/home/ubuntu/projects/test/build/tmp/work/aarch64-poky-linux/tensorflow-estimator/2.4-r0/recipe-sysroot-native/usr/lib/python3.8/site-packages/tensorflow/_api/v2/compat/v1/lite/experimental/__init__.py", line 10, in <module> | from . import nn | File "/home/ubuntu/projects/test/build/tmp/work/aarch64-poky-linux/tensorflow-estimator/2.4-r0/recipe-sysroot-native/usr/lib/python3.8/site-packages/tensorflow/_api/v2/compat/v1/lite/experimental/nn/__init__.py", line 10, in <module> | from tensorflow.lite.python.lite import TFLiteLSTMCell | File "/home/ubuntu/projects/test/build/tmp/work/aarch64-poky-linux/tensorflow-estimator/2.4-r0/recipe-sysroot-native/usr/lib/python3.8/site-packages/tensorflow/lite/python/lite.py", line 40, in <module> | from tensorflow.lite.python.convert import build_toco_convert_protos # pylint: disable=unused-import | File "/home/ubuntu/projects/test/build/tmp/work/aarch64-poky-linux/tensorflow-estimator/2.4-r0/recipe-sysroot-native/usr/lib/python3.8/site-packages/tensorflow/lite/python/convert.py", line 33, in <module> | from tensorflow.lite.python import util | File "/home/ubuntu/projects/test/build/tmp/work/aarch64-poky-linux/tensorflow-estimator/2.4-r0/recipe-sysroot-native/usr/lib/python3.8/site-packages/tensorflow/lite/python/util.py", line 30, in <module> | import flatbuffers | ModuleNotFoundError: No module named 'flatbuffers' FLatbuffers from openembedded are available version 1.12. Do you have an idea what is can cause? tensorflow-native \Thanks and BR, marek -- as simple and primitive as possible ------------------------------------------------- Marek Belisko - OPEN-NANDRA Freelance Developer Ruska Nova Ves 219 | Presov, 08005 Slovak Republic Tel: +421 915 052 184 skype: marekwhite twitter: #opennandra web: http://open-nandra.com |
|
|
|
On 2021-01-04 5:30 a.m., Marek Belisko wrote:
Hi Hongxu,Marek, Does this happen if you use the master branch? Hongxu, Any tips for Marek? ../Randy -- # Randy MacLeod # Wind River Linux |
|
|
|
Marek Belisko
HI Randy,
On Thu, Jan 7, 2021 at 6:51 PM Randy MacLeod <randy.macleod@...> wrote: Yes this comes from master branch. BR, marek
-- as simple and primitive as possible ------------------------------------------------- Marek Belisko - OPEN-NANDRA Freelance Developer Ruska Nova Ves 219 | Presov, 08005 Slovak Republic Tel: +421 915 052 184 skype: marekwhite twitter: #opennandra web: http://open-nandra.com |
|
|
|
On 2021-01-07 1:47 p.m., Belisko Marek wrote:
Hi Marek,Marek,Yes this comes from master branch. Is it: A) Comes from master and is a problem on dunfell or B) it is reproducible on the master branch? Given that you said: I'm getting issue when building tensorflow-estimator (I add smallI suspect it's A only. Right? What are your small changes. Hongxu may take a quick look but we generally can't afford to investigate all combinations of recipe/branchs as I'm sure you can appreciate. If you can reproduce the error on master without or even with your changes then that's a different story. Good luck and Happy New Year! -- # Randy MacLeod # Wind River Linux |
|
|
|
Marek Belisko
Hi Randy,
On Thu, Jan 7, 2021 at 9:47 PM Randy MacLeod <randy.macleod@...> wrote: I have done some small changes and now have tensorflow from master working on top of dunfell. Would you be interested in sharing changes back and integrate to repo? Thanks and BR, marek |
|
|
|
On 2021-01-25 1:57 p.m., Belisko Marek wrote:
Hi Randy,Hi Marek, That's good to hear! Would you be interested in sharing changesI suspect it's not much work to merge the fixes and maintain the branch, but I'll leave it up to Hongxu. ../Randy Thanks and BR, -- # Randy MacLeod # Wind River Linux |
|
|