Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add subset="both" functionality to {image|text}_dataset_from_directory() #16413

Merged
merged 4 commits into from Apr 18, 2022
Merged

Add subset="both" functionality to {image|text}_dataset_from_directory() #16413

merged 4 commits into from Apr 18, 2022

Conversation

ghost
Copy link

@ghost ghost commented Apr 13, 2022

No description provided.

@gbaned gbaned requested a review from fchollet April 14, 2022 05:02
@google-ml-butler google-ml-butler bot added the keras-team-review-pending Pending review by a Keras team member. label Apr 14, 2022
fchollet
fchollet requested changes Apr 14, 2022
View reviewed changes
keras/preprocessing/BUILD Outdated
@@ -105,3 +105,28 @@ tf_py_test(
"//keras/testing_infra:test_combinations",
],
)

tf_py_test(
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please note that the files where this code lives actually lives in keras/utils (e.g. keras/utils/image_dataset.py). Please rebase to use those files.

keras/preprocessing/BUILD Outdated
@@ -105,3 +105,28 @@ tf_py_test(
"//keras/testing_infra:test_combinations",
],
)

tf_py_test(
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please note that the files where this code lives actually lives in keras/utils (e.g. keras/utils/image_dataset.py). Please rebase to use those files.

@fchollet fchollet removed the keras-team-review-pending Pending review by a Keras team member. label Apr 14, 2022
@ghost ghost requested a review from fchollet April 14, 2022 19:37
@google-ml-butler google-ml-butler bot added the keras-team-review-pending Pending review by a Keras team member. label Apr 14, 2022
fchollet
fchollet approved these changes Apr 15, 2022
View reviewed changes
Copy link
Member

@fchollet fchollet left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Awesome, thank you!

@google-ml-butler google-ml-butler bot added kokoro:force-run ready to pull Ready to be merged into the codebase labels Apr 15, 2022
@fchollet
Copy link
Member

One of the tests is failing, please take a look: https://source.cloud.google.com/results/invocations/81cf785a-65f5-42aa-acc8-7a735c275f87/targets/keras%2Fgithub%2Fubuntu%2Fcpu%2Fpresubmit/log

FAIL: test_image_dataset_from_directory_validation_split (__main__.ImageDatasetFromDirectoryTest)
ImageDatasetFromDirectoryTest.test_image_dataset_from_directory_validation_split
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/home/kbuilder/.cache/bazel/_bazel_kbuilder/31d6f47147b75c35404d734345be7323/execroot/org_keras/bazel-out/k8-opt/bin/keras/utils/image_dataset_test.runfiles/org_keras/keras/utils/image_dataset_test.py", line 244, in test_image_dataset_from_directory_validation_split
    self.assertEqual(batch[0].shape, (8, 18, 18, 3))
AssertionError: TensorShape([7, 18, 18, 3]) != (8, 18, 18, 3)

@fchollet fchollet removed the keras-team-review-pending Pending review by a Keras team member. label Apr 16, 2022
@google-ml-butler google-ml-butler bot removed the ready to pull Ready to be merged into the codebase label Apr 17, 2022
@ghost ghost requested a review from fchollet April 17, 2022 06:18
@google-ml-butler google-ml-butler bot added the keras-team-review-pending Pending review by a Keras team member. label Apr 17, 2022
@fchollet fchollet added kokoro:force-run and removed keras-team-review-pending Pending review by a Keras team member. labels Apr 17, 2022
fchollet
fchollet approved these changes Apr 17, 2022
View reviewed changes
Copy link
Member

@fchollet fchollet left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks! We should be good to go.

@google-ml-butler google-ml-butler bot added kokoro:force-run ready to pull Ready to be merged into the codebase labels Apr 17, 2022
@copybara-service copybara-service bot merged commit 9e8bd93 into keras-team:master Apr 18, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@gbaned gbaned

Labels
ready to pull Ready to be merged into the codebase size:XL
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@fchollet @kokoro-team @gbaned @haarisr