add compat module to point fbcode users to torchdata_deprecated

Summary:
We're deleting datapipes in torchdata. TorchText ahs a bunch of datapipes defined, and we don't want to break fbcode tests. Internally we are moving users to `torchdata_deprecated` but we need to jump through some hoops.

This diff creates a "compat" module which redirects to torchdata.datapipes.iter by default, but in FBCode we patch it to point to torchdata_deprecated instead.

Reviewed By: ivy-zhou

Differential Revision: D64208916

fbshipit-source-id: 6b625d87f3c42b28207bd84de3417cc3bc74caee

Author: andrewkho

requirements.txt

@@ -19,7 +19,7 @@ Sphinx
 pytest
 expecttest
 parameterized
-torchdata>0.5
+0.5<torchdata<=0.9.0
 
 # Lets pytest find our code by automatically modifying PYTHONPATH
 pytest-pythonpath

torchtext/_download_hooks.py

@@ -4,7 +4,7 @@
 
 # This is to allow monkey-patching in fbcode
 from torch.hub import load_state_dict_from_url  # noqa
-from torchdata.datapipes.iter import HttpReader, GDriveReader  # noqa F401
+from torchtext.compat.datapipes.iter import HttpReader, GDriveReader  # noqa F401
 from tqdm import tqdm
 
 

torchtext/compat/__init__.py

@@ -0,0 +1,15 @@
+from torchtext._internal.module_utils import is_module_available
+
+
+def check_for_torchdata():
+    if not is_module_available("torchdata"):
+        raise ModuleNotFoundError(
+            "Package `torchdata` not found. Please install torchdata <= 0.9.0: https://github.com/pytorch/data"
+        )
+
+
+__all__ = [
+    "check_for_torchdata",
+    "dataloader2",
+    "datapipes",
+]

torchtext/compat/datapipes/__init__.py

@@ -0,0 +1,16 @@
+from torchdata.datapipes.iter import (
+    FileOpener,
+    GDriveReader,
+    HttpReader,
+    IterableWrapper,
+    OnlineReader,
+)
+
+
+__all__ = [
+    "FileOpener",
+    "GDriveReader",
+    "HttpReader",
+    "IterableWrapper",
+    "OnlineReader",
+]

torchtext/compat/datapipes/iter/__init__.py

@@ -2,9 +2,10 @@
 from functools import partial
 from typing import Union, Tuple
 
-from torchdata.datapipes.iter import FileOpener, IterableWrapper
 from torchtext._download_hooks import HttpReader
-from torchtext._internal.module_utils import is_module_available
+from torchtext.compat import check_for_torchdata
+
+from torchtext.compat.datapipes.iter import FileOpener, IterableWrapper
 from torchtext.data.datasets_utils import (
     _wrap_split_argument,
     _create_dataset_directory,
@@ -61,10 +62,7 @@ def AG_NEWS(root: str, split: Union[Tuple[str], str]):
     :returns: DataPipe that yields tuple of label (1 to 4) and text
     :rtype: (int, str)
     """
-    if not is_module_available("torchdata"):
-        raise ModuleNotFoundError(
-            "Package `torchdata` not found. Please install following instructions at https://github.com/pytorch/data"
-        )
+    check_for_torchdata()
 
     url_dp = IterableWrapper([URL[split]])
     cache_dp = url_dp.on_disk_cache(

torchtext/datasets/ag_news.py

@@ -2,9 +2,11 @@
 from functools import partial
 from typing import Union, Tuple
 
-from torchdata.datapipes.iter import FileOpener, IterableWrapper
 from torchtext._download_hooks import GDriveReader
 from torchtext._internal.module_utils import is_module_available
+from torchtext.compat import check_for_torchdata
+
+from torchtext.compat.datapipes.iter import FileOpener, IterableWrapper
 from torchtext.data.datasets_utils import (
     _wrap_split_argument,
     _create_dataset_directory,
@@ -75,10 +77,7 @@ def AmazonReviewFull(root: str, split: Union[Tuple[str], str]):
     :returns: DataPipe that yields tuple of label (1 to 5) and text containing the review title and text
     :rtype: (int, str)
     """
-    if not is_module_available("torchdata"):
-        raise ModuleNotFoundError(
-            "Package `torchdata` not found. Please install following instructions at https://github.com/pytorch/data"
-        )
+    check_for_torchdata()
 
     url_dp = IterableWrapper([URL])
     cache_compressed_dp = url_dp.on_disk_cache(

torchtext/datasets/amazonreviewfull.py

@@ -2,9 +2,10 @@
 from functools import partial
 from typing import Union, Tuple
 
-from torchdata.datapipes.iter import FileOpener, IterableWrapper
+from torchtext.compat.datapipes.iter import FileOpener, IterableWrapper
 from torchtext._download_hooks import GDriveReader
 from torchtext._internal.module_utils import is_module_available
+from torchtext.compat import check_for_torchdata
 from torchtext.data.datasets_utils import (
     _wrap_split_argument,
     _create_dataset_directory,
@@ -72,10 +73,7 @@ def AmazonReviewPolarity(root: str, split: Union[Tuple[str], str]):
     :rtype: (int, str)
     """
     # TODO Remove this after removing conditional dependency
-    if not is_module_available("torchdata"):
-        raise ModuleNotFoundError(
-            "Package `torchdata` not found. Please install following instructions at https://github.com/pytorch/data"
-        )
+    check_for_torchdata()
 
     url_dp = IterableWrapper([URL])
     cache_compressed_dp = url_dp.on_disk_cache(

torchtext/datasets/amazonreviewpolarity.py

@@ -1,7 +1,7 @@
 import os.path
 from functools import partial
 
-from torchdata.datapipes.iter import FileOpener, IterableWrapper
+from torchtext.compat.datapipes.iter import FileOpener, IterableWrapper
 from torchtext._download_hooks import HttpReader
 from torchtext.data.datasets_utils import (
     _create_dataset_directory,

torchtext/datasets/cc100.py

@@ -3,13 +3,14 @@
 from functools import partial
 from typing import Union, Set, Tuple
 
-from torchdata.datapipes.iter import (
+from torchtext.compat import check_for_torchdata
+
+from torchtext.compat.datapipes.iter import (
     FileOpener,
+    GDriveReader,
     IterableWrapper,
     OnlineReader,
-    GDriveReader,
 )
-from torchtext._internal.module_utils import is_module_available
 from torchtext.data.datasets_utils import (
     _wrap_split_argument,
     _create_dataset_directory,
@@ -137,10 +138,7 @@ def CNNDM(root: str, split: Union[Tuple[str], str]):
     :returns: DataPipe that yields a tuple of texts containing an article and its abstract (i.e. (article, abstract))
     :rtype: (str, str)
     """
-    if not is_module_available("torchdata"):
-        raise ModuleNotFoundError(
-            "Package `torchdata` not found. Please install following instructions at https://github.com/pytorch/data"
-        )
+    check_for_torchdata()
 
     cnn_dp = _load_stories(root, "cnn", split)
     dailymail_dp = _load_stories(root, "dailymail", split)