Fix #1272: tensorflow-model-optimization fails to import in official ...#1276
Open
JiwaniZakir wants to merge 1 commit intotensorflow:masterfrom
Open
Conversation
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
|
Thanks for your pull request! It looks like this may be your first contribution to a Google open source project. Before we can look at your pull request, you'll need to sign a Contributor License Agreement (CLA). View this failed invocation of the CLA check for more information. For the most up to date status, view the checks section at the bottom of the pull request. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Closes #1272
Motivation
In the official
tensorflow/tensorflow:2.15.0Docker image,TF_USE_LEGACY_KERAS=1is preset, which causestf.keras.version()to return a Keras 3.x string.compat._get_keras_instance()then attemptsimport tf_keras, which is not present in that image, raising anImportErrorthat propagates and makes the entiretensorflow_model_optimizationpackage unimportable.Changes
tensorflow_model_optimization/python/core/keras/compat.pyIn
_get_keras_instance(), the unconditionalimport tf_keras as keras_internal(previously line 35) is now wrapped in atry/except ImportError. Whentf_kerasis not installed, the function falls back tokeras_internal = tf.keras— the Keras 2 instance bundled with TensorFlow — rather than raising. Theelsebranch for non-Keras-3 environments is unchanged.tensorflow_model_optimization/python/core/keras/metrics_test.pyAdds
CompatGetKerasInstanceTest.test_fallback_to_tf_keras_when_tf_keras_not_installed, which:tf_kerasfromsys.modulesto simulate it being absent.tf.keras.versionto return'3.0.0'(triggering theifbranch).sys.modules['tf_keras'] = Noneto force theImportErroron import.compat._get_keras_instance()returnstf.kerasrather than raising.Testing
The new unit test covers the fallback path directly and can be run with:
Manual verification in
tensorflow/tensorflow:2.15.0:With the fix applied this completes without error; before the fix it exits with
ImportError: Keras cannot be imported. Check that it is installed.This PR was created with AI assistance (Claude). The changes were reviewed by quality gates and a critic model before submission.