Port #20786 from v1.9.x (#20787)

* Update website for v1.9.x branch. * Update redirect to default to new 1.9.0 version of website docs. * Retry getting test data to prevent CI tests from failing - increase connect timeout from 10 to 60sec, increase retry delay from 0 (setting duplicated) to 30, increase retry attempts to 5.
apache · Dec 21, 2021 · a7ac1c8 · a7ac1c8
1 parent f0ef9d8
commit a7ac1c8
Show file tree

Hide file tree

Showing 11 changed files with 35 additions and 18 deletions.
diff --git a/cpp-package/example/get_data.sh b/cpp-package/example/get_data.sh
@@ -33,11 +33,10 @@ download () {
     fi
 
     echo "Downloading ${URL} ..."
-    local CURL_OPTIONS="--connect-timeout 10 \
+    local CURL_OPTIONS="--connect-timeout 60 \
               --max-time 300 \
-              --retry-delay 10 \
-              --retry 3 \
-              --retry-delay 0 \
+              --retry-delay 30 \
+              --retry 5 \
               --location \
               --silent"
     curl ${CURL_OPTIONS} ${URL} -o ${GZ_FILE_NAME}

diff --git a/docs/static_site/src/.htaccess b/docs/static_site/src/.htaccess
@@ -39,12 +39,12 @@ RewriteOptions AllowNoSlash
 
 </IfModule>
 
-# Set default website version to old stable (v1.8.0)
+# Set default website version to old stable (v1.9.0)
 RewriteCond %{REQUEST_URI} !^/versions/
 RewriteCond %{HTTP_REFERER} !mxnet.apache.org
 RewriteCond %{HTTP_REFERER} !mxnet.incubator.apache.org
 RewriteCond %{HTTP_REFERER} !mxnet.cdn.apache.org
-RewriteRule ^(.*)$ /versions/1.8.0/$1 [r=307,L]
+RewriteRule ^(.*)$ /versions/1.9.0/$1 [r=307,L]
 
 # Redirect Chinese visitors to Chinese CDN, temporary solution for slow site speed in China
 RewriteCond %{ENV:GEOIP_COUNTRY_CODE} ^CN$

diff --git a/docs/static_site/src/_config.yml b/docs/static_site/src/_config.yml
@@ -40,6 +40,7 @@ youtube_username: apachemxnet
 baseurl: /versions/master
 versions:
   - master
+  - 1.9.0
   - 1.8.0
   - 1.7.0
   - 1.6.0

diff --git a/docs/static_site/src/_config_beta.yml b/docs/static_site/src/_config_beta.yml
@@ -42,6 +42,7 @@ youtube_username: apachemxnet
 baseurl: /versions/master
 versions:
   - master
+  - 1.9.0
   - 1.8.0
   - 1.7.0
   - 1.6.0

diff --git a/docs/static_site/src/_config_prod.yml b/docs/static_site/src/_config_prod.yml
@@ -42,6 +42,7 @@ google_analytics: UA-96378503-1
 baseurl: /versions/master
 versions:
   - master
+  - 1.9.0
   - 1.8.0
   - 1.7.0
   - 1.6.0

diff --git a/docs/static_site/src/_includes/get_started/get_started.html b/docs/static_site/src/_includes/get_started/get_started.html
@@ -1,7 +1,7 @@
 <script>
     /** Defaults **/
     /** See options.js for the full ugly script **/
-    var versionSelect = defaultVersion = 'v1.8.0';
+    var versionSelect = defaultVersion = 'v1.9.0';
     var platformSelect = 'linux';
     var languageSelect = 'python';
     var processorSelect = 'cpu';
@@ -24,13 +24,14 @@ <h2>Platform and use-case specific instructions for using MXNet</h2>
             <div class="col-9 install-right">
                 <div class="dropdown" id="version-dropdown-container">
                     <button class="current-version dropbtn btn" type="button" data-toggle="dropdown">
-                        v1.8.0
+                        v1.9.0
                         <svg class="dropdown-caret" viewBox="0 0 32 32" class="icon icon-caret-bottom" aria-hidden="true">
                             <path class="dropdown-caret-path" d="M24 11.305l-7.997 11.39L8 11.305z"></path>
                         </svg>
                     </button>
                     <ul class="opt-group version-dropdown">
-                        <li class="opt active versions"><a href="#">v1.8.0</a></li>
+                        <li class="opt active versions"><a href="#">v1.9.0</a></li>
+                        <li class="opt versions"><a href="#">v1.8.0</a></li>
                         <li class="opt versions"><a href="#">v1.7.0</a></li>
                         <li class="opt versions"><a href="#">v1.6.0</a></li>
                         <li class="opt versions"><a href="#">v1.5.1</a></li>

diff --git a/docs/static_site/src/_includes/get_started/linux/python/cpu/pip.md b/docs/static_site/src/_includes/get_started/linux/python/cpu/pip.md
@@ -9,11 +9,18 @@ page](https://mxnet.apache.org/get_started/download).
 
 Run the following command:
 
-<div class="v1-8-0">
+<div class="v1-9-0">
 {% highlight bash %}
 pip install mxnet
 {% endhighlight %}
 
+</div> <!-- End of v1-9-0 -->
+
+<div class="v1-8-0">
+{% highlight bash %}
+pip install mxnet==1.8.0.post0
+{% endhighlight %}
+
 Start from 1.7.0 release, oneDNN(previously known as: MKL-DNN/DNNL) is enabled
 in pip packages by default.
 
@@ -35,7 +42,7 @@ MXNet tuning guide</a>.
 To install native MXNet without oneDNN, run the following command:
 
 {% highlight bash %}
-pip install mxnet-native
+pip install mxnet-native==1.8.0.post0
 {% endhighlight %}
 
 </div> <!-- End of v1-8-0 -->

diff --git a/docs/static_site/src/_includes/get_started/linux/python/gpu/pip.md b/docs/static_site/src/_includes/get_started/linux/python/gpu/pip.md
@@ -12,11 +12,18 @@ page](https://mxnet.apache.org/get_started/download).
 
 Run the following command:
 
-<div class="v1-8-0">
+<div class="v1-9-0">
 {% highlight bash %}
 $ pip install mxnet-cu102
 {% endhighlight %}
 
+</div> <!-- End of v1-9-0 -->
+
+<div class="v1-8-0">
+{% highlight bash %}
+$ pip install mxnet-cu102==1.8.0.post0
+{% endhighlight %}
+
 </div> <!-- End of v1-8-0 -->
 
 <div class="v1-7-0">

diff --git a/docs/static_site/src/_includes/get_started/pip_snippet.md b/docs/static_site/src/_includes/get_started/pip_snippet.md
@@ -1,7 +1,7 @@
 You can then <a href="/get_started/validate_mxnet.html">validate your MXNet installation</a>.
 
 <div style="text-align: center">
-    <img src="https://raw.githubusercontent.com/dmlc/web-data/master/mxnet/install/pip-packages-1.8.0.png"
+    <img src="https://raw.githubusercontent.com/dmlc/web-data/master/mxnet/install/pip-packages-1.9.0.png"
     alt="pip packages"/>
 </div>
 

diff --git a/docs/static_site/src/pages/get_started/download.md b/docs/static_site/src/pages/get_started/download.md
@@ -35,7 +35,8 @@ encouraged to contribute to our development version on
 
 | Version | Source                                                                                                      | PGP                                                                                                             | SHA                                                                                                                |
 |---------|-------------------------------------------------------------------------------------------------------------|-----------------------------------------------------------------------------------------------------------------|---------------------------------------------------------------------------------------------------------------------|
-| 1.8.0   | [Download](http://www.apache.org/dyn/closer.lua?filename=incubator/mxnet/1.8.0/apache-mxnet-src-1.8.0-incubating.tar.gz&action=download)   | [Download](https://downloads.apache.org/incubator/mxnet/1.8.0/apache-mxnet-src-1.8.0-incubating.tar.gz.asc)    |  [Download](https://downloads.apache.org/incubator/mxnet/1.8.0/apache-mxnet-src-1.8.0-incubating.tar.gz.sha512)    |
+| 1.9.0   | [Download](http://www.apache.org/dyn/closer.lua?filename=incubator/mxnet/1.9.0/apache-mxnet-src-1.9.0-incubating.tar.gz&action=download)   | [Download](https://downloads.apache.org/incubator/mxnet/1.9.0/apache-mxnet-src-1.9.0-incubating.tar.gz.asc)    |  [Download](https://downloads.apache.org/incubator/mxnet/1.9.0/apache-mxnet-src-1.9.0-incubating.tar.gz.sha512)    |
+| 1.8.0   | [Download](httpis://archive.apache.org/dist/incubator/mxnet/1.8.0/apache-mxnet-src-1.8.0-incubating.tar.gz)   | [Download](https://archive.apache.org/dist/incubator/mxnet/1.8.0/apache-mxnet-src-1.8.0-incubating.tar.gz.asc)    |  [Download](https://archive.apache.org/dist/incubator/mxnet/1.8.0/apache-mxnet-src-1.8.0-incubating.tar.gz.sha512)    |
 | 1.7.0   | [Download](https://archive.apache.org/dist/incubator/mxnet/1.7.0/apache-mxnet-src-1.7.0-incubating.tar.gz)   | [Download](https://archive.apache.org/dist/incubator/mxnet/1.7.0/apache-mxnet-src-1.7.0-incubating.tar.gz.asc)    |  [Download](https://archive.apache.org/dist/incubator/mxnet/1.7.0/apache-mxnet-src-1.7.0-incubating.tar.gz.sha512)    |
 | 1.6.0   | [Download](https://archive.apache.org/dist/incubator/mxnet/1.6.0/apache-mxnet-src-1.6.0-incubating.tar.gz)   | [Download](https://archive.apache.org/dist/incubator/mxnet/1.6.0/apache-mxnet-src-1.6.0-incubating.tar.gz.asc)    |  [Download](https://archive.apache.org/dist/incubator/mxnet/1.6.0/apache-mxnet-src-1.6.0-incubating.tar.gz.sha512)    |
 | 1.5.1   | [Download](https://archive.apache.org/dist/incubator/mxnet/1.5.1/apache-mxnet-src-1.5.1-incubating.tar.gz)   | [Download](https://archive.apache.org/dist/incubator/mxnet/1.5.1/apache-mxnet-src-1.5.1-incubating.tar.gz.asc)    |  [Download](https://archive.apache.org/dist/incubator/mxnet/1.5.1/apache-mxnet-src-1.5.1-incubating.tar.gz.sha512)     |

diff --git a/tools/dependencies/make_shared_dependencies.sh b/tools/dependencies/make_shared_dependencies.sh
@@ -34,11 +34,10 @@ download () {
     fi
 
     echo "Downloading ${URL} ..."
-    local CURL_OPTIONS="--connect-timeout 10 \
+    local CURL_OPTIONS="--connect-timeout 60 \
               --max-time 300 \
-              --retry-delay 10 \
-              --retry 3 \
-              --retry-delay 0 \
+              --retry-delay 30 \
+              --retry 5 \
               --location \
               --silent"
     curl ${CURL_OPTIONS} ${URL} -o ${OUT_FILE}