From d10d2bc3429ea85ff5f1e1107fae47bee94033b2 Mon Sep 17 00:00:00 2001 From: Guanheng Zhang Date: Wed, 1 Jul 2020 15:11:47 -0700 Subject: [PATCH 1/7] retire warning --- torchtext/data/batch.py | 2 ++ torchtext/data/example.py | 6 ++++++ torchtext/data/field.py | 7 ++++++- torchtext/data/iterator.py | 3 ++- 4 files changed, 16 insertions(+), 2 deletions(-) diff --git a/torchtext/data/batch.py b/torchtext/data/batch.py index af29f175d4..11b0dd7030 100644 --- a/torchtext/data/batch.py +++ b/torchtext/data/batch.py @@ -1,4 +1,5 @@ import torch +import warnings class Batch(object): @@ -19,6 +20,7 @@ class Batch(object): def __init__(self, data=None, dataset=None, device=None): """Create a Batch from a list of examples.""" + warnings.warn('Batch class will retire in 0.8.0 release', RuntimeWarning) if data is not None: self.batch_size = len(data) self.dataset = dataset diff --git a/torchtext/data/example.py b/torchtext/data/example.py index d9f96aeda3..0de3191d53 100644 --- a/torchtext/data/example.py +++ b/torchtext/data/example.py @@ -1,5 +1,6 @@ import json from functools import reduce +import warnings class Example(object): @@ -9,6 +10,7 @@ class Example(object): """ @classmethod def fromJSON(cls, data, fields): + warnings.warn('Example class will retire in 0.8.0 release', RuntimeWarning) ex = cls() obj = json.loads(data) @@ -47,6 +49,7 @@ def reducer(obj, key): @classmethod def fromdict(cls, data, fields): + warnings.warn('Example class will retire in 0.8.0 release', RuntimeWarning) ex = cls() for key, vals in fields.items(): if key not in data: @@ -62,6 +65,7 @@ def fromdict(cls, data, fields): @classmethod def fromCSV(cls, data, fields, field_to_index=None): + warnings.warn('Example class will retire in 0.8.0 release', RuntimeWarning) if field_to_index is None: return cls.fromlist(data, fields) else: @@ -71,6 +75,7 @@ def fromCSV(cls, data, fields, field_to_index=None): @classmethod def fromlist(cls, data, fields): + warnings.warn('Example class will retire in 0.8.0 release', RuntimeWarning) ex = cls() for (name, field), val in zip(fields, data): if field is not None: @@ -86,6 +91,7 @@ def fromlist(cls, data, fields): @classmethod def fromtree(cls, data, fields, subtrees=False): + warnings.warn('Example class will retire in 0.8.0 release', RuntimeWarning) try: from nltk.tree import Tree except ImportError: diff --git a/torchtext/data/field.py b/torchtext/data/field.py index 189331c1be..2be3a23285 100644 --- a/torchtext/data/field.py +++ b/torchtext/data/field.py @@ -3,7 +3,7 @@ from itertools import chain import torch from tqdm import tqdm - +import warnings from .dataset import Dataset from .pipeline import Pipeline from .utils import get_tokenizer, dtype_to_attr, is_tokenizer_serializable @@ -33,6 +33,7 @@ class RawField(object): """ def __init__(self, preprocessing=None, postprocessing=None, is_target=False): + warnings.warn('Field class will retire in 0.8.0 release', RuntimeWarning) self.preprocessing = preprocessing self.postprocessing = postprocessing self.is_target = is_target @@ -146,6 +147,7 @@ def __init__(self, sequential=True, use_vocab=True, init_token=None, batch_first=False, pad_token="", unk_token="", pad_first=False, truncate_first=False, stop_words=None, is_target=False): + warnings.warn('Field class will retire in 0.8.0 release', RuntimeWarning) self.sequential = sequential self.use_vocab = use_vocab self.init_token = init_token @@ -365,6 +367,7 @@ def numericalize(self, arr, device=None): class ReversibleField(Field): def __init__(self, **kwargs): + warnings.warn('Field class will retire in 0.8.0 release', RuntimeWarning) if kwargs.get('tokenize') is list: self.use_revtok = False else: @@ -411,6 +414,7 @@ class SubwordField(ReversibleField): vocab_cls = SubwordVocab def __init__(self, **kwargs): + warnings.warn('Field class will retire in 0.8.0 release', RuntimeWarning) kwargs['tokenize'] = 'subword' if 'unk_token' not in kwargs: kwargs['unk_token'] = '�' @@ -491,6 +495,7 @@ def __init__(self, nesting_field, use_vocab=True, init_token=None, eos_token=Non postprocessing=None, tokenize=None, tokenizer_language='en', include_lengths=False, pad_token='', pad_first=False, truncate_first=False): + warnings.warn('Field class will retire in 0.8.0 release', RuntimeWarning) if isinstance(nesting_field, NestedField): raise ValueError('nesting field must not be another NestedField') if nesting_field.include_lengths: diff --git a/torchtext/data/iterator.py b/torchtext/data/iterator.py index c76a7335ff..b463d3d0a9 100644 --- a/torchtext/data/iterator.py +++ b/torchtext/data/iterator.py @@ -2,7 +2,7 @@ import random import logging - +import warnings import torch from .utils import RandomShuffler from .batch import Batch @@ -45,6 +45,7 @@ def __init__(self, dataset, batch_size, sort_key=None, device=None, batch_size_fn=None, train=True, repeat=False, shuffle=None, sort=None, sort_within_batch=None): + warnings.warn('Iterator class will retire in 0.8.0 release', RuntimeWarning) self.batch_size, self.train, self.dataset = batch_size, train, dataset self.batch_size_fn = batch_size_fn self.iterations = 0 From f58cec4c367d9af000641f01056141e9663626a7 Mon Sep 17 00:00:00 2001 From: Guanheng Zhang Date: Mon, 6 Jul 2020 16:54:12 -0700 Subject: [PATCH 2/7] update --- torchtext/data/batch.py | 2 +- torchtext/data/example.py | 10 +++++----- torchtext/data/field.py | 10 +++++----- torchtext/data/iterator.py | 2 +- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/torchtext/data/batch.py b/torchtext/data/batch.py index 11b0dd7030..14667d7958 100644 --- a/torchtext/data/batch.py +++ b/torchtext/data/batch.py @@ -20,7 +20,7 @@ class Batch(object): def __init__(self, data=None, dataset=None, device=None): """Create a Batch from a list of examples.""" - warnings.warn('Batch class will retire in 0.8.0 release', RuntimeWarning) + warnings.warn('Batch class will retire in 0.8.0 release and stay in torchtext.legacy. See 0.7.0 release note for the replacement.', UserWarning) if data is not None: self.batch_size = len(data) self.dataset = dataset diff --git a/torchtext/data/example.py b/torchtext/data/example.py index 0de3191d53..cf8f926613 100644 --- a/torchtext/data/example.py +++ b/torchtext/data/example.py @@ -10,7 +10,7 @@ class Example(object): """ @classmethod def fromJSON(cls, data, fields): - warnings.warn('Example class will retire in 0.8.0 release', RuntimeWarning) + warnings.warn('Example class will retire in 0.8.0 release and stay in torchtext.legacy. See 0.7.0 release note for the replacement.', UserWarning) ex = cls() obj = json.loads(data) @@ -49,7 +49,7 @@ def reducer(obj, key): @classmethod def fromdict(cls, data, fields): - warnings.warn('Example class will retire in 0.8.0 release', RuntimeWarning) + warnings.warn('Example class will retire in 0.8.0 release and stay in torchtext.legacy. See 0.7.0 release note for the replacement.', UserWarning) ex = cls() for key, vals in fields.items(): if key not in data: @@ -65,7 +65,7 @@ def fromdict(cls, data, fields): @classmethod def fromCSV(cls, data, fields, field_to_index=None): - warnings.warn('Example class will retire in 0.8.0 release', RuntimeWarning) + warnings.warn('Example class will retire in 0.8.0 release and stay in torchtext.legacy. See 0.7.0 release note for the replacement.', UserWarning) if field_to_index is None: return cls.fromlist(data, fields) else: @@ -75,7 +75,7 @@ def fromCSV(cls, data, fields, field_to_index=None): @classmethod def fromlist(cls, data, fields): - warnings.warn('Example class will retire in 0.8.0 release', RuntimeWarning) + warnings.warn('Example class will retire in 0.8.0 release and stay in torchtext.legacy. See 0.7.0 release note for the replacement.', UserWarning) ex = cls() for (name, field), val in zip(fields, data): if field is not None: @@ -91,7 +91,7 @@ def fromlist(cls, data, fields): @classmethod def fromtree(cls, data, fields, subtrees=False): - warnings.warn('Example class will retire in 0.8.0 release', RuntimeWarning) + warnings.warn('Example class will retire in 0.8.0 release and stay in torchtext.legacy. See 0.7.0 release note for the replacement.', UserWarning) try: from nltk.tree import Tree except ImportError: diff --git a/torchtext/data/field.py b/torchtext/data/field.py index 2be3a23285..8a636a7ac5 100644 --- a/torchtext/data/field.py +++ b/torchtext/data/field.py @@ -33,7 +33,7 @@ class RawField(object): """ def __init__(self, preprocessing=None, postprocessing=None, is_target=False): - warnings.warn('Field class will retire in 0.8.0 release', RuntimeWarning) + warnings.warn('Field class will retire in 0.8.0 release and stay in torchtext.legacy. See 0.7.0 release note for the replacement.', UserWarning) self.preprocessing = preprocessing self.postprocessing = postprocessing self.is_target = is_target @@ -147,7 +147,7 @@ def __init__(self, sequential=True, use_vocab=True, init_token=None, batch_first=False, pad_token="", unk_token="", pad_first=False, truncate_first=False, stop_words=None, is_target=False): - warnings.warn('Field class will retire in 0.8.0 release', RuntimeWarning) + warnings.warn('Field class will retire in 0.8.0 release and stay in torchtext.legacy. See 0.7.0 release note for the replacement.', UserWarning) self.sequential = sequential self.use_vocab = use_vocab self.init_token = init_token @@ -367,7 +367,7 @@ def numericalize(self, arr, device=None): class ReversibleField(Field): def __init__(self, **kwargs): - warnings.warn('Field class will retire in 0.8.0 release', RuntimeWarning) + warnings.warn('Field class will retire in 0.8.0 release and stay in torchtext.legacy. See 0.7.0 release note for the replacement.', UserWarning) if kwargs.get('tokenize') is list: self.use_revtok = False else: @@ -414,7 +414,7 @@ class SubwordField(ReversibleField): vocab_cls = SubwordVocab def __init__(self, **kwargs): - warnings.warn('Field class will retire in 0.8.0 release', RuntimeWarning) + warnings.warn('Field class will retire in 0.8.0 release and stay in torchtext.legacy. See 0.7.0 release note for the replacement.', UserWarning) kwargs['tokenize'] = 'subword' if 'unk_token' not in kwargs: kwargs['unk_token'] = '�' @@ -495,7 +495,7 @@ def __init__(self, nesting_field, use_vocab=True, init_token=None, eos_token=Non postprocessing=None, tokenize=None, tokenizer_language='en', include_lengths=False, pad_token='', pad_first=False, truncate_first=False): - warnings.warn('Field class will retire in 0.8.0 release', RuntimeWarning) + warnings.warn('Field class will retire in 0.8.0 release and stay in torchtext.legacy. See 0.7.0 release note for the replacement.', UserWarning) if isinstance(nesting_field, NestedField): raise ValueError('nesting field must not be another NestedField') if nesting_field.include_lengths: diff --git a/torchtext/data/iterator.py b/torchtext/data/iterator.py index b463d3d0a9..4df3dc851d 100644 --- a/torchtext/data/iterator.py +++ b/torchtext/data/iterator.py @@ -45,7 +45,7 @@ def __init__(self, dataset, batch_size, sort_key=None, device=None, batch_size_fn=None, train=True, repeat=False, shuffle=None, sort=None, sort_within_batch=None): - warnings.warn('Iterator class will retire in 0.8.0 release', RuntimeWarning) + warnings.warn('Iterator class will retire in 0.8.0 release and stay in torchtext.legacy. See 0.7.0 release note for the replacement.', UserWarning) self.batch_size, self.train, self.dataset = batch_size, train, dataset self.batch_size_fn = batch_size_fn self.iterations = 0 From e55aea59bd1c42b68261eb325d85be025b943bbe Mon Sep 17 00:00:00 2001 From: Guanheng Zhang Date: Sun, 12 Jul 2020 15:26:43 -0700 Subject: [PATCH 3/7] update --- torchtext/data/batch.py | 2 +- torchtext/data/field.py | 10 +++++----- torchtext/data/iterator.py | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/torchtext/data/batch.py b/torchtext/data/batch.py index 14667d7958..09e5ca6b71 100644 --- a/torchtext/data/batch.py +++ b/torchtext/data/batch.py @@ -20,7 +20,7 @@ class Batch(object): def __init__(self, data=None, dataset=None, device=None): """Create a Batch from a list of examples.""" - warnings.warn('Batch class will retire in 0.8.0 release and stay in torchtext.legacy. See 0.7.0 release note for the replacement.', UserWarning) + warnings.warn('{} class will retire in 0.8.0 release and stay in torchtext.legacy. See 0.7.0 release note for the replacement.'.format(self.__class__.__name__), UserWarning) if data is not None: self.batch_size = len(data) self.dataset = dataset diff --git a/torchtext/data/field.py b/torchtext/data/field.py index 8a636a7ac5..95a8907980 100644 --- a/torchtext/data/field.py +++ b/torchtext/data/field.py @@ -33,7 +33,7 @@ class RawField(object): """ def __init__(self, preprocessing=None, postprocessing=None, is_target=False): - warnings.warn('Field class will retire in 0.8.0 release and stay in torchtext.legacy. See 0.7.0 release note for the replacement.', UserWarning) + warnings.warn('{} class will retire in 0.8.0 release and stay in torchtext.legacy. See 0.7.0 release note for the replacement.'.format(self.__class__.__name__), UserWarning) self.preprocessing = preprocessing self.postprocessing = postprocessing self.is_target = is_target @@ -147,7 +147,7 @@ def __init__(self, sequential=True, use_vocab=True, init_token=None, batch_first=False, pad_token="", unk_token="", pad_first=False, truncate_first=False, stop_words=None, is_target=False): - warnings.warn('Field class will retire in 0.8.0 release and stay in torchtext.legacy. See 0.7.0 release note for the replacement.', UserWarning) + warnings.warn('{} class will retire in 0.8.0 release and stay in torchtext.legacy. See 0.7.0 release note for the replacement.'.format(self.__class__.__name__), UserWarning) self.sequential = sequential self.use_vocab = use_vocab self.init_token = init_token @@ -367,7 +367,7 @@ def numericalize(self, arr, device=None): class ReversibleField(Field): def __init__(self, **kwargs): - warnings.warn('Field class will retire in 0.8.0 release and stay in torchtext.legacy. See 0.7.0 release note for the replacement.', UserWarning) + warnings.warn('{} class will retire in 0.8.0 release and stay in torchtext.legacy. See 0.7.0 release note for the replacement.'.format(self.__class__.__name__), UserWarning) if kwargs.get('tokenize') is list: self.use_revtok = False else: @@ -414,7 +414,7 @@ class SubwordField(ReversibleField): vocab_cls = SubwordVocab def __init__(self, **kwargs): - warnings.warn('Field class will retire in 0.8.0 release and stay in torchtext.legacy. See 0.7.0 release note for the replacement.', UserWarning) + warnings.warn('{} class will retire in 0.8.0 release and stay in torchtext.legacy. See 0.7.0 release note for the replacement.'.format(self.__class__.__name__), UserWarning) kwargs['tokenize'] = 'subword' if 'unk_token' not in kwargs: kwargs['unk_token'] = '�' @@ -495,7 +495,7 @@ def __init__(self, nesting_field, use_vocab=True, init_token=None, eos_token=Non postprocessing=None, tokenize=None, tokenizer_language='en', include_lengths=False, pad_token='', pad_first=False, truncate_first=False): - warnings.warn('Field class will retire in 0.8.0 release and stay in torchtext.legacy. See 0.7.0 release note for the replacement.', UserWarning) + warnings.warn('{} class will retire in 0.8.0 release and stay in torchtext.legacy. See 0.7.0 release note for the replacement.'.format(self.__class__.__name__), UserWarning) if isinstance(nesting_field, NestedField): raise ValueError('nesting field must not be another NestedField') if nesting_field.include_lengths: diff --git a/torchtext/data/iterator.py b/torchtext/data/iterator.py index 4df3dc851d..1351a26d90 100644 --- a/torchtext/data/iterator.py +++ b/torchtext/data/iterator.py @@ -45,7 +45,7 @@ def __init__(self, dataset, batch_size, sort_key=None, device=None, batch_size_fn=None, train=True, repeat=False, shuffle=None, sort=None, sort_within_batch=None): - warnings.warn('Iterator class will retire in 0.8.0 release and stay in torchtext.legacy. See 0.7.0 release note for the replacement.', UserWarning) + warnings.warn('{} class will retire in 0.8.0 release and stay in torchtext.legacy. See 0.7.0 release note for the replacement.'.format(self.__class__.__name__), UserWarning) self.batch_size, self.train, self.dataset = batch_size, train, dataset self.batch_size_fn = batch_size_fn self.iterations = 0 From 408013be879f0e9dd51128c47d9b8b1c356af8ef Mon Sep 17 00:00:00 2001 From: Guanheng Zhang Date: Tue, 14 Jul 2020 12:29:41 -0700 Subject: [PATCH 4/7] update third_party --- third_party/re2 | 2 +- third_party/sentencepiece | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/third_party/re2 b/third_party/re2 index 2b25567a8e..fe8a81adc2 160000 --- a/third_party/re2 +++ b/third_party/re2 @@ -1 +1 @@ -Subproject commit 2b25567a8ee3b6e97c3cd05d616f296756c52759 +Subproject commit fe8a81adc2ef24b99d44fb87e882d7f2cd504b91 diff --git a/third_party/sentencepiece b/third_party/sentencepiece index e8a84a16d1..72ccd5f13b 160000 --- a/third_party/sentencepiece +++ b/third_party/sentencepiece @@ -1 +1 @@ -Subproject commit e8a84a16d13e8bf92892a1cd92e4de3b0d0321fd +Subproject commit 72ccd5f13b6e2a2de6e0dd879905a912171d1022 From 790364481cd319c417ab0c7f207e828744e1acdf Mon Sep 17 00:00:00 2001 From: Guanheng Zhang Date: Tue, 14 Jul 2020 12:35:10 -0700 Subject: [PATCH 5/7] update warning --- torchtext/data/batch.py | 2 +- torchtext/data/example.py | 10 +++++----- torchtext/data/field.py | 10 +++++----- torchtext/data/iterator.py | 2 +- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/torchtext/data/batch.py b/torchtext/data/batch.py index 09e5ca6b71..f345a82e19 100644 --- a/torchtext/data/batch.py +++ b/torchtext/data/batch.py @@ -20,7 +20,7 @@ class Batch(object): def __init__(self, data=None, dataset=None, device=None): """Create a Batch from a list of examples.""" - warnings.warn('{} class will retire in 0.8.0 release and stay in torchtext.legacy. See 0.7.0 release note for the replacement.'.format(self.__class__.__name__), UserWarning) + warnings.warn('{} class will be retired in the 0.8.0 release and moved to torchtext.legacy. Please see 0.7.0 release notes for further information.'.format(self.__class__.__name__), UserWarning) if data is not None: self.batch_size = len(data) self.dataset = dataset diff --git a/torchtext/data/example.py b/torchtext/data/example.py index cf8f926613..7ccd660f95 100644 --- a/torchtext/data/example.py +++ b/torchtext/data/example.py @@ -10,7 +10,7 @@ class Example(object): """ @classmethod def fromJSON(cls, data, fields): - warnings.warn('Example class will retire in 0.8.0 release and stay in torchtext.legacy. See 0.7.0 release note for the replacement.', UserWarning) + warnings.warn('Example class will be retired in the 0.8.0 release and moved to torchtext.legacy. Please see 0.7.0 release note for further information.', UserWarning) ex = cls() obj = json.loads(data) @@ -49,7 +49,7 @@ def reducer(obj, key): @classmethod def fromdict(cls, data, fields): - warnings.warn('Example class will retire in 0.8.0 release and stay in torchtext.legacy. See 0.7.0 release note for the replacement.', UserWarning) + warnings.warn('Example class will be retired in the 0.8.0 release and moved to torchtext.legacy. Please see 0.7.0 release note for further information.', UserWarning) ex = cls() for key, vals in fields.items(): if key not in data: @@ -65,7 +65,7 @@ def fromdict(cls, data, fields): @classmethod def fromCSV(cls, data, fields, field_to_index=None): - warnings.warn('Example class will retire in 0.8.0 release and stay in torchtext.legacy. See 0.7.0 release note for the replacement.', UserWarning) + warnings.warn('Example class will be retired in the 0.8.0 release and moved to torchtext.legacy. Please see 0.7.0 release note for further information.', UserWarning) if field_to_index is None: return cls.fromlist(data, fields) else: @@ -75,7 +75,7 @@ def fromCSV(cls, data, fields, field_to_index=None): @classmethod def fromlist(cls, data, fields): - warnings.warn('Example class will retire in 0.8.0 release and stay in torchtext.legacy. See 0.7.0 release note for the replacement.', UserWarning) + warnings.warn('Example class will be retired in the 0.8.0 release and moved to torchtext.legacy. Please see 0.7.0 release note for further information.', UserWarning) ex = cls() for (name, field), val in zip(fields, data): if field is not None: @@ -91,7 +91,7 @@ def fromlist(cls, data, fields): @classmethod def fromtree(cls, data, fields, subtrees=False): - warnings.warn('Example class will retire in 0.8.0 release and stay in torchtext.legacy. See 0.7.0 release note for the replacement.', UserWarning) + warnings.warn('Example class will be retired in the 0.8.0 release and moved to torchtext.legacy. Please see 0.7.0 release note for further information.', UserWarning) try: from nltk.tree import Tree except ImportError: diff --git a/torchtext/data/field.py b/torchtext/data/field.py index 95a8907980..6054f1a510 100644 --- a/torchtext/data/field.py +++ b/torchtext/data/field.py @@ -33,7 +33,7 @@ class RawField(object): """ def __init__(self, preprocessing=None, postprocessing=None, is_target=False): - warnings.warn('{} class will retire in 0.8.0 release and stay in torchtext.legacy. See 0.7.0 release note for the replacement.'.format(self.__class__.__name__), UserWarning) + warnings.warn('{} class will be retired in the 0.8.0 release and moved to torchtext.legacy. Please see 0.7.0 release notes for further information.'.format(self.__class__.__name__), UserWarning) self.preprocessing = preprocessing self.postprocessing = postprocessing self.is_target = is_target @@ -147,7 +147,7 @@ def __init__(self, sequential=True, use_vocab=True, init_token=None, batch_first=False, pad_token="", unk_token="", pad_first=False, truncate_first=False, stop_words=None, is_target=False): - warnings.warn('{} class will retire in 0.8.0 release and stay in torchtext.legacy. See 0.7.0 release note for the replacement.'.format(self.__class__.__name__), UserWarning) + warnings.warn('{} class will be retired in the 0.8.0 release and moved to torchtext.legacy. Please see 0.7.0 release notes for further information.'.format(self.__class__.__name__), UserWarning) self.sequential = sequential self.use_vocab = use_vocab self.init_token = init_token @@ -367,7 +367,7 @@ def numericalize(self, arr, device=None): class ReversibleField(Field): def __init__(self, **kwargs): - warnings.warn('{} class will retire in 0.8.0 release and stay in torchtext.legacy. See 0.7.0 release note for the replacement.'.format(self.__class__.__name__), UserWarning) + warnings.warn('{} class will be retired in the 0.8.0 release and moved to torchtext.legacy. Please see 0.7.0 release notes for further information.'.format(self.__class__.__name__), UserWarning) if kwargs.get('tokenize') is list: self.use_revtok = False else: @@ -414,7 +414,7 @@ class SubwordField(ReversibleField): vocab_cls = SubwordVocab def __init__(self, **kwargs): - warnings.warn('{} class will retire in 0.8.0 release and stay in torchtext.legacy. See 0.7.0 release note for the replacement.'.format(self.__class__.__name__), UserWarning) + warnings.warn('{} class will be retired in the 0.8.0 release and moved to torchtext.legacy. Please see 0.7.0 release notes for further information.'.format(self.__class__.__name__), UserWarning) kwargs['tokenize'] = 'subword' if 'unk_token' not in kwargs: kwargs['unk_token'] = '�' @@ -495,7 +495,7 @@ def __init__(self, nesting_field, use_vocab=True, init_token=None, eos_token=Non postprocessing=None, tokenize=None, tokenizer_language='en', include_lengths=False, pad_token='', pad_first=False, truncate_first=False): - warnings.warn('{} class will retire in 0.8.0 release and stay in torchtext.legacy. See 0.7.0 release note for the replacement.'.format(self.__class__.__name__), UserWarning) + warnings.warn('{} class will be retired in the 0.8.0 release and moved to torchtext.legacy. Please see 0.7.0 release notes for further information.'.format(self.__class__.__name__), UserWarning) if isinstance(nesting_field, NestedField): raise ValueError('nesting field must not be another NestedField') if nesting_field.include_lengths: diff --git a/torchtext/data/iterator.py b/torchtext/data/iterator.py index 1351a26d90..bc4d410464 100644 --- a/torchtext/data/iterator.py +++ b/torchtext/data/iterator.py @@ -45,7 +45,7 @@ def __init__(self, dataset, batch_size, sort_key=None, device=None, batch_size_fn=None, train=True, repeat=False, shuffle=None, sort=None, sort_within_batch=None): - warnings.warn('{} class will retire in 0.8.0 release and stay in torchtext.legacy. See 0.7.0 release note for the replacement.'.format(self.__class__.__name__), UserWarning) + warnings.warn('{} class will be retired in the 0.8.0 release and moved to torchtext.legacy. Please see 0.7.0 release notes for further information.'.format(self.__class__.__name__), UserWarning) self.batch_size, self.train, self.dataset = batch_size, train, dataset self.batch_size_fn = batch_size_fn self.iterations = 0 From bf7a59d6fa41d02acfb58e950c8f86001d508485 Mon Sep 17 00:00:00 2001 From: Guanheng Zhang Date: Tue, 14 Jul 2020 13:22:59 -0700 Subject: [PATCH 6/7] update to release notes --- torchtext/data/example.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/torchtext/data/example.py b/torchtext/data/example.py index 7ccd660f95..a5d29ef42a 100644 --- a/torchtext/data/example.py +++ b/torchtext/data/example.py @@ -10,7 +10,7 @@ class Example(object): """ @classmethod def fromJSON(cls, data, fields): - warnings.warn('Example class will be retired in the 0.8.0 release and moved to torchtext.legacy. Please see 0.7.0 release note for further information.', UserWarning) + warnings.warn('Example class will be retired in the 0.8.0 release and moved to torchtext.legacy. Please see 0.7.0 release notes for further information.', UserWarning) ex = cls() obj = json.loads(data) @@ -49,7 +49,7 @@ def reducer(obj, key): @classmethod def fromdict(cls, data, fields): - warnings.warn('Example class will be retired in the 0.8.0 release and moved to torchtext.legacy. Please see 0.7.0 release note for further information.', UserWarning) + warnings.warn('Example class will be retired in the 0.8.0 release and moved to torchtext.legacy. Please see 0.7.0 release notes for further information.', UserWarning) ex = cls() for key, vals in fields.items(): if key not in data: @@ -65,7 +65,7 @@ def fromdict(cls, data, fields): @classmethod def fromCSV(cls, data, fields, field_to_index=None): - warnings.warn('Example class will be retired in the 0.8.0 release and moved to torchtext.legacy. Please see 0.7.0 release note for further information.', UserWarning) + warnings.warn('Example class will be retired in the 0.8.0 release and moved to torchtext.legacy. Please see 0.7.0 release notes for further information.', UserWarning) if field_to_index is None: return cls.fromlist(data, fields) else: @@ -75,7 +75,7 @@ def fromCSV(cls, data, fields, field_to_index=None): @classmethod def fromlist(cls, data, fields): - warnings.warn('Example class will be retired in the 0.8.0 release and moved to torchtext.legacy. Please see 0.7.0 release note for further information.', UserWarning) + warnings.warn('Example class will be retired in the 0.8.0 release and moved to torchtext.legacy. Please see 0.7.0 release notes for further information.', UserWarning) ex = cls() for (name, field), val in zip(fields, data): if field is not None: @@ -91,7 +91,7 @@ def fromlist(cls, data, fields): @classmethod def fromtree(cls, data, fields, subtrees=False): - warnings.warn('Example class will be retired in the 0.8.0 release and moved to torchtext.legacy. Please see 0.7.0 release note for further information.', UserWarning) + warnings.warn('Example class will be retired in the 0.8.0 release and moved to torchtext.legacy. Please see 0.7.0 release notes for further information.', UserWarning) try: from nltk.tree import Tree except ImportError: From 8ed61483b1d6722634543125c3b4bb076e3e3063 Mon Sep 17 00:00:00 2001 From: Guanheng Zhang Date: Tue, 14 Jul 2020 14:48:56 -0700 Subject: [PATCH 7/7] update submodule --- third_party/re2 | 2 +- third_party/sentencepiece | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/third_party/re2 b/third_party/re2 index fe8a81adc2..2b25567a8e 160000 --- a/third_party/re2 +++ b/third_party/re2 @@ -1 +1 @@ -Subproject commit fe8a81adc2ef24b99d44fb87e882d7f2cd504b91 +Subproject commit 2b25567a8ee3b6e97c3cd05d616f296756c52759 diff --git a/third_party/sentencepiece b/third_party/sentencepiece index 72ccd5f13b..e8a84a16d1 160000 --- a/third_party/sentencepiece +++ b/third_party/sentencepiece @@ -1 +1 @@ -Subproject commit 72ccd5f13b6e2a2de6e0dd879905a912171d1022 +Subproject commit e8a84a16d13e8bf92892a1cd92e4de3b0d0321fd