update dataset to use acceleration (#7821)

apache · Sep 10, 2017 · 1175a1e · 1175a1e
1 parent 2abee10
commit 1175a1e
Show file tree

Hide file tree

Showing 10 changed files with 22 additions and 21 deletions.
diff --git a/R-package/README.md b/R-package/README.md
@@ -19,7 +19,7 @@ You can install the CPU package directly from the R console:
 
 ```r
 cran <- getOption("repos")
-cran["dmlc"] <- "https://s3-us-west-2.amazonaws.com/apache-mxnet/R/CRAN/"
+cran["dmlc"] <- "https://apache-mxnet.s3-accelerate.dualstack.amazonaws.com/R/CRAN/"
 options(repos = cran)
 install.packages("mxnet")
 ```

diff --git a/R-package/tests/testthat/get_data.R b/R-package/tests/testthat/get_data.R
@@ -19,7 +19,7 @@ GetMNIST_csv <- function() {
   }
   if (!file.exists('data/train.csv') |
       !file.exists('data/test.csv')) {
-    download.file('https://s3-us-west-2.amazonaws.com/apache-mxnet/R/data/mnist_csv.zip',
+    download.file('https://apache-mxnet.s3-accelerate.dualstack.amazonaws.com/R/data/mnist_csv.zip',
                   destfile = 'data/mnist_csv.zip')
     unzip('data/mnist_csv.zip', exdir = 'data/')
     file.remove('data/mnist_csv.zip')
@@ -61,7 +61,7 @@ GetCatDog <- function() {
   }
   if (!file.exists('data/cats_dogs/cats_dogs_train.rec') |
       !file.exists('data/cats_dogs/cats_dogs_val.rec')) {
-    download.file('https://s3-us-west-2.amazonaws.com/apache-mxnet/R/data/cats_dogs.zip',
+    download.file('https://apache-mxnet.s3-accelerate.dualstack.amazonaws.com/R/data/cats_dogs.zip',
                   destfile = 'data/cats_dogs.zip')
     unzip('data/cats_dogs.zip', exdir = 'data/')
     file.remove('data/cats_dogs.zip')
@@ -86,7 +86,7 @@ GetISBI_data <- function() {
   }
   if (!file.exists('data/ISBI/train-volume.tif') |
       !file.exists('data/ISBI/train-labels.tif')) {
-    download.file('https://s3-us-west-2.amazonaws.com/apache-mxnet/R/data/ISBI.zip',
+    download.file('https://apache-mxnet.s3-accelerate.dualstack.amazonaws.com/R/data/ISBI.zip',
                   destfile = 'data/ISBI.zip')
     unzip('data/ISBI.zip', exdir = 'data/')
     file.remove('data/ISBI.zip')
@@ -99,7 +99,7 @@ GetCaptcha_data <- function() {
   }
   if (!file.exists('data/captcha_example/captcha_train.rec') |
       !file.exists('data/captcha_example/captcha_test.rec')) {
-    download.file('https://s3-us-west-2.amazonaws.com/apache-mxnet/R/data/captcha_example.zip',
+    download.file('https://apache-mxnet.s3-accelerate.dualstack.amazonaws.com/R/data/captcha_example.zip',
                   destfile = 'data/captcha_example.zip')
     unzip('data/captcha_example.zip', exdir = 'data/')
     file.remove('data/captcha_example.zip')

diff --git a/R-package/vignettes/CustomIterator.Rmd b/R-package/vignettes/CustomIterator.Rmd
@@ -10,7 +10,7 @@ The data we are going to use is the [MNIST dataset](http://yann.lecun.com/exdb/m
 To download the data:
 
 ```{r}
-download.file('https://s3-us-west-2.amazonaws.com/apache-mxnet/R/data/mnist_csv.zip',
+download.file('https://apache-mxnet.s3-accelerate.dualstack.amazonaws.com/R/data/mnist_csv.zip',
               destfile = 'mnist_csv.zip')
 unzip('mnist_csv.zip', exdir = '.')
 ```

diff --git a/R-package/vignettes/mnistCompetition.Rmd b/R-package/vignettes/mnistCompetition.Rmd
@@ -10,7 +10,7 @@ First, let us download the data from [here](https://www.kaggle.com/c/digit-recog
 Then we can read them in R and convert to matrices.
 
 ```{r, echo=FALSE}
-download.file('https://s3-us-west-2.amazonaws.com/apache-mxnet/R/data/mnist_csv.zip', destfile = 'mnist_csv.zip')
+download.file('https://apache-mxnet.s3-accelerate.dualstack.amazonaws.com/R/data/mnist_csv.zip', destfile = 'mnist_csv.zip')
 unzip('mnist_csv.zip', exdir = '.')
 ```
 

diff --git a/docs/install/index.md b/docs/install/index.md
@@ -725,7 +725,7 @@ The CPU version of MXNet R package can be installed in R like other packages
 
 ```r
 cran <- getOption("repos")
-cran["dmlc"] <- "https://s3-us-west-2.amazonaws.com/apache-mxnet/R/CRAN/"
+cran["dmlc"] <- "https://apache-mxnet.s3-accelerate.dualstack.amazonaws.com/R/CRAN/"
 options(repos = cran)
 install.packages("mxnet")
 ```
@@ -890,7 +890,7 @@ The CPU version of MXNet R package can be installed in R like other packages
 
 ```r
 cran <- getOption("repos")
-cran["dmlc"] <- "https://s3-us-west-2.amazonaws.com/apache-mxnet/R/CRAN/"
+cran["dmlc"] <- "https://apache-mxnet.s3-accelerate.dualstack.amazonaws.com/R/CRAN/"
 options(repos = cran)
 install.packages("mxnet")
 ```
@@ -906,7 +906,7 @@ The GPU version of MXNet R package can be installed in R like other packages
 
 ```r
 cran <- getOption("repos")
-cran["dmlc"] <- "https://s3-us-west-2.amazonaws.com/apache-mxnet/R/CRAN/GPU"
+cran["dmlc"] <- "https://apache-mxnet.s3-accelerate.dualstack.amazonaws.com/R/CRAN/GPU"
 options(repos = cran)
 install.packages("mxnet")
 ```
@@ -1475,4 +1475,4 @@ Will be available soon.
 </div>
 </div>
 
-# Download Source Package
+# Download Source Package
diff --git a/docs/install/osx_setup.md b/docs/install/osx_setup.md
@@ -118,7 +118,7 @@ For OS X (Mac) users, MXNet provides a prebuilt binary package for CPUs. The pre
 
 ```r
   cran <- getOption("repos")
-  cran["dmlc"] <- "https://s3-us-west-2.amazonaws.com/apache-mxnet/R/CRAN/"
+  cran["dmlc"] <- "https://apache-mxnet.s3-accelerate.dualstack.amazonaws.com/R/CRAN/"
   options(repos = cran)
   install.packages("mxnet")
 ```

diff --git a/docs/install/windows_setup.md b/docs/install/windows_setup.md
@@ -99,7 +99,7 @@ For CPU-only package:
 
 ```r
   cran <- getOption("repos")
-  cran["dmlc"] <- "https://s3-us-west-2.amazonaws.com/apache-mxnet/R/CRAN/"
+  cran["dmlc"] <- "https://apache-mxnet.s3-accelerate.dualstack.amazonaws.com/R/CRAN/"
   options(repos = cran)
   install.packages("mxnet")
 ```
@@ -108,7 +108,7 @@ For GPU-enabled package:
 
 ```r
   cran <- getOption("repos")
-  cran["dmlc"] <- "https://s3-us-west-2.amazonaws.com/apache-mxnet/R/CRAN/GPU"
+  cran["dmlc"] <- "https://apache-mxnet.s3-accelerate.dualstack.amazonaws.com/R/CRAN/GPU"
   options(repos = cran)
   install.packages("mxnet")
 ```

diff --git a/example/captcha/README.md b/example/captcha/README.md
@@ -2,4 +2,4 @@ This is the R version of [captcha recognition](http://blog.xlvector.net/2016-05/
 
 ![](captcha_example.png)
 
-You can download the images and `.rec` files from [here](https://s3-us-west-2.amazonaws.com/apache-mxnet/R/data/captcha_example.zip). Since each image has 4 labels, please remember to use `label_width=4` when generating the `.rec` files.
+You can download the images and `.rec` files from [here](https://apache-mxnet.s3-accelerate.dualstack.amazonaws.com/R/data/captcha_example.zip). Since each image has 4 labels, please remember to use `label_width=4` when generating the `.rec` files.
diff --git a/python/mxnet/gluon/data/vision.py b/python/mxnet/gluon/data/vision.py
@@ -74,7 +74,8 @@ class MNIST(_DownloadedDataset):
     """
     def __init__(self, root='~/.mxnet/datasets/mnist', train=True,
                  transform=None):
-        self._base_url = 'https://apache-mxnet.s3.amazonaws.com/gluon/dataset/mnist/'
+        self._base_url = 'https://apache-mxnet.s3-accelerate.dualstack.amazonaws.com' \
+                         '/gluon/dataset/mnist/'
         self._train_data = ('train-images-idx3-ubyte.gz',
                             '6c95f4b05d2bf285e1bfb0e7960c31bd3b3f8a7d')
         self._train_label = ('train-labels-idx1-ubyte.gz',
@@ -129,7 +130,8 @@ class FashionMNIST(MNIST):
     """
     def __init__(self, root='~/.mxnet/datasets/fashion-mnist', train=True,
                  transform=None):
-        self._base_url = 'https://apache-mxnet.s3.amazonaws.com/gluon/dataset/fashion-mnist/'
+        self._base_url = 'https://apache-mxnet.s3-accelerate.dualstack.amazonaws.com' \
+                         '/gluon/dataset/fashion-mnist/'
         self._train_data = ('train-images-idx3-ubyte.gz',
                             '0cf37b0d40ed5169c6b3aba31069a9770ac9043d')
         self._train_label = ('train-labels-idx1-ubyte.gz',

diff --git a/python/mxnet/gluon/model_zoo/model_store.py b/python/mxnet/gluon/model_zoo/model_store.py
@@ -50,8 +50,8 @@
     ('f713436691eee9a20d70a145ce0d53ed24bf7399', 'vgg19'),
     ('9730961c9cea43fd7eeefb00d792e386c45847d6', 'vgg19_bn')]}
 
-_url_format = 'https://{bucket}.s3.amazonaws.com/gluon/models/{file_name}.zip'
-bucket = 'apache-mxnet'
+_url_format = 'https://apache-mxnet.s3-accelerate.dualstack.amazonaws.com' \
+              '/gluon/models/{file_name}.zip'
 
 def short_hash(name):
     if name not in _model_sha1:
@@ -92,8 +92,7 @@ def get_model_file(name, local_dir=os.path.expanduser('~/.mxnet/models/')):
         os.makedirs(local_dir)
 
     zip_file_path = os.path.join(local_dir, file_name+'.zip')
-    download(_url_format.format(bucket=bucket,
-                                file_name=file_name),
+    download(_url_format.format(file_name=file_name),
              path=zip_file_path,
              overwrite=True)
     with zipfile.ZipFile(zip_file_path) as zf: