Skip to content
This repository has been archived by the owner on Nov 17, 2023. It is now read-only.

Fixes for CI downloads (v1.3.x) #14525

Merged
merged 1 commit into from
Mar 26, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 26 additions & 7 deletions R-package/tests/testthat/get_data.R
Original file line number Diff line number Diff line change
@@ -1,3 +1,19 @@
# 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.

GetMNIST_ubyte <- function() {
if (!dir.exists("data")) {
Expand Down Expand Up @@ -45,13 +61,16 @@ GetInception <- function() {
if (!dir.exists("model")) {
dir.create("model/")
}
if (!file.exists('model/Inception-BN-0126.params')) {
download.file('http://data.dmlc.ml/models/imagenet/inception-bn/Inception-BN-0126.params',
destfile = 'model/Inception-BN-0126.params')
}
if (!file.exists('model/Inception-BN-symbol.json')) {
download.file('http://data.dmlc.ml/models/imagenet/inception-bn/Inception-BN-symbol.json',
destfile = 'model/Inception-BN-symbol.json')

if (!file.exists("model/Inception-BN-0126.params")) {
download.file(
"http://data.mxnet.io/mxnet/models/imagenet/inception-bn/Inception-BN-0126.params?raw=true",
destfile = "model/Inception-BN-0126.params")
}
if (!file.exists("model/Inception-BN-symbol.json")) {
download.file(
"http://data.mxnet.io/mxnet/models/imagenet/inception-bn/Inception-BN-symbol.json",
destfile = "model/Inception-BN-symbol.json")
}
}

Expand Down
4 changes: 2 additions & 2 deletions R-package/vignettes/CatsDogsFinetune.Rmd
Original file line number Diff line number Diff line change
Expand Up @@ -162,13 +162,13 @@ val <- data$val

## Load pretrained model

Here we use the pretrained model from http://data.dmlc.ml/models/imagenet/.
Here we use the pretrained model from http://data.mxnet.io/mxnet/data/.
There are 1000 classes in imagenet,
and we need to replace the last fully connected layer with a new layer for 2 classes.


```{r}
download.file('http://data.dmlc.ml/data/Inception.zip', destfile = 'Inception.zip')
download.file('http://data.mxnet.io/mxnet/data/Inception.zip', destfile = 'Inception.zip')
unzip("Inception.zip")
inception_bn <- mx.model.load("./Inception-BN", iteration = 126)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ Make sure you unzip the pre-trained model in current folder. And we can use the
loading function to load the model into R.

```{r}
download.file('http://data.dmlc.ml/data/Inception.zip', destfile = 'Inception.zip')
download.file('http://data.mxnet.io/mxnet/data/Inception.zip', destfile = 'Inception.zip')
unzip("Inception.zip")
model <- mx.model.load("Inception/Inception_BN", iteration = 39)
```
Expand Down
7 changes: 6 additions & 1 deletion cpp-package/example/feature_extract/run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,12 @@

# Downloading the data and model
mkdir -p model
wget -nc http://data.dmlc.ml/mxnet/models/imagenet/inception-bn.tar.gz
wget -nc -O model/Inception-BN-symbol.json \
http://data.mxnet.io/mxnet/models/imagenet/inception-bn/Inception-BN-symbol.json
wget -nc -O model/synset.txt \
http://data.mxnet.io/mxnet/models/imagenet/synset.txt
wget -nc -O model/Inception-BN-0126.params \
http://data.mxnet.io/mxnet/models/imagenet/inception-bn/Inception-BN-0126.params?raw=true
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why raw=true?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It was there before 😬

wget -nc -O cat.jpg https://github.com/dmlc/web-data/blob/master/mxnet/doc/tutorials/python/predict_image/cat.jpg?raw=true
wget -nc -O dog.jpg https://github.com/dmlc/web-data/blob/master/mxnet/doc/tutorials/python/predict_image/dog.jpg?raw=true
wget -nc -O model/mean_224.nd https://github.com/dmlc/web-data/raw/master/mxnet/example/feature_extract/mean_224.nd
Expand Down
61 changes: 41 additions & 20 deletions cpp-package/example/get_data.sh
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
#!/usr/bin/env bash

# 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
Expand All @@ -14,29 +16,48 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
unameOut="$(uname -s)"
case "${unameOut}" in
Linux*) CMD='wget';;
Darwin*) CMD='curl -o';;
CYGWIN*) CMD='wget';;
MINGW*) CMD='wget';;
*) CMD=""
esac

if [ ! -d "./data" ]; then
mkdir data
fi
set -e

mkdir -p data/mnist_data
cd data/mnist_data

download () {
local URL=$1
local GZ_FILE_NAME="${URL##*/}"

local FILE_NAME="${GZ_FILE_NAME%.*}"
if [[ -f "${FILE_NAME}" ]]; then
echo "File ${FILE_NAME} already downloaded."
return 0
fi

if [ ! -d "./data/mnist_data" ]; then
mkdir ./data/mnist_data
echo "Downloading ${URL} ..."
local CURL_OPTIONS="--connect-timeout 10 \
--max-time 300 \
--retry-delay 10 \
--retry 3 \
--retry-delay 0 \
--location \
--silent"
curl ${CURL_OPTIONS} ${URL} -o ${GZ_FILE_NAME}

(cd data/mnist_data; $CMD train-images-idx3-ubyte.gz https://apache-mxnet.s3-accelerate.dualstack.amazonaws.com/gluon/dataset/mnist/train-images-idx3-ubyte.gz)
(cd data/mnist_data; $CMD train-labels-idx1-ubyte.gz https://apache-mxnet.s3-accelerate.dualstack.amazonaws.com/gluon/dataset/mnist/train-labels-idx1-ubyte.gz)
(cd data/mnist_data; $CMD t10k-images-idx3-ubyte.gz https://apache-mxnet.s3-accelerate.dualstack.amazonaws.com/gluon/dataset/mnist/t10k-images-idx3-ubyte.gz)
(cd data/mnist_data; $CMD t10k-labels-idx1-ubyte.gz https://apache-mxnet.s3-accelerate.dualstack.amazonaws.com/gluon/dataset/mnist/t10k-labels-idx1-ubyte.gz)
(cd data/mnist_data; $CMD mnist_train.csv.gz http://data.mxnet.io/data/mnist_train.csv.gz)
(cd data/mnist_data; gzip -d *.gz)
fi
if [[ ! -f "${GZ_FILE_NAME}" ]]; then
echo "File ${URL} couldn't be downloaded!"
exit 1
fi

gzip -d ${GZ_FILE_NAME}
(($? != 0)) && exit 1 || return 0
}

FILES=(
"https://apache-mxnet.s3-accelerate.dualstack.amazonaws.com/gluon/dataset/mnist/train-images-idx3-ubyte.gz"
"https://apache-mxnet.s3-accelerate.dualstack.amazonaws.com/gluon/dataset/mnist/train-labels-idx1-ubyte.gz"
"https://apache-mxnet.s3-accelerate.dualstack.amazonaws.com/gluon/dataset/mnist/t10k-images-idx3-ubyte.gz"
"https://apache-mxnet.s3-accelerate.dualstack.amazonaws.com/gluon/dataset/mnist/t10k-labels-idx1-ubyte.gz"
"http://data.mxnet.io/data/mnist_train.csv.gz")

for FILE in ${FILES[@]}; do
download ${FILE}
done
2 changes: 1 addition & 1 deletion matlab/get_inception_model.sh
Original file line number Diff line number Diff line change
Expand Up @@ -31,5 +31,5 @@ cd ${DATA_DIR}
wget --no-check-certificate https://raw.githubusercontent.com/dmlc/mxnet.js/master/data/cat.png;

# Get inception model
wget --no-check-certificate http://data.dmlc.ml/mxnet/models/imagenet/inception-bn.tar.gz;
wget --no-check-certificate http://data.mxnet.io/models/imagenet/inception-bn.tar.gz
tar -zxvf inception-bn.tar.gz