This is an automated email from the ASF dual-hosted git repository.
manuseth pushed a commit to branch v1.x
in repository https://gitbox.apache.org/repos/asf/incubator-mxnet.git
The following commit(s) were added to refs/heads/v1.x by this push:
new 539f494 update s3 links to public links (#20357)
539f494 is described below
commit 539f494e090ab272f71a72c53907ce8d9dd03d58
Author: Manu Seth <[email protected]>
AuthorDate: Thu Jun 17 02:44:10 2021 -0700
update s3 links to public links (#20357)
---
.../examples/infer/imageclassifier/scripts/get_resnet_18_data.sh | 6 +++---
.../examples/infer/predictor/scripts/get_resnet_18_data.sh | 6 +++---
contrib/clojure-package/scripts/infer/get_resnet_18_data.sh | 6 +++---
.../examples/scripts/infer/imageclassifier/get_resnet_18_data.sh | 6 +++---
.../javaapi/infer/predictor/PredictorExampleTest.java | 8 ++++----
.../mxnetexamples/benchmark/ScalaInferenceBenchmarkSuite.scala | 8 ++++----
.../infer/imageclassifier/ImageClassifierExampleSuite.scala | 8 ++++----
.../mxnetexamples/infer/predictor/PredictorExampleSuite.scala | 8 ++++----
.../java-demo/src/main/java/mxnet/ImageClassification.java | 8 ++++----
.../src/main/scala/sample/ImageClassificationExample.scala | 8 ++++----
10 files changed, 36 insertions(+), 36 deletions(-)
diff --git
a/contrib/clojure-package/examples/infer/imageclassifier/scripts/get_resnet_18_data.sh
b/contrib/clojure-package/examples/infer/imageclassifier/scripts/get_resnet_18_data.sh
index 1a142e8..bbb6eba 100755
---
a/contrib/clojure-package/examples/infer/imageclassifier/scripts/get_resnet_18_data.sh
+++
b/contrib/clojure-package/examples/infer/imageclassifier/scripts/get_resnet_18_data.sh
@@ -34,9 +34,9 @@ if [ ! -d "$image_path" ]; then
fi
if [ ! -f "$data_path/resnet-18-0000.params" ]; then
- wget
https://s3.us-east-2.amazonaws.com/scala-infer-models/resnet-18/resnet-18-symbol.json
-P $data_path
- wget
https://s3.us-east-2.amazonaws.com/scala-infer-models/resnet-18/resnet-18-0000.params
-P $data_path
- wget
https://s3.us-east-2.amazonaws.com/scala-infer-models/resnet-18/synset.txt -P
$data_path
+ wget
http://data.mxnet.io/models/imagenet/resnet/18-layers/resnet-18-symbol.json -P
$data_path
+ wget
http://data.mxnet.io/models/imagenet/resnet/18-layers/resnet-18-0000.params -P
$data_path
+ wget http://data.mxnet.io/models/imagenet/synset.txt -P $data_path
fi
if [ ! -f "$image_path/kitten.jpg" ]; then
diff --git
a/contrib/clojure-package/examples/infer/predictor/scripts/get_resnet_18_data.sh
b/contrib/clojure-package/examples/infer/predictor/scripts/get_resnet_18_data.sh
index cf85355..423eb0b 100755
---
a/contrib/clojure-package/examples/infer/predictor/scripts/get_resnet_18_data.sh
+++
b/contrib/clojure-package/examples/infer/predictor/scripts/get_resnet_18_data.sh
@@ -34,9 +34,9 @@ if [ ! -d "$image_path" ]; then
fi
if [ ! -f "$data_path/resnet-18-0000.params" ]; then
- wget
https://s3.us-east-2.amazonaws.com/scala-infer-models/resnet-18/resnet-18-symbol.json
-P $data_path
- wget
https://s3.us-east-2.amazonaws.com/scala-infer-models/resnet-18/resnet-18-0000.params
-P $data_path
- wget
https://s3.us-east-2.amazonaws.com/scala-infer-models/resnet-18/synset.txt -P
$data_path
+ wget
http://data.mxnet.io/models/imagenet/resnet/18-layers/resnet-18-symbol.json -P
$data_path
+ wget
http://data.mxnet.io/models/imagenet/resnet/18-layers/resnet-18-0000.params -P
$data_path
+ wget http://data.mxnet.io/models/imagenet/synset.txt -P $data_path
fi
if [ ! -f "$image_path/kitten.jpg" ]; then
diff --git a/contrib/clojure-package/scripts/infer/get_resnet_18_data.sh
b/contrib/clojure-package/scripts/infer/get_resnet_18_data.sh
index 601f362..654d523 100755
--- a/contrib/clojure-package/scripts/infer/get_resnet_18_data.sh
+++ b/contrib/clojure-package/scripts/infer/get_resnet_18_data.sh
@@ -32,7 +32,7 @@ fi
resnet_18_data_path="$data_path/resnet-18"
if [ ! -f "$resnet_18_data_path/resnet-18-0000.params" ]; then
- wget
https://s3.us-east-2.amazonaws.com/scala-infer-models/resnet-18/resnet-18-symbol.json
-P $resnet_18_data_path
- wget
https://s3.us-east-2.amazonaws.com/scala-infer-models/resnet-18/resnet-18-0000.params
-P $resnet_18_data_path
- wget
https://s3.us-east-2.amazonaws.com/scala-infer-models/resnet-18/synset.txt -P
$resnet_18_data_path
+ wget
http://data.mxnet.io/models/imagenet/resnet/18-layers/resnet-18-symbol.json -P
$resnet_18_data_path
+ wget
http://data.mxnet.io/models/imagenet/resnet/18-layers/resnet-18-0000.params -P
$resnet_18_data_path
+ wget http://data.mxnet.io/models/imagenet/synset.txt -P
$resnet_18_data_path
fi
diff --git
a/scala-package/examples/scripts/infer/imageclassifier/get_resnet_18_data.sh
b/scala-package/examples/scripts/infer/imageclassifier/get_resnet_18_data.sh
index b129932..c6967bb 100755
--- a/scala-package/examples/scripts/infer/imageclassifier/get_resnet_18_data.sh
+++ b/scala-package/examples/scripts/infer/imageclassifier/get_resnet_18_data.sh
@@ -34,8 +34,8 @@ if [ ! -d "$image_path" ]; then
fi
if [ ! -f "$data_path" ]; then
- curl
https://s3.us-east-2.amazonaws.com/scala-infer-models/resnet-18/resnet-18-symbol.json
-o $data_path/resnet-18-symbol.json
- curl
https://s3.us-east-2.amazonaws.com/scala-infer-models/resnet-18/resnet-18-0000.params
-o $data_path/resnet-18-0000.params
- curl
https://s3.us-east-2.amazonaws.com/scala-infer-models/resnet-18/synset.txt -o
$data_path/synset.txt
+ curl
http://data.mxnet.io/models/imagenet/resnet/18-layers/resnet-18-symbol.json -o
$data_path/resnet-18-symbol.json
+ curl
http://data.mxnet.io/models/imagenet/resnet/18-layers/resnet-18-0000.params -o
$data_path/resnet-18-0000.params
+ curl http://data.mxnet.io/models/imagenet/synset.txt -o $data_path/synset.txt
curl
https://s3.us-east-2.amazonaws.com/mxnet-scala/scala-example-ci/resnet152/kitten.jpg
-o $image_path/kitten.jpg
fi
diff --git
a/scala-package/examples/src/test/java/org/apache/mxnetexamples/javaapi/infer/predictor/PredictorExampleTest.java
b/scala-package/examples/src/test/java/org/apache/mxnetexamples/javaapi/infer/predictor/PredictorExampleTest.java
index 30bc8db..337a566 100644
---
a/scala-package/examples/src/test/java/org/apache/mxnetexamples/javaapi/infer/predictor/PredictorExampleTest.java
+++
b/scala-package/examples/src/test/java/org/apache/mxnetexamples/javaapi/infer/predictor/PredictorExampleTest.java
@@ -38,13 +38,13 @@ public class PredictorExampleTest {
String tempDirPath = System.getProperty("java.io.tmpdir");
logger.info("tempDirPath: %s".format(tempDirPath));
- String baseUrl =
"https://s3.us-east-2.amazonaws.com/scala-infer-models";;
+ String baseUrl = "http://data.mxnet.io/models/imagenet/";;
- Util.downloadUrl(baseUrl + "/resnet-18/resnet-18-symbol.json",
+ Util.downloadUrl(baseUrl + "resnet/18-layers/resnet-18-symbol.json",
tempDirPath + "/resnet18/resnet-18-symbol.json", 3);
- Util.downloadUrl(baseUrl + "/resnet-18/resnet-18-0000.params",
+ Util.downloadUrl(baseUrl + "resnet/18-layers/resnet-18-0000.params",
tempDirPath + "/resnet18/resnet-18-0000.params", 3);
- Util.downloadUrl(baseUrl + "/resnet-18/synset.txt",
+ Util.downloadUrl(baseUrl + "synset.txt",
tempDirPath + "/resnet18/synset.txt", 3);
Util.downloadUrl("https://s3.amazonaws.com/model-server/inputs/Pug-Cookie.jpg";,
tempDirPath + "/inputImages/resnet18/Pug-Cookie.jpg", 3);
diff --git
a/scala-package/examples/src/test/scala/org/apache/mxnetexamples/benchmark/ScalaInferenceBenchmarkSuite.scala
b/scala-package/examples/src/test/scala/org/apache/mxnetexamples/benchmark/ScalaInferenceBenchmarkSuite.scala
index 548f2e4..f36f64a 100644
---
a/scala-package/examples/src/test/scala/org/apache/mxnetexamples/benchmark/ScalaInferenceBenchmarkSuite.scala
+++
b/scala-package/examples/src/test/scala/org/apache/mxnetexamples/benchmark/ScalaInferenceBenchmarkSuite.scala
@@ -34,12 +34,12 @@ class ScalaInferenceBenchmarkSuite extends FunSuite with
BeforeAndAfterAll {
logger.info("Downloading resnet-18 model")
val tempDirPath = System.getProperty("java.io.tmpdir")
logger.info("tempDirPath: %s".format(tempDirPath))
- val baseUrl = "https://s3.us-east-2.amazonaws.com/scala-infer-models";
- Util.downloadUrl(baseUrl + "/resnet-18/resnet-18-symbol.json",
+ val baseUrl = "http://data.mxnet.io/models/imagenet/";
+ Util.downloadUrl(baseUrl + "resnet/18-layers/resnet-18-symbol.json",
tempDirPath + "/resnet18/resnet-18-symbol.json")
- Util.downloadUrl(baseUrl + "/resnet-18/resnet-18-0000.params",
+ Util.downloadUrl(baseUrl + "resnet/18-layers/resnet-18-0000.params",
tempDirPath + "/resnet18/resnet-18-0000.params")
- Util.downloadUrl(baseUrl + "/resnet-18/synset.txt",
+ Util.downloadUrl(baseUrl + "synset.txt",
tempDirPath + "/resnet18/synset.txt")
Util.downloadUrl("https://s3.amazonaws.com/model-server/inputs/Pug-Cookie.jpg";,
tempDirPath + "/inputImages/resnet18/Pug-Cookie.jpg")
diff --git
a/scala-package/examples/src/test/scala/org/apache/mxnetexamples/infer/imageclassifier/ImageClassifierExampleSuite.scala
b/scala-package/examples/src/test/scala/org/apache/mxnetexamples/infer/imageclassifier/ImageClassifierExampleSuite.scala
index d7233a2..8ed733b 100644
---
a/scala-package/examples/src/test/scala/org/apache/mxnetexamples/infer/imageclassifier/ImageClassifierExampleSuite.scala
+++
b/scala-package/examples/src/test/scala/org/apache/mxnetexamples/infer/imageclassifier/ImageClassifierExampleSuite.scala
@@ -39,13 +39,13 @@ class ImageClassifierExampleSuite extends FunSuite with
BeforeAndAfterAll {
val tempDirPath = System.getProperty("java.io.tmpdir")
logger.info("tempDirPath: %s".format(tempDirPath))
- val baseUrl = "https://s3.us-east-2.amazonaws.com/scala-infer-models";
+ val baseUrl = "http://data.mxnet.io/models/imagenet/";
- Util.downloadUrl(baseUrl + "/resnet-18/resnet-18-symbol.json",
+ Util.downloadUrl(baseUrl + "resnet/18-layers/resnet-18-symbol.json",
tempDirPath + "/resnet18/resnet-18-symbol.json")
- Util.downloadUrl(baseUrl + "/resnet-18/resnet-18-0000.params",
+ Util.downloadUrl(baseUrl + "resnet/18-layers/resnet-18-0000.params",
tempDirPath + "/resnet18/resnet-18-0000.params")
- Util.downloadUrl(baseUrl + "/resnet-18/synset.txt",
+ Util.downloadUrl(baseUrl + "synset.txt",
tempDirPath + "/resnet18/synset.txt")
Util.downloadUrl("https://s3.amazonaws.com/model-server/inputs/Pug-Cookie.jpg";,
tempDirPath + "/inputImages/resnet18/Pug-Cookie.jpg")
diff --git
a/scala-package/examples/src/test/scala/org/apache/mxnetexamples/infer/predictor/PredictorExampleSuite.scala
b/scala-package/examples/src/test/scala/org/apache/mxnetexamples/infer/predictor/PredictorExampleSuite.scala
index f04f06a..1f5deca 100644
---
a/scala-package/examples/src/test/scala/org/apache/mxnetexamples/infer/predictor/PredictorExampleSuite.scala
+++
b/scala-package/examples/src/test/scala/org/apache/mxnetexamples/infer/predictor/PredictorExampleSuite.scala
@@ -36,13 +36,13 @@ class PredictorExampleSuite extends FunSuite with
BeforeAndAfterAll {
val tempDirPath = System.getProperty("java.io.tmpdir")
logger.info("tempDirPath: %s".format(tempDirPath))
- val baseUrl = "https://s3.us-east-2.amazonaws.com/scala-infer-models";
+ val baseUrl = "http://data.mxnet.io/models/imagenet/";
- Util.downloadUrl(baseUrl + "/resnet-18/resnet-18-symbol.json",
+ Util.downloadUrl(baseUrl + "resnet/18-layers/resnet-18-symbol.json",
tempDirPath + "/resnet18/resnet-18-symbol.json")
- Util.downloadUrl(baseUrl + "/resnet-18/resnet-18-0000.params",
+ Util.downloadUrl(baseUrl + "resnet/18-layers/resnet-18-0000.params",
tempDirPath + "/resnet18/resnet-18-0000.params")
- Util.downloadUrl(baseUrl + "/resnet-18/synset.txt",
+ Util.downloadUrl(baseUrl + "synset.txt",
tempDirPath + "/resnet18/synset.txt")
Util.downloadUrl("https://s3.amazonaws.com/model-server/inputs/Pug-Cookie.jpg";,
tempDirPath + "/inputImages/resnet18/Pug-Cookie.jpg")
diff --git
a/scala-package/mxnet-demo/java-demo/src/main/java/mxnet/ImageClassification.java
b/scala-package/mxnet-demo/java-demo/src/main/java/mxnet/ImageClassification.java
index 8cb58da..e857897 100644
---
a/scala-package/mxnet-demo/java-demo/src/main/java/mxnet/ImageClassification.java
+++
b/scala-package/mxnet-demo/java-demo/src/main/java/mxnet/ImageClassification.java
@@ -46,12 +46,12 @@ public class ImageClassification {
public static void downloadModelImage() {
String tempDirPath = System.getProperty("java.io.tmpdir");
- String baseUrl =
"https://s3.us-east-2.amazonaws.com/scala-infer-models";;
- downloadUrl(baseUrl + "/resnet-18/resnet-18-symbol.json",
+ String baseUrl = "http://data.mxnet.io/models/imagenet/";;
+ downloadUrl(baseUrl + "resnet/18-layers/resnet-18-symbol.json",
tempDirPath + "/resnet18/resnet-18-symbol.json");
- downloadUrl(baseUrl + "/resnet-18/resnet-18-0000.params",
+ downloadUrl(baseUrl + "resnet/18-layers/resnet-18-0000.params",
tempDirPath + "/resnet18/resnet-18-0000.params");
- downloadUrl(baseUrl + "/resnet-18/synset.txt",
+ downloadUrl(baseUrl + "synset.txt",
tempDirPath + "/resnet18/synset.txt");
downloadUrl("https://s3.amazonaws.com/model-server/inputs/Pug-Cookie.jpg";,
tempDirPath + "/inputImages/resnet18/Pug-Cookie.jpg");
diff --git
a/scala-package/mxnet-demo/scala-demo/src/main/scala/sample/ImageClassificationExample.scala
b/scala-package/mxnet-demo/scala-demo/src/main/scala/sample/ImageClassificationExample.scala
index bb6114d..131cf21 100644
---
a/scala-package/mxnet-demo/scala-demo/src/main/scala/sample/ImageClassificationExample.scala
+++
b/scala-package/mxnet-demo/scala-demo/src/main/scala/sample/ImageClassificationExample.scala
@@ -49,17 +49,17 @@ object ImageClassificationExample {
val imgURL = "https://s3.amazonaws.com/model-server/inputs/Pug-Cookie.jpg";
downloadUrl(imgURL, imgPath)
- val baseUrl = "https://s3.us-east-2.amazonaws.com/scala-infer-models";
+ val baseUrl = "http://data.mxnet.io/models/imagenet/";
var tmpPath = tempDirPath + "/resnet18/resnet-18-symbol.json"
- var tmpUrl = baseUrl + "/resnet-18/resnet-18-symbol.json"
+ var tmpUrl = baseUrl + "resnet/18-layers/resnet-18-symbol.json"
downloadUrl(tmpUrl, tmpPath)
tmpPath = tempDirPath + "/resnet18/resnet-18-0000.params"
- tmpUrl = baseUrl + "/resnet-18/resnet-18-0000.params"
+ tmpUrl = baseUrl + "resnet/18-layers/resnet-18-0000.params"
downloadUrl(tmpUrl, tmpPath)
tmpPath = tempDirPath + "/resnet18/synset.txt"
- tmpUrl = baseUrl + "/resnet-18/synset.txt"
+ tmpUrl = baseUrl + "synset.txt"
downloadUrl(tmpUrl, tmpPath)
(imgPath, tempDirPath + "/resnet18/resnet-18")
![https://s3.amazonaws.com/model-server/inputs/Pug-Cookie.jpg"](https://s3.amazonaws.com/model-server/inputs/Pug-Cookie.jpg"){kind=link}