You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mxnet.apache.org by zh...@apache.org on 2018/03/08 18:36:22 UTC

[incubator-mxnet] branch master updated: update namespace (#10036)

This is an automated email from the ASF dual-hosted git repository.

zhreshold pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-mxnet.git


The following commit(s) were added to refs/heads/master by this push:
     new c162c9d  update namespace (#10036)
c162c9d is described below

commit c162c9dc7939c2cac75684de7805466c66a98b78
Author: Sheng Zha <sz...@users.noreply.github.com>
AuthorDate: Thu Mar 8 13:36:18 2018 -0500

    update namespace (#10036)
---
 python/mxnet/gluon/contrib/data/text.py    | 3 ++-
 python/mxnet/gluon/data/vision/datasets.py | 8 +++++---
 python/mxnet/gluon/utils.py                | 8 ++++----
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/python/mxnet/gluon/contrib/data/text.py b/python/mxnet/gluon/contrib/data/text.py
index 8f69dbd..98fe6b6 100644
--- a/python/mxnet/gluon/contrib/data/text.py
+++ b/python/mxnet/gluon/contrib/data/text.py
@@ -77,7 +77,8 @@ class _WikiText(_LanguageModelDataset):
         data_file_name, data_hash = self._data_file[self._segment]
         path = os.path.join(self._root, data_file_name)
         if not os.path.exists(path) or not check_sha1(path, data_hash):
-            downloaded_file_path = download(_get_repo_file_url(self._namespace, archive_file_name),
+            namespace = 'gluon/dataset/'+self._namespace
+            downloaded_file_path = download(_get_repo_file_url(namespace, archive_file_name),
                                             path=self._root,
                                             sha1_hash=archive_hash)
 
diff --git a/python/mxnet/gluon/data/vision/datasets.py b/python/mxnet/gluon/data/vision/datasets.py
index d199cad..88c0258 100644
--- a/python/mxnet/gluon/data/vision/datasets.py
+++ b/python/mxnet/gluon/data/vision/datasets.py
@@ -71,10 +71,11 @@ class MNIST(dataset._DownloadedDataset):
         else:
             data, label = self._test_data, self._test_label
 
-        data_file = download(_get_repo_file_url(self._namespace, data[0]),
+        namespace = 'gluon/dataset/'+self._namespace
+        data_file = download(_get_repo_file_url(namespace, data[0]),
                              path=self._root,
                              sha1_hash=data[1])
-        label_file = download(_get_repo_file_url(self._namespace, label[0]),
+        label_file = download(_get_repo_file_url(namespace, label[0]),
                               path=self._root,
                               sha1_hash=label[1])
 
@@ -168,7 +169,8 @@ class CIFAR10(dataset._DownloadedDataset):
         if any(not os.path.exists(path) or not check_sha1(path, sha1)
                for path, sha1 in ((os.path.join(self._root, name), sha1)
                                   for name, sha1 in self._train_data + self._test_data)):
-            filename = download(_get_repo_file_url(self._namespace, self._archive_file[0]),
+            namespace = 'gluon/dataset/'+self._namespace
+            filename = download(_get_repo_file_url(namespace, self._archive_file[0]),
                                 path=self._root,
                                 sha1_hash=self._archive_file[1])
 
diff --git a/python/mxnet/gluon/utils.py b/python/mxnet/gluon/utils.py
index 9ebfe4c..cb784b7 100644
--- a/python/mxnet/gluon/utils.py
+++ b/python/mxnet/gluon/utils.py
@@ -230,7 +230,7 @@ def _get_repo_url():
     return repo_url
 
 def _get_repo_file_url(namespace, filename):
-    """Return the URL for hoste file in Gluon repository.
+    """Return the URL for hosted file in Gluon repository.
 
     Parameters
     ----------
@@ -239,6 +239,6 @@ def _get_repo_file_url(namespace, filename):
     filename : str
         Name of the file
     """
-    return '{base_url}gluon/dataset/{namespace}/{filename}'.format(base_url=_get_repo_url(),
-                                                                   namespace=namespace,
-                                                                   filename=filename)
+    return '{base_url}{namespace}/{filename}'.format(base_url=_get_repo_url(),
+                                                     namespace=namespace,
+                                                     filename=filename)

-- 
To stop receiving notification emails like this one, please contact
zhreshold@apache.org.