address comments

Author: Sheng Zha

python/mxnet/gluon/contrib/__init__.py

@@ -21,3 +21,5 @@
 from . import nn
 
 from . import rnn
+
+from . import data

python/mxnet/gluon/contrib/data/__init__.py

@@ -0,0 +1,22 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+# coding: utf-8
+# pylint: disable=wildcard-import
+"""Contrib datasets."""
+
+from . import text

python/mxnet/gluon/data/text.py renamed to python/mxnet/gluon/contrib/data/text.py

@@ -26,10 +26,10 @@
 import shutil
 import numpy as np
 
-from . import dataset
-from ..utils import download, check_sha1
-from ...contrib import text
-from ... import nd
+from ...data import dataset
+from ...utils import download, check_sha1
+from ....contrib import text
+from .... import nd
 
 
 class WikiText2(dataset._DownloadedDataset):

python/mxnet/gluon/data/__init__.py

@@ -26,5 +26,3 @@
 from .dataloader import *
 
 from . import vision
-
-from . import text

python/mxnet/gluon/data/sampler.py

@@ -145,6 +145,8 @@ class IntervalSampler(Sampler):
     ----------
     length : int
         Length of the sequence.
+    interval : int
+        The number of items to skip between two samples.
 
     Examples
     --------
@@ -153,6 +155,8 @@ class IntervalSampler(Sampler):
     [0, 3, 6, 9, 12, 1, 4, 7, 10, 2, 5, 8, 11]
     """
     def __init__(self, length, interval):
+        assert interval < length, \
+            "Interval {} must be smaller than length {}".format(interval, length)
         self._length = length
         self._interval = interval
 

tests/python/unittest/test_gluon_contrib.py

@@ -172,6 +172,11 @@ def test_identity():
     mx.test_utils.assert_almost_equal(model(x).asnumpy(),
                                       x.asnumpy())
 
+def test_datasets():
+    assert len(contrib.data.text.WikiText2(root='data/wikitext-2', segment='train')) == 42780
+    assert len(contrib.data.text.WikiText2(root='data/wikitext-2', segment='validation')) == 632
+    assert len(contrib.data.text.WikiText2(root='data/wikitext-2', segment='test')) == 15941
+
 
 if __name__ == '__main__':
     import nose

tests/python/unittest/test_gluon_data.py

@@ -87,9 +87,6 @@ def test_datasets():
     assert len(gluon.data.vision.CIFAR100(root='data/cifar100')) == 50000
     assert len(gluon.data.vision.CIFAR100(root='data/cifar100', fine_label=True)) == 50000
     assert len(gluon.data.vision.CIFAR100(root='data/cifar100', train=False)) == 10000
-    assert len(gluon.data.text.WikiText2(root='data/wikitext-2', segment='train')) == 42780
-    assert len(gluon.data.text.WikiText2(root='data/wikitext-2', segment='validation')) == 632
-    assert len(gluon.data.text.WikiText2(root='data/wikitext-2', segment='test')) == 15941
 
 def test_image_folder_dataset():
     prepare_record()