Add a condition to verify training status during image processing #20650
Conversation
This file contains 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
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## master #20650 +/- ##
=======================================
Coverage 81.88% 81.89%
=======================================
Files 543 543
Lines 50609 50633 +24
Branches 7816 7822 +6
=======================================
+ Hits 41443 41467 +24
Misses 7273 7273
Partials 1893 1893
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. |
fchollet
approved these changes
Dec 17, 2024
google-ml-butler
bot
added
kokoro:force-run
ready to pull
|
Thanks for the PR -- please take a look at the merge conflict 👍 |
# Conflicts: # keras/src/layers/preprocessing/image_preprocessing/random_hue.py
google-ml-butler
bot
removed
the
ready to pull
|
@fchollet, |
google-ml-butler
bot
added
kokoro:force-run
ready to pull
google-ml-butler
bot
removed
awaiting review
ready to pull
shashaka
added a commit
to shashaka/keras
that referenced
this pull request
Dec 20, 2024
…ras-team#20650) * Add a condition to verify training status during image processing * resolve merge conflict * fix transform_bounding_boxes logic * add transform_bounding_boxes test
fchollet
pushed a commit
that referenced
this pull request
Dec 22, 2024
* Add implementations for random_saturation * change parse_factor method to inner method. * Add implementations for random_color_jitter * Fix Randomhue (#20652) * Small fix in random hue * use self.backend for seed * test: add test for class weights (py_dataset adapter) (#20638) * test: add test for class weights (py_dataset adapter) * "call _standardize_batch from enqueuer" m * add more tests, handle pytorch astype issue m * convert to numpy to ensure consistent handling of operations * Fix paths for pytest in contribution guide (#20655) * Add preliminary support of OpenVINO as Keras 3 backend (#19727) * [POC][OV] Support OpenVINO as Keras 3 backend Signed-off-by: Kazantsev, Roman <roman.kazantsev@intel.com> * Mark all unsupported ops from numpy space Signed-off-by: Kazantsev, Roman <roman.kazantsev@intel.com> * Mark unsupported ops in core, image, and linalg spaces Signed-off-by: Kazantsev, Roman <roman.kazantsev@intel.com> * Mark unsupported ops in math, nn, random, and rnn spaces Signed-off-by: Kazantsev, Roman <roman.kazantsev@intel.com> * Fix sorting imports Signed-off-by: Kazantsev, Roman <roman.kazantsev@intel.com> * Format imports Signed-off-by: Kazantsev, Roman <roman.kazantsev@intel.com> * Fix sorting imports Signed-off-by: Kazantsev, Roman <roman.kazantsev@intel.com> * Fix sorting imports Signed-off-by: Kazantsev, Roman <roman.kazantsev@intel.com> * Fix inference Signed-off-by: Kazantsev, Roman <roman.kazantsev@intel.com> * Remove openvino specific code in common part Signed-off-by: Kazantsev, Roman <roman.kazantsev@intel.com> * Fix typo * Clean-up code Signed-off-by: Kazantsev, Roman <roman.kazantsev@intel.com> * Recover imports Signed-off-by: Kazantsev, Roman <roman.kazantsev@intel.com> * Sort imports properly Signed-off-by: Kazantsev, Roman <roman.kazantsev@intel.com> * Format source code Signed-off-by: Kazantsev, Roman <roman.kazantsev@intel.com> * Format the rest of source code Signed-off-by: Kazantsev, Roman <roman.kazantsev@intel.com> * Continue format adjustment Signed-off-by: Kazantsev, Roman <roman.kazantsev@intel.com> * Add OpenVINO dependency Signed-off-by: Kazantsev, Roman <roman.kazantsev@intel.com> * Fix inference using OV backend Signed-off-by: Kazantsev, Roman <roman.kazantsev@intel.com> * Support bert_base_en_uncased and mobilenet_v3_small from Keras Hub Signed-off-by: Kazantsev, Roman <roman.kazantsev@intel.com> * Remove extra openvino specific code from layer.py Signed-off-by: Kazantsev, Roman <roman.kazantsev@intel.com> * Apply code-style formatting Signed-off-by: Kazantsev, Roman <roman.kazantsev@intel.com> * Apply code-style formatting Signed-off-by: Kazantsev, Roman <roman.kazantsev@intel.com> * Fix remained code-style issue Signed-off-by: Kazantsev, Roman <roman.kazantsev@intel.com> * Run tests for OpenVINO backend in GHA Signed-off-by: Kazantsev, Roman <roman.kazantsev@intel.com> * Add config file for openvino backend validation Signed-off-by: Kazantsev, Roman <roman.kazantsev@intel.com> * Add import test for openvino backend Signed-off-by: Kazantsev, Roman <roman.kazantsev@intel.com> * Fix error in import_test.py Signed-off-by: Kazantsev, Roman <roman.kazantsev@intel.com> * Add import_test for openvino backend Signed-off-by: Kazantsev, Roman <roman.kazantsev@intel.com> * Add openvino specific integration tests in GHA Signed-off-by: Kazantsev, Roman <roman.kazantsev@intel.com> * Exclude coverage for OpenVINO Signed-off-by: Kazantsev, Roman <roman.kazantsev@intel.com> * remove coverage for openvino backend Signed-off-by: Kazantsev, Roman <roman.kazantsev@intel.com> * Try layer tests for openvino backend Signed-off-by: Kazantsev, Roman <roman.kazantsev@intel.com> * Run layer tests for openvino backend selectively Signed-off-by: Kazantsev, Roman <roman.kazantsev@intel.com> * Mark enabled tests for openvino backend in a different way Signed-off-by: Kazantsev, Roman <roman.kazantsev@intel.com> * Update .github/workflows/actions.yml * Fix import for BackendVariable Signed-off-by: Kazantsev, Roman <roman.kazantsev@intel.com> * Fix errors in layer tests for openvino backend Signed-off-by: Kazantsev, Roman <roman.kazantsev@intel.com> * Add test for Elu via openvino backend Signed-off-by: Kazantsev, Roman <roman.kazantsev@intel.com> * Fix sorted imports Signed-off-by: Kazantsev, Roman <roman.kazantsev@intel.com> * Extend testing for attention Signed-off-by: Kazantsev, Roman <roman.kazantsev@intel.com> * Update keras/src/layers/attention/attention_test.py * Switch on activation tests for openvino backend Signed-off-by: Kazantsev, Roman <roman.kazantsev@intel.com> * Switch on attention tests for openvino backend Signed-off-by: Kazantsev, Roman <roman.kazantsev@intel.com> * Update keras/src/layers/attention/additive_attention_test.py * Update keras/src/layers/attention/grouped_query_attention_test.py * Run conv tests for openvino backend Signed-off-by: Kazantsev, Roman <roman.kazantsev@intel.com> * Fix convolution in openvino backend Signed-off-by: Kazantsev, Roman <roman.kazantsev@intel.com> * Work around constant creation for tuple Signed-off-by: Kazantsev, Roman <roman.kazantsev@intel.com> * Work around constant creation in reshape Signed-off-by: Kazantsev, Roman <roman.kazantsev@intel.com> * Run depthwise conv tests for openvino backend Signed-off-by: Kazantsev, Roman <roman.kazantsev@intel.com> * Fix get_ov_output for other x types Signed-off-by: Kazantsev, Roman <roman.kazantsev@intel.com> * Fix elu translation Signed-off-by: Kazantsev, Roman <roman.kazantsev@intel.com> * Fix softmax and log_softmax for None axis Signed-off-by: Kazantsev, Roman <roman.kazantsev@intel.com> * Run nn tests for openvino backend Signed-off-by: Kazantsev, Roman <roman.kazantsev@intel.com> * Fix numpy operations for axis to be None Signed-off-by: Kazantsev, Roman <roman.kazantsev@intel.com> * Run operation_test for openvino_backend Signed-off-by: Kazantsev, Roman <roman.kazantsev@intel.com> * Switch on math_test for openvino backend Signed-off-by: Kazantsev, Roman <roman.kazantsev@intel.com> * Switch on image tests for openvino backend Signed-off-by: Kazantsev, Roman <roman.kazantsev@intel.com> * Switch on linalg test for openvino backend Signed-off-by: Kazantsev, Roman <roman.kazantsev@intel.com> * Extend OpenVINOKerasTensor with new built-in methods and fix shape op Signed-off-by: Kazantsev, Roman <roman.kazantsev@intel.com> * Switch on core tests for openvino backend Signed-off-by: Kazantsev, Roman <roman.kazantsev@intel.com> * Use different way of OpenVINO model creation that supports call method Signed-off-by: Kazantsev, Roman <roman.kazantsev@intel.com> * Unify integration test for openvino Signed-off-by: Kazantsev, Roman <roman.kazantsev@intel.com> * Support new operations abs, mod, etc. Signed-off-by: Kazantsev, Roman <roman.kazantsev@intel.com> * Add support for more operations like squeeze, max Signed-off-by: Kazantsev, Roman <roman.kazantsev@intel.com> * Try to use excluded test files list Signed-off-by: Kazantsev, Roman <roman.kazantsev@intel.com> * Apply formatting for normalization_test.py Signed-off-by: Kazantsev, Roman <roman.kazantsev@intel.com> * Correct GHA yml file Signed-off-by: Kazantsev, Roman <roman.kazantsev@intel.com> * Test that openvino backend is used Signed-off-by: Kazantsev, Roman <roman.kazantsev@intel.com> * Revert testing change in excluded test files list Signed-off-by: Kazantsev, Roman <roman.kazantsev@intel.com> * Include testing group Signed-off-by: Kazantsev, Roman <roman.kazantsev@intel.com> * Include legacy test group Signed-off-by: Kazantsev, Roman <roman.kazantsev@intel.com> * Exclude legacy group of tests Signed-off-by: Kazantsev, Roman <roman.kazantsev@intel.com> * Include initializers tests Signed-off-by: Kazantsev, Roman <roman.kazantsev@intel.com> * Skip tests for initializers group Signed-off-by: Kazantsev, Roman <roman.kazantsev@intel.com> * Remove export test group from ignore Signed-off-by: Kazantsev, Roman <roman.kazantsev@intel.com> * Include dtype_policies test group Signed-off-by: Kazantsev, Roman <roman.kazantsev@intel.com> * Reduce ignored tests Signed-off-by: Kazantsev, Roman <roman.kazantsev@intel.com> * Fix ops.cast Signed-off-by: Kazantsev, Roman <roman.kazantsev@intel.com> * Add decorator for custom_gradient Signed-off-by: Kazantsev, Roman <roman.kazantsev@intel.com> * Shorten line in custom_gradient Signed-off-by: Kazantsev, Roman <roman.kazantsev@intel.com> * Ignore dtype_policy_map test Signed-off-by: Kazantsev, Roman <roman.kazantsev@intel.com> * Include callback tests Signed-off-by: Kazantsev, Roman <roman.kazantsev@intel.com> * Switch on backend tests Signed-off-by: Kazantsev, Roman <roman.kazantsev@intel.com> * Exclude failing tests Signed-off-by: Kazantsev, Roman <roman.kazantsev@intel.com> * Correct paths to excluded tests Signed-off-by: Kazantsev, Roman <roman.kazantsev@intel.com> * Switch on some layers tests Signed-off-by: Kazantsev, Roman <roman.kazantsev@intel.com> * Remove pytest.mark.openvino_backend Signed-off-by: Kazantsev, Roman <roman.kazantsev@intel.com> * Register mark requires_trainable_backend Signed-off-by: Kazantsev, Roman <roman.kazantsev@intel.com> * Ignore test files in a different way Signed-off-by: Kazantsev, Roman <roman.kazantsev@intel.com> * Try different way to ignore test files Signed-off-by: Kazantsev, Roman <roman.kazantsev@intel.com> * Fix GHA yml Signed-off-by: Kazantsev, Roman <roman.kazantsev@intel.com> * Support tuple axis for logsumexp Signed-off-by: Kazantsev, Roman <roman.kazantsev@intel.com> * Switch on some ops tests Signed-off-by: Kazantsev, Roman <roman.kazantsev@intel.com> * Switch on some callbacks tests Signed-off-by: Kazantsev, Roman <roman.kazantsev@intel.com> * Add openvino export Signed-off-by: Kazantsev, Roman <roman.kazantsev@intel.com> * Update sklearn tests Signed-off-by: Kazantsev, Roman <roman.kazantsev@intel.com> * Add a comment to skipp numerical_test Signed-off-by: Kazantsev, Roman <roman.kazantsev@intel.com> * Add custom requirements file for OpenVINO Signed-off-by: Kazantsev, Roman <roman.kazantsev@intel.com> * Add reqs of openvino installation for api changes check Signed-off-by: Kazantsev, Roman <roman.kazantsev@intel.com> * Fix types of Variables and switch on some variables tests Signed-off-by: Kazantsev, Roman <roman.kazantsev@intel.com> * Fix nightly code check Signed-off-by: Kazantsev, Roman <roman.kazantsev@intel.com> --------- Signed-off-by: Kazantsev, Roman <roman.kazantsev@intel.com> * Make sklearn dependency optional (#20657) * Add a condition to verify training status during image processing (#20650) * Add a condition to verify training status during image processing * resolve merge conflict * fix transform_bounding_boxes logic * add transform_bounding_boxes test * Fix recurrent dropout for GRU. (#20656) The simplified implementation, which used the same recurrent dropout masks for all the previous states didn't work and caused the training to not converge with large enough recurrent dropout values. This new implementation is now the same as Keras 2. Note that recurrent dropout requires "implementation 1" to be turned on. Fixes #20276 * Fix example title in probabilistic_metrics.py (#20662) * Change recurrent dropout implementation for LSTM. (#20663) This change is to make the implementation of recurrent dropout consistent with GRU (changed as of #20656 ) and Keras 2. Also fixed a bug where the GRU fix would break when using CUDNN with a dropout and no recurrent dropout. The solution is to create multiple masks only when needed (implementation == 1). Added coverage for the case when dropout is set and recurrent dropout is not set. * Never pass enable_xla=False or native_serialization=False in tests (#20664) These are invalid options in the latest version of jax2tf, they will just immediately throw. * Fix `PyDatasetAdapterTest::test_class_weight` test with Torch on GPU. (#20665) The test was failing because arrays on device and on cpu were compared. * Fix up torch GPU failing test for mix up (#20666) We need to make sure to use get any tensors places on cpu before using them in the tensorflow backend during preprocessing. * Add random_color_jitter processing layer * Add random_color_jitter test * Update test cases * Correct failed test case * Correct failed test case * Correct failed test case --------- Signed-off-by: Kazantsev, Roman <roman.kazantsev@intel.com> Co-authored-by: IMvision12 <88665786+IMvision12@users.noreply.github.com> Co-authored-by: Enrico <e.durso@live.com> Co-authored-by: Marco <mmicu.github00@gmail.com> Co-authored-by: Roman Kazantsev <roman.kazantsev@intel.com> Co-authored-by: Matt Watson <1389937+mattdangerw@users.noreply.github.com> Co-authored-by: hertschuh <1091026+hertschuh@users.noreply.github.com> Co-authored-by: Jasmine Dhantule <dhantule@google.com>
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.
I have added a training condition to ensure that processing is not applied during the inference step for mix-up and random hue adjustments.