Skip to content

Updating TorchData DataPipe API usages #1663

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.

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

Merged
merged 1 commit into from
Mar 29, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion torchtext/datasets/amazonreviewfull.py
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ def AmazonReviewFull(root: str, split: Union[Tuple[str], str]):
filepath_fn=lambda x: os.path.join(root, _EXTRACTED_FILES[split])
)
cache_decompressed_dp = (
FileOpener(cache_decompressed_dp, mode="b").read_from_tar().filter(lambda x: _EXTRACTED_FILES[split] in x[0])
FileOpener(cache_decompressed_dp, mode="b").load_from_tar().filter(lambda x: _EXTRACTED_FILES[split] in x[0])
)
cache_decompressed_dp = cache_decompressed_dp.end_caching(mode="wb", same_filepath_fn=True)

Expand Down
2 changes: 1 addition & 1 deletion torchtext/datasets/amazonreviewpolarity.py
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ def AmazonReviewPolarity(root: str, split: Union[Tuple[str], str]):
filepath_fn=lambda x: os.path.join(root, _EXTRACTED_FILES[split])
)
cache_decompressed_dp = (
FileOpener(cache_decompressed_dp, mode="b").read_from_tar().filter(lambda x: _EXTRACTED_FILES[split] in x[0])
FileOpener(cache_decompressed_dp, mode="b").load_from_tar().filter(lambda x: _EXTRACTED_FILES[split] in x[0])
)
cache_decompressed_dp = cache_decompressed_dp.end_caching(mode="wb", same_filepath_fn=True)

Expand Down
2 changes: 1 addition & 1 deletion torchtext/datasets/cc100.py
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ def CC100(root: str, language_code: str = "en"):
cache_decompressed_dp = cache_compressed_dp.on_disk_cache(
filepath_fn=lambda x: os.path.join(root, os.path.basename(x).rstrip(".xz"))
)
cache_decompressed_dp = FileOpener(cache_decompressed_dp, mode="b").read_from_xz()
cache_decompressed_dp = FileOpener(cache_decompressed_dp, mode="b").load_from_xz()
cache_decompressed_dp = cache_decompressed_dp.end_caching(mode="wb")

data_dp = FileOpener(cache_decompressed_dp, encoding="utf-8").readlines(return_path=False)
Expand Down
2 changes: 1 addition & 1 deletion torchtext/datasets/dbpedia.py
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ def DBpedia(root: str, split: Union[Tuple[str], str]):
filepath_fn=lambda x: os.path.join(root, _EXTRACTED_FILES[split])
)
cache_decompressed_dp = (
FileOpener(cache_decompressed_dp, mode="b").read_from_tar().filter(lambda x: _EXTRACTED_FILES[split] in x[0])
FileOpener(cache_decompressed_dp, mode="b").load_from_tar().filter(lambda x: _EXTRACTED_FILES[split] in x[0])
)
cache_decompressed_dp = cache_decompressed_dp.end_caching(mode="wb", same_filepath_fn=True)

Expand Down
2 changes: 1 addition & 1 deletion torchtext/datasets/enwik9.py
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ def EnWik9(root: str):
cache_decompressed_dp = cache_compressed_dp.on_disk_cache(
filepath_fn=lambda x: os.path.join(root, os.path.splitext(_PATH)[0])
)
cache_decompressed_dp = FileOpener(cache_decompressed_dp, mode="b").read_from_zip()
cache_decompressed_dp = FileOpener(cache_decompressed_dp, mode="b").load_from_zip()
cache_decompressed_dp = cache_decompressed_dp.end_caching(mode="wb", same_filepath_fn=True)

data_dp = FileOpener(cache_decompressed_dp, encoding="utf-8")
Expand Down
2 changes: 1 addition & 1 deletion torchtext/datasets/imdb.py
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ def IMDB(root: str, split: Union[Tuple[str], str]):
filepath_fn=lambda x: [os.path.join(root, decompressed_folder, split, label) for label in labels]
)
cache_decompressed_dp = FileOpener(cache_decompressed_dp, mode="b")
cache_decompressed_dp = cache_decompressed_dp.read_from_tar()
cache_decompressed_dp = cache_decompressed_dp.load_from_tar()

def filter_imdb_data(key, fname):
# eg. fname = "aclImdb/train/neg/12416_3.txt"
Expand Down
4 changes: 2 additions & 2 deletions torchtext/datasets/iwslt2016.py
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@
# avoid additional conditional imports.
def _filter_clean_cache(cache_decompressed_dp, full_filepath, uncleaned_filename):
cache_inner_decompressed_dp = cache_decompressed_dp.on_disk_cache(filepath_fn=lambda x: full_filepath)
cache_inner_decompressed_dp = FileOpener(cache_inner_decompressed_dp, mode="b").read_from_tar()
cache_inner_decompressed_dp = FileOpener(cache_inner_decompressed_dp, mode="b").load_from_tar()
cache_inner_decompressed_dp = cache_inner_decompressed_dp.filter(
lambda x: os.path.basename(uncleaned_filename) in x[0]
)
Expand Down Expand Up @@ -263,7 +263,7 @@ def IWSLT2016(
cache_decompressed_dp = cache_compressed_dp.on_disk_cache(filepath_fn=lambda x: inner_iwslt_tar)
cache_decompressed_dp = (
FileOpener(cache_decompressed_dp, mode="b")
.read_from_tar()
.load_from_tar()
.filter(lambda x: os.path.basename(inner_iwslt_tar) in x[0])
)
cache_decompressed_dp = cache_decompressed_dp.end_caching(mode="wb", same_filepath_fn=True)
Expand Down
4 changes: 2 additions & 2 deletions torchtext/datasets/iwslt2017.py
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@
# avoid additional conditional imports.
def _filter_clean_cache(cache_decompressed_dp, full_filepath, uncleaned_filename):
cache_inner_decompressed_dp = cache_decompressed_dp.on_disk_cache(filepath_fn=lambda x: full_filepath)
cache_inner_decompressed_dp = FileOpener(cache_inner_decompressed_dp, mode="b").read_from_tar()
cache_inner_decompressed_dp = FileOpener(cache_inner_decompressed_dp, mode="b").load_from_tar()
cache_inner_decompressed_dp = cache_inner_decompressed_dp.filter(
lambda x: os.path.basename(uncleaned_filename) in x[0]
)
Expand Down Expand Up @@ -208,7 +208,7 @@ def IWSLT2017(root=".data", split=("train", "valid", "test"), language_pair=("de
)

cache_decompressed_dp = cache_compressed_dp.on_disk_cache(filepath_fn=lambda x: inner_iwslt_tar)
cache_decompressed_dp = FileOpener(cache_decompressed_dp, mode="b").read_from_tar()
cache_decompressed_dp = FileOpener(cache_decompressed_dp, mode="b").load_from_tar()
cache_decompressed_dp = cache_decompressed_dp.end_caching(mode="wb", same_filepath_fn=True)

src_filename = file_path_by_lang_and_split[src_language][split]
Expand Down
4 changes: 2 additions & 2 deletions torchtext/datasets/multi30k.py
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ def Multi30k(root: str, split: Union[Tuple[str], str], language_pair: Tuple[str]
)
src_cache_decompressed_dp = (
FileOpener(src_cache_decompressed_dp, mode="b")
.read_from_tar()
.load_from_tar()
.filter(lambda x: f"{_PREFIX[split]}.{language_pair[0]}" in x[0])
)
src_cache_decompressed_dp = src_cache_decompressed_dp.end_caching(mode="wb", same_filepath_fn=True)
Expand All @@ -94,7 +94,7 @@ def Multi30k(root: str, split: Union[Tuple[str], str], language_pair: Tuple[str]
)
tgt_cache_decompressed_dp = (
FileOpener(tgt_cache_decompressed_dp, mode="b")
.read_from_tar()
.load_from_tar()
.filter(lambda x: f"{_PREFIX[split]}.{language_pair[1]}" in x[0])
)
tgt_cache_decompressed_dp = tgt_cache_decompressed_dp.end_caching(mode="wb", same_filepath_fn=True)
Expand Down
2 changes: 1 addition & 1 deletion torchtext/datasets/sogounews.py
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ def SogouNews(root: str, split: Union[Tuple[str], str]):
filepath_fn=lambda x: os.path.join(root, _EXTRACTED_FILES[split])
)
cache_decompressed_dp = (
FileOpener(cache_decompressed_dp, mode="b").read_from_tar().filter(lambda x: _EXTRACTED_FILES[split] in x[0])
FileOpener(cache_decompressed_dp, mode="b").load_from_tar().filter(lambda x: _EXTRACTED_FILES[split] in x[0])
)
cache_decompressed_dp = cache_decompressed_dp.end_caching(mode="wb", same_filepath_fn=True)

Expand Down
2 changes: 1 addition & 1 deletion torchtext/datasets/sst2.py
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ def SST2(root, split):
filepath_fn=lambda x: os.path.join(root, _EXTRACTED_FILES[split])
)
cache_decompressed_dp = (
FileOpener(cache_decompressed_dp, mode="b").read_from_zip().filter(lambda x: _EXTRACTED_FILES[split] in x[0])
FileOpener(cache_decompressed_dp, mode="b").load_from_zip().filter(lambda x: _EXTRACTED_FILES[split] in x[0])
)
cache_decompressed_dp = cache_decompressed_dp.end_caching(mode="wb", same_filepath_fn=True)

Expand Down
2 changes: 1 addition & 1 deletion torchtext/datasets/udpos.py
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ def UDPOS(root: str, split: Union[Tuple[str], str]):
filepath_fn=lambda x: os.path.join(root, _EXTRACTED_FILES[split])
)
cache_decompressed_dp = (
FileOpener(cache_decompressed_dp, mode="b").read_from_zip().filter(lambda x: _EXTRACTED_FILES[split] in x[0])
FileOpener(cache_decompressed_dp, mode="b").load_from_zip().filter(lambda x: _EXTRACTED_FILES[split] in x[0])
)
cache_decompressed_dp = cache_decompressed_dp.end_caching(mode="wb", same_filepath_fn=True)

Expand Down
2 changes: 1 addition & 1 deletion torchtext/datasets/wikitext103.py
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ def WikiText103(root: str, split: Union[Tuple[str], str]):
)
# Extract zip and filter the appropriate split file
cache_decompressed_dp = (
FileOpener(cache_decompressed_dp, mode="b").read_from_zip().filter(lambda x: _EXTRACTED_FILES[split] in x[0])
FileOpener(cache_decompressed_dp, mode="b").load_from_zip().filter(lambda x: _EXTRACTED_FILES[split] in x[0])
)
cache_decompressed_dp = cache_decompressed_dp.end_caching(mode="wb", same_filepath_fn=True)
data_dp = FileOpener(cache_decompressed_dp, encoding="utf-8")
Expand Down
2 changes: 1 addition & 1 deletion torchtext/datasets/wikitext2.py
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ def WikiText2(root: str, split: Union[Tuple[str], str]):
)
# Extract zip and filter the appropriate split file
cache_decompressed_dp = (
FileOpener(cache_decompressed_dp, mode="b").read_from_zip().filter(lambda x: _EXTRACTED_FILES[split] in x[0])
FileOpener(cache_decompressed_dp, mode="b").load_from_zip().filter(lambda x: _EXTRACTED_FILES[split] in x[0])
)
cache_decompressed_dp = cache_decompressed_dp.end_caching(mode="wb", same_filepath_fn=True)
data_dp = FileOpener(cache_decompressed_dp, encoding="utf-8")
Expand Down
2 changes: 1 addition & 1 deletion torchtext/datasets/yahooanswers.py
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ def YahooAnswers(root: str, split: Union[Tuple[str], str]):
filepath_fn=lambda x: os.path.join(root, _EXTRACTED_FILES[split])
)
cache_decompressed_dp = FileOpener(cache_decompressed_dp, mode="b")
cache_decompressed_dp = cache_decompressed_dp.read_from_tar()
cache_decompressed_dp = cache_decompressed_dp.load_from_tar()
cache_decompressed_dp = cache_decompressed_dp.filter(lambda x: _EXTRACTED_FILES[split] in x[0])
cache_decompressed_dp = cache_decompressed_dp.end_caching(mode="wb", same_filepath_fn=True)

Expand Down
2 changes: 1 addition & 1 deletion torchtext/datasets/yelpreviewfull.py
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ def YelpReviewFull(root: str, split: Union[Tuple[str], str]):
filepath_fn=lambda x: os.path.join(root, _EXTRACTED_FILES[split])
)
cache_decompressed_dp = FileOpener(cache_decompressed_dp, mode="b")
cache_decompressed_dp = cache_decompressed_dp.read_from_tar().filter(lambda x: _EXTRACTED_FILES[split] in x[0])
cache_decompressed_dp = cache_decompressed_dp.load_from_tar().filter(lambda x: _EXTRACTED_FILES[split] in x[0])
cache_decompressed_dp = cache_decompressed_dp.end_caching(mode="wb", same_filepath_fn=True)

data_dp = FileOpener(cache_decompressed_dp, encoding="utf-8")
Expand Down
2 changes: 1 addition & 1 deletion torchtext/datasets/yelpreviewpolarity.py
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ def YelpReviewPolarity(root: str, split: Union[Tuple[str], str]):
)
cache_decompressed_dp = FileOpener(cache_decompressed_dp, mode="b")

cache_decompressed_dp = cache_decompressed_dp.read_from_tar()
cache_decompressed_dp = cache_decompressed_dp.load_from_tar()

cache_decompressed_dp = cache_decompressed_dp.filter(lambda x: _EXTRACTED_FILES[split] in x[0])
cache_decompressed_dp = cache_decompressed_dp.end_caching(mode="wb", same_filepath_fn=True)
Expand Down