[PATCH meta-tensorflow 3/3] fully remove unneeded python3 work-around for tflite
Quentin Schulz <[email protected]>
| Newsgroups | org.yoctoproject.lists.yocto-patches |
|---|---|
| Message-ID | <[email protected]> |
From: Quentin Schulz <[email protected]> tflite used to be only compatible with Python 3.13 but we already had Python 3.14 in OE-Core. To work-around that until tflite caught up with the newest version of Python, meta-tensorflow had the option to use Python 3.13 via a tensorflow DISTRO_FEATURES and changing PYTHON_BASEVERSION. In any case, since tflite has been updated an now supports Python 3.14, the Python 3.13 recipe was removed. However, the remaining of the work-around wasn't removed, still requiring tensorflow to be in DISTRO_FEATURES. Remove tensorflow DISTRO_FEATURES check and Python version as we know it's going to be using 3.14 now. Signed-off-by: Quentin Schulz <[email protected]> --- BUILD.md | 3 --- classes/tensorflow_ver.bbclass | 20 -------------------- 2 files changed, 23 deletions(-) diff --git a/BUILD.md b/BUILD.md index 5a94800..7941b91 100644 --- a/BUILD.md +++ b/BUILD.md @@ -16,9 +16,6 @@ $ . <ts-project>/oe-core/oe-init-build-env <build> # Build qemux86-64 which runqemu supports kvm. $ echo 'MACHINE = "qemux86-64"' >> conf/local.conf -$ echo 'DISTRO_FEATURES:append = " tensorflow"' >> conf/local.conf -$ echo 'DISTRO_FEATURES_NATIVE:append = " tensorflow"' >> conf/local.conf -$ echo 'DISTRO_FEATURES_NATIVESDK:append = " tensorflow"' >> conf/local.conf $ echo 'IMAGE_INSTALL:append = " tensorflow"' >> conf/local.conf diff --git a/classes/tensorflow_ver.bbclass b/classes/tensorflow_ver.bbclass index 902fc87..c20602a 100644 --- a/classes/tensorflow_ver.bbclass +++ b/classes/tensorflow_ver.bbclass @@ -3,23 +3,3 @@ TF_ARGS_EXTRA ??= "--config=v2" # Uncomment the following line to build tensorflow 1.x #TF_ARGS_EXTRA = "--config=v1" - -python __anonymous() { - if not bb.utils.contains("DISTRO_FEATURES", "tensorflow", True, False, d): - msg = "\nThe official TensorFlow is tested and supported under Python 3.14\n" - msg += "Please add the following to local.conf\n" - msg += " DISTRO_FEATURES:append = ' tensorflow'\n" - msg += " DISTRO_FEATURES_NATIVE:append = ' tensorflow'\n" - msg += " DISTRO_FEATURES_NATIVESDK:append = ' tensorflow'\n" - raise bb.parse.SkipPackage(msg) - - if d.getVar("PYTHON_BASEVERSION") != "3.14": - msg = "\nThe official TensorFlow is tested and supported under Python 3.14\n" - msg += "Please add the following to local.conf\n" - msg += " PYTHON_BASEVERSION:class-target = '3.14'\n" - msg += " PYTHON_BASEVERSION:class-native = '3.14'\n" - msg += " PYTHON_BASEVERSION:class-nativesdk = '3.14'\n" - msg += "It will apply python3 modules for 3.13" - raise bb.parse.SkipPackage(msg) -} - -- 2.53.0