diff --git a/grain/BUILD b/grain/BUILD index 50887d97..2e394d76 100644 --- a/grain/BUILD +++ b/grain/BUILD @@ -49,23 +49,12 @@ py_library( srcs_version = "PY3", # Implicit build flag deps = [ - ":python_lazy_dataset", # build_cleaner: keep "//grain/_src/core:transforms", # build_cleaner: keep "//grain/_src/python/dataset:visualize", # build_cleaner: keep - "//grain/_src/python/dataset/transformations:interleave", # build_cleaner: keep - "//grain/_src/python/experimental/example_packing:packing", # build_cleaner: keep - ], -) - -py_library( - name = "python_lazy_dataset", - srcs = ["python_lazy_dataset.py"], - srcs_version = "PY3", - # Implicit build flag - deps = [ - "//grain/_src/python/dataset", # build_cleaner: keep "//grain/_src/python/dataset/transformations:flatmap", # build_cleaner: keep + "//grain/_src/python/dataset/transformations:interleave", # build_cleaner: keep "//grain/_src/python/dataset/transformations:packing", # build_cleaner: keep "//grain/_src/python/dataset/transformations:zip", # build_cleaner: keep + "//grain/_src/python/experimental/example_packing:packing", # build_cleaner: keep ], ) diff --git a/grain/_src/python/dataset/dataset.py b/grain/_src/python/dataset/dataset.py index 9ab0a13e..81c66b6e 100644 --- a/grain/_src/python/dataset/dataset.py +++ b/grain/_src/python/dataset/dataset.py @@ -11,7 +11,7 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -"""LazyDataset base classes. +"""Dataset base classes. There are 3 main classes: - `MapDataset` define a dataset that supports efficient random access. It diff --git a/grain/python_experimental.py b/grain/python_experimental.py index 96602c3c..5ac4b27d 100644 --- a/grain/python_experimental.py +++ b/grain/python_experimental.py @@ -20,16 +20,6 @@ # pylint: disable=wildcard-import # pylint: disable=g-import-not-at-top -from etils import epy - -# `lazy_dataset` module is deprecated. It displays the deprecation message upon -# import. We make the import lazy to only display the message when the module -# is actually used. -with epy.lazy_imports(): - from grain import python_lazy_dataset as lazy_dataset - -del epy - from ._src.python.dataset.base import ( DatasetOptions, ExecutionTrackingMode, diff --git a/grain/python_lazy_dataset.py b/grain/python_lazy_dataset.py deleted file mode 100644 index e7e3e6b2..00000000 --- a/grain/python_lazy_dataset.py +++ /dev/null @@ -1,81 +0,0 @@ -# Copyright 2023 Google LLC -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# https://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -"""Experimental PyGrain APIs.""" -import warnings - -# pylint: disable=g-importing-member -# pylint: disable=g-multiple-import -# pylint: disable=unused-import -# pylint: disable=wildcard-import -from ._src.python.dataset.base import DatasetSelectionMap -from ._src.python.dataset.dataset import ( - MapDataset as LazyMapDataset, - IterDataset as LazyIterDataset, - DatasetIterator as LazyDatasetIterator, -) -from ._src.python.dataset.transformations.batch import ( - BatchMapDataset as BatchLazyMapDataset, - BatchIterDataset as BatchLazyIterDataset, -) -from ._src.python.dataset.transformations.filter import ( - FilterMapDataset as FilterLazyMapDataset, - FilterIterDataset as FilterLazyIterDataset, -) -from ._src.python.dataset.transformations.flatmap import ( - FlatMapMapDataset as FlatMapLazyMapDataset, - FlatMapIterDataset, -) -from ._src.python.dataset.transformations.map import ( - MapMapDataset as MapLazyMapDataset, - MapIterDataset as MapLazyIterDataset, - RngPool, -) -from ._src.python.dataset.transformations.mix import ( - ConcatenateMapDataset as ConcatenateLazyMapDataset, - MixedMapDataset as MixedLazyMapDataset, - MixedIterDataset as MixedLazyIterDataset, -) -from ._src.python.dataset.transformations.packing import ( - FirstFitPackIterDataset as FirstFitPackLazyIterDataset, - SingleBinPackIterDataset as SingleBinPackLazyIterDataset, -) -from ._src.python.dataset.transformations.prefetch import ( - ThreadPrefetchIterDataset as ThreadPrefetchLazyIterDataset, -) -from ._src.python.dataset.transformations.repeat import ( - RepeatMapDataset as RepeatLazyMapDataset, -) -from ._src.python.dataset.transformations.shuffle import ( - ShuffleMapDataset as ShuffleLazyMapDataset, - WindowShuffleMapDataset as WindowShuffleLazyMapDataset, -) -from ._src.python.dataset.transformations.slice import ( - SliceMapDataset as SliceLazyMapDataset, -) -from ._src.python.dataset.transformations.source import ( - RangeMapDataset as RangeLazyMapDataset, - SourceMapDataset as SourceLazyMapDataset, - log_lineage_for_sources, -) -from ._src.python.dataset.transformations.zip import ( - ZipMapDataset as ZipLazyMapDataset, -) - -warnings.warn( - "`grain.python.experimental.lazy_dataset` is deprecated and will be " - "removed Nov 1, 2024. Use the graduated APIs in " - "`grain.python.{Map|Iter}Dataset` or experimental APIs in " - "`grain.python.experimental`", - DeprecationWarning, -)