* rename DataSet.get_fields() into get_all_fields()

* add DataSet.get_field(), to fetch a FieldArray based on its name
* remove old tutorials & add new tutorials

Author: FengZiYjun

fastNLP/api/processor.py

@@ -268,7 +268,7 @@ def __init__(self, field_dict, default=False):
         self.default = default
 
     def process(self, dataset):
-        set_dict = {name: self.default for name in dataset.get_fields().keys()}
+        set_dict = {name: self.default for name in dataset.get_all_fields().keys()}
         set_dict.update(self.field_dict)
         dataset._set_need_tensor(**set_dict)
         return dataset
@@ -282,7 +282,7 @@ def __init__(self, field_dict, default=False):
         self.default = default
 
     def process(self, dataset):
-        set_dict = {name: self.default for name in dataset.get_fields().keys()}
+        set_dict = {name: self.default for name in dataset.get_all_fields().keys()}
         set_dict.update(self.field_dict)
         dataset.set_target(**set_dict)
         return dataset

fastNLP/core/batch.py

@@ -43,7 +43,7 @@ def __next__(self):
 
             indices = self.idx_list[self.curidx:endidx]
 
-            for field_name, field in self.dataset.get_fields().items():
+            for field_name, field in self.dataset.get_all_fields().items():
                 if field.is_target or field.is_input:
                     batch = field.get(indices)
                     if not self.as_numpy:

fastNLP/core/dataset.py

@@ -157,7 +157,12 @@ def delete_field(self, name):
         """
         self.field_arrays.pop(name)
 
-    def get_fields(self):
+    def get_field(self, field_name):
+        if field_name not in self.field_arrays:
+            raise KeyError("Field name {} not found in DataSet".format(field_name))
+        return self.field_arrays[field_name]
+
+    def get_all_fields(self):
         """Return all the fields with their names.
 
         :return dict field_arrays: the internal data structure of DataSet.

fastNLP/core/sampler.py

@@ -55,7 +55,7 @@ def __init__(self, num_buckets=10, batch_size=32, seq_lens_field_name='seq_lens'
 
     def __call__(self, data_set):
 
-        seq_lens = data_set.get_fields()[self.seq_lens_field_name].content
+        seq_lens = data_set.get_all_fields()[self.seq_lens_field_name].content
         total_sample_num = len(seq_lens)
 
         bucket_indexes = []

fastNLP/models/cnn_text_classification.py

@@ -44,7 +44,7 @@ def forward(self, word_seq):
         x = self.conv_pool(x)  # [N,L,C] -> [N,C]
         x = self.dropout(x)
         x = self.fc(x)  # [N,C] -> [N, N_class]
-        return {'output': x}
+        return {'pred': x}
 
     def predict(self, word_seq):
         """
@@ -53,5 +53,5 @@ def predict(self, word_seq):
         :return predict: dict of torch.LongTensor, [batch_size, seq_len]
         """
         output = self(word_seq)
-        _, predict = output['output'].max(dim=1)
-        return {'predict': predict}
+        _, predict = output['pred'].max(dim=1)
+        return {'pred': predict}

test/core/test_dataset.py

@@ -2,6 +2,7 @@
 import unittest
 
 from fastNLP.core.dataset import DataSet
+from fastNLP.core.fieldarray import FieldArray
 from fastNLP.core.instance import Instance
 
 
@@ -162,6 +163,21 @@ def test_save_load(self):
         ds_1 = DataSet.load("./my_ds.pkl")
         os.remove("my_ds.pkl")
 
+    def test_get_all_fields(self):
+        ds = DataSet({"x": [[1, 2, 3, 4]] * 10, "y": [[5, 6]] * 10})
+        ans = ds.get_all_fields()
+        self.assertEqual(ans["x"].content, [[1, 2, 3, 4]] * 10)
+        self.assertEqual(ans["y"].content, [[5, 6]] * 10)
+
+    def test_get_field(self):
+        ds = DataSet({"x": [[1, 2, 3, 4]] * 10, "y": [[5, 6]] * 10})
+        ans = ds.get_field("x")
+        self.assertTrue(isinstance(ans, FieldArray))
+        self.assertEqual(ans.content, [[1, 2, 3, 4]] * 10)
+        ans = ds.get_field("y")
+        self.assertTrue(isinstance(ans, FieldArray))
+        self.assertEqual(ans.content, [[5, 6]] * 10)
+
 
 class TestDataSetIter(unittest.TestCase):
     def test__repr__(self):

test/data_for_tests/tutorial_sample_dataset.csv

@@ -35,4 +35,43 @@ There 's very little sense to what 's going on here , but the makers serve up th
 Cattaneo should have followed the runaway success of his first film , The Full Monty , with something different .	2
 They 're the unnamed , easily substitutable forces that serve as whatever terror the heroes of horror movies try to avoid .	1
 It almost feels as if the movie is more interested in entertaining itself than in amusing us .	1
-The movie 's progression into rambling incoherence gives new meaning to the phrase ` fatal script error . '	0
+The movie 's progression into rambling incoherence gives new meaning to the phrase ` fatal script error . '	0
+I still like Moonlight Mile , better judgment be damned .	3
+A welcome relief from baseball movies that try too hard to be mythic , this one is a sweet and modest and ultimately winning story .	3
+a bilingual charmer , just like the woman who inspired it	3
+Like a less dizzily gorgeous companion to Mr. Wong 's In the Mood for Love -- very much a Hong Kong movie despite its mainland setting .	2
+As inept as big-screen remakes of The Avengers and The Wild Wild West .	1
+It 's everything you 'd expect -- but nothing more .	2
+Best indie of the year , so far .	4
+Hatfield and Hicks make the oddest of couples , and in this sense the movie becomes a study of the gambles of the publishing world , offering a case study that exists apart from all the movie 's political ramifications .	3
+It 's like going to a house party and watching the host defend himself against a frothing ex-girlfriend .	1
+That the Chuck Norris `` grenade gag '' occurs about 7 times during Windtalkers is a good indication of how serious-minded the film is .	2
+The plot is romantic comedy boilerplate from start to finish .	2
+It arrives with an impeccable pedigree , mongrel pep , and almost indecipherable plot complications .	2
+A film that clearly means to preach exclusively to the converted .	2
+I still like Moonlight Mile , better judgment be damned .	3
+A welcome relief from baseball movies that try too hard to be mythic , this one is a sweet and modest and ultimately winning story .	3
+a bilingual charmer , just like the woman who inspired it	3
+Like a less dizzily gorgeous companion to Mr. Wong 's In the Mood for Love -- very much a Hong Kong movie despite its mainland setting .	2
+As inept as big-screen remakes of The Avengers and The Wild Wild West .	1
+It 's everything you 'd expect -- but nothing more .	2
+Best indie of the year , so far .	4
+Hatfield and Hicks make the oddest of couples , and in this sense the movie becomes a study of the gambles of the publishing world , offering a case study that exists apart from all the movie 's political ramifications .	3
+It 's like going to a house party and watching the host defend himself against a frothing ex-girlfriend .	1
+That the Chuck Norris `` grenade gag '' occurs about 7 times during Windtalkers is a good indication of how serious-minded the film is .	2
+The plot is romantic comedy boilerplate from start to finish .	2
+It arrives with an impeccable pedigree , mongrel pep , and almost indecipherable plot complications .	2
+A film that clearly means to preach exclusively to the converted .	2
+I still like Moonlight Mile , better judgment be damned .	3
+A welcome relief from baseball movies that try too hard to be mythic , this one is a sweet and modest and ultimately winning story .	3
+a bilingual charmer , just like the woman who inspired it	3
+Like a less dizzily gorgeous companion to Mr. Wong 's In the Mood for Love -- very much a Hong Kong movie despite its mainland setting .	2
+As inept as big-screen remakes of The Avengers and The Wild Wild West .	1
+It 's everything you 'd expect -- but nothing more .	2
+Best indie of the year , so far .	4
+Hatfield and Hicks make the oddest of couples , and in this sense the movie becomes a study of the gambles of the publishing world , offering a case study that exists apart from all the movie 's political ramifications .	3
+It 's like going to a house party and watching the host defend himself against a frothing ex-girlfriend .	1
+That the Chuck Norris `` grenade gag '' occurs about 7 times during Windtalkers is a good indication of how serious-minded the film is .	2
+The plot is romantic comedy boilerplate from start to finish .	2
+It arrives with an impeccable pedigree , mongrel pep , and almost indecipherable plot complications .	2
+A film that clearly means to preach exclusively to the converted .	2