-
Notifications
You must be signed in to change notification settings - Fork 811
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
Added new SST2 dataset class #1410
Changes from 10 commits
fa565ee
3e9551b
1d6d289
38d3d58
0f8968e
d2bcf2f
62e6fb2
846ee21
6d21049
7a82ba0
cdb5bac
fc41492
535c050
80b83e5
5e0f1e9
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,32 @@ | ||
import hashlib | ||
import json | ||
|
||
from torchtext.experimental.datasets import sst2 | ||
|
||
from ..common.torchtext_test_case import TorchtextTestCase | ||
|
||
|
||
class TestDataset(TorchtextTestCase): | ||
def test_sst2_dataset(self): | ||
split = ("train", "dev", "test") | ||
train_dp, dev_dp, test_dp = sst2.SST2(split=split) | ||
|
||
# verify hashes of first line in dataset | ||
self.assertEqual( | ||
hashlib.md5( | ||
json.dumps(next(iter(train_dp)), sort_keys=True).encode("utf-8") | ||
).hexdigest(), | ||
sst2._FIRST_LINE_MD5["train"], | ||
) | ||
self.assertEqual( | ||
hashlib.md5( | ||
json.dumps(next(iter(dev_dp)), sort_keys=True).encode("utf-8") | ||
).hexdigest(), | ||
sst2._FIRST_LINE_MD5["dev"], | ||
) | ||
self.assertEqual( | ||
hashlib.md5( | ||
json.dumps(next(iter(test_dp)), sort_keys=True).encode("utf-8") | ||
).hexdigest(), | ||
sst2._FIRST_LINE_MD5["test"], | ||
) |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,4 @@ | ||
from . import raw | ||
from . import sst2 | ||
|
||
__all__ = ['raw'] | ||
__all__ = ["raw", "sst2"] |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,88 @@ | ||
# Copyright (c) Facebook, Inc. and its affiliates. | ||
import logging | ||
import os | ||
|
||
|
||
try: | ||
from torchdata.datapipes.iter import ( | ||
HttpReader, | ||
IterableWrapper, | ||
) | ||
except ImportError: | ||
logging.error( | ||
"Package `torchdata` is required to be installed to use this dataset." | ||
"Please use `pip install git+https://github.com/pytorch/data.git'" | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Often times, the proper way to install a package varies depending on the environment, so it's better either avoid telling users to do exactly There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I think it's fine as this is just a temporary solution. The wheel would be uploaded to PyPI and conda shortly when the package is released to us. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I've modified the message to tell the user to refer to the instructions in https://github.com/pytorch/data for how to install the package. |
||
"to install the package." | ||
) | ||
|
||
from torchtext.data.datasets_utils import ( | ||
_add_docstring_header, | ||
_create_dataset_directory, | ||
_wrap_split_argument, | ||
) | ||
|
||
|
||
NUM_LINES = { | ||
"train": 67349, | ||
"dev": 872, | ||
"test": 1821, | ||
} | ||
|
||
MD5 = "9f81648d4199384278b86e315dac217c" | ||
URL = "https://dl.fbaipublicfiles.com/glue/data/SST-2.zip" | ||
|
||
_EXTRACTED_FILES = { | ||
"train": f"{os.sep}".join(["SST-2", "train.tsv"]), | ||
"dev": f"{os.sep}".join(["SST-2", "dev.tsv"]), | ||
"test": f"{os.sep}".join(["SST-2", "test.tsv"]), | ||
} | ||
Nayef211 marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
||
_EXTRACTED_FILES_MD5 = { | ||
"train": "da409a0a939379ed32a470bc0f7fe99a", | ||
"dev": "268856b487b2a31a28c0a93daaff7288", | ||
"test": "3230e4efec76488b87877a56ae49675a", | ||
} | ||
|
||
_FIRST_LINE_MD5 = { | ||
"train": "2552b8cecd57b2e022ef23411c688fa8", | ||
"dev": "1b0ffd6aa5f2bf0fd9840a5f6f1a9f07", | ||
"test": "f838c81fe40bfcd7e42e9ffc4dd004f7", | ||
} | ||
|
||
DATASET_NAME = "SST2" | ||
|
||
|
||
@_add_docstring_header(num_lines=NUM_LINES, num_classes=2) | ||
@_create_dataset_directory(dataset_name=DATASET_NAME) | ||
@_wrap_split_argument(("train", "dev", "test")) | ||
def SST2(root, split): | ||
return SST2Dataset(root, split).get_datapipe() | ||
|
||
|
||
class SST2Dataset: | ||
"""The SST2 dataset uses torchdata datapipes end-2-end. | ||
To avoid download at every epoch, we cache the data on-disk | ||
We do sanity check on dowloaded and extracted data | ||
""" | ||
|
||
def __init__(self, root, split): | ||
self.root = root | ||
self.split = split | ||
|
||
def get_datapipe(self): | ||
# cache data on-disk | ||
cache_dp = IterableWrapper([URL]).on_disk_cache( | ||
HttpReader, | ||
op_map=lambda x: (x[0], x[1].read()), | ||
filepath_fn=lambda x: os.path.join(self.root, os.path.basename(x)), | ||
) | ||
Comment on lines
+76
to
+80
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I am adding a PR to improve the interface of There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Sure that sounds great! |
||
|
||
# extract data from zip | ||
extracted_files = cache_dp.read_from_zip() | ||
|
||
# Parse CSV file and yield data samples | ||
return extracted_files.filter( | ||
lambda x: self.split in x[0] | ||
).parse_csv(skip_lines=1, delimiter="\t").map( | ||
lambda x: (x[0], x[1]) | ||
) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This should be warning (or info). Otherwise users who do not intend to use this dataset would be puzzled.
Also, to use logging module, define a logger object par module;
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Updated this to use per-module logger and log a warning message.