You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mxnet.apache.org by je...@apache.org on 2021/12/22 06:12:32 UTC
[incubator-mxnet] branch v1.x updated: [v1.x] Backport #20782, #20783 and #20786 from v1.9.x branch, #19945 from master (#20785)
This is an automated email from the ASF dual-hosted git repository.
jevans 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 b5e8bf6 [v1.x] Backport #20782, #20783 and #20786 from v1.9.x branch, #19945 from master (#20785)
b5e8bf6 is described below
commit b5e8bf61b4accaf15cda70e4e97e297992983b72
Author: Joe Evans <jo...@gmail.com>
AuthorDate: Tue Dec 21 22:11:05 2021 -0800
[v1.x] Backport #20782, #20783 and #20786 from v1.9.x branch, #19945 from master (#20785)
* [v1.9.x] Fix CD for pypi wheel version (#20782)
* Change env variable used to detect whether it's a release build or not. RELEASE_BUILD is already setup in the CD pipeline.
* Refine how variable is compared to trigger release builds.
* Check for 'true' exclusively, to prevent unwanted release builds.
* Make sure we pass any environment variables on the build.py command line to the docker run command.
* [v1.9.x] Fix aarch64 cd pipeline (#20783)
* Add wheel to installed pip packages on aarch64, so we can build the wheel in the CD pipeline.
* Better support for aarch64 docker container cache.
* Only import machine() function from platform module, as platform variable is already widely used.
* Only build containers with aarch64 in name on aarch64.
* Make all arch defaults to local machine type.
* 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.
* Update website for v1.9.x branch. (#20786)
* [website] Fix broken website for master version (#19945)
* fix website
* fix header
* fix index
* remove locall test
* fix main.scss
Co-authored-by: Wei Chu <we...@amazon.com>
Co-authored-by: waytrue17 <52...@users.noreply.github.com>
Co-authored-by: Wei Chu <we...@amazon.com>
---
ci/build.py | 24 +++++++--------
ci/docker/install/requirements_aarch64 | 1 +
ci/docker_cache.py | 3 +-
cpp-package/example/get_data.sh | 7 ++---
.../themes/mx-theme/mxtheme/header_top.html | 17 ++++++-----
docs/static_site/src/404.html | 34 ++++++++++-----------
docs/static_site/src/_config.yml | 3 +-
docs/static_site/src/_config_beta.yml | 3 +-
docs/static_site/src/_config_prod.yml | 3 +-
.../src/_includes/get_started/get_started.html | 7 +++--
.../_includes/get_started/linux/python/cpu/pip.md | 11 +++++--
.../_includes/get_started/linux/python/gpu/pip.md | 9 +++++-
.../src/_includes/get_started/pip_snippet.md | 2 +-
docs/static_site/src/_includes/header.html | 7 +++--
docs/static_site/src/_layouts/default.html | 4 +--
docs/static_site/src/_layouts/home.html | 4 +--
docs/static_site/src/_layouts/page.html | 33 ++++++++++----------
docs/static_site/src/_layouts/page_api.html | 33 ++++++++++----------
docs/static_site/src/_layouts/page_category.html | 33 ++++++++++----------
.../src/_layouts/page_landing_tutorials.html | 33 ++++++++++----------
docs/static_site/src/_layouts/post.html | 33 ++++++++++----------
docs/static_site/src/assets/main.scss | 4 +--
docs/static_site/src/index.html | 35 ++++++++++------------
docs/static_site/src/pages/get_started/download.md | 3 +-
tools/dependencies/make_shared_dependencies.sh | 7 ++---
tools/pip/setup.py | 2 +-
26 files changed, 175 insertions(+), 180 deletions(-)
diff --git a/ci/build.py b/ci/build.py
index 06a7475..1998f58 100755
--- a/ci/build.py
+++ b/ci/build.py
@@ -34,6 +34,7 @@ import re
import shutil
import signal
import subprocess
+from platform import machine
from itertools import chain
from subprocess import check_call, check_output
from typing import *
@@ -46,7 +47,7 @@ from util import *
DOCKER_COMPOSE_FILES = set(['docker/build.centos7'])
# keywords to identify arm-based dockerfiles
-AARCH_FILE_KEYWORDS = ['armv', 'aarch64']
+AARCH_FILE_KEYWORDS = ['aarch64']
def get_dockerfiles_path():
return "docker"
@@ -60,7 +61,7 @@ def get_docker_compose_platforms(path: str = get_dockerfiles_path()):
return platforms
-def get_platforms(path: str = get_dockerfiles_path(), arch='x86') -> List[str]:
+def get_platforms(path: str = get_dockerfiles_path(), arch=machine()) -> List[str]:
"""Get a list of platforms given our dockerfiles"""
dockerfiles = glob.glob(os.path.join(path, "Dockerfile.*"))
dockerfiles = set(filter(lambda x: x[-1] != '~', dockerfiles))
@@ -68,7 +69,7 @@ def get_platforms(path: str = get_dockerfiles_path(), arch='x86') -> List[str]:
files = files - DOCKER_COMPOSE_FILES
files.update(["build."+x for x in get_docker_compose_platforms()])
arm_files = set(filter(lambda x: any(y in x for y in AARCH_FILE_KEYWORDS), files))
- if arch == 'x86':
+ if arch == 'x86_64':
files = files - arm_files
elif arch == 'aarch64':
files = arm_files
@@ -273,15 +274,10 @@ def container_run(platform: str,
# mount mxnet/build for storing build
'-v', "{}:/work/build".format(local_build_folder),
'-v', "{}:/work/ccache".format(local_ccache_dir),
- '-u', '{}:{}'.format(os.getuid(), os.getgid()),
- '-e', 'CCACHE_MAXSIZE={}'.format(environment['CCACHE_MAXSIZE']),
- # temp dir should be local and not shared
- '-e', 'CCACHE_TEMPDIR={}'.format(environment['CCACHE_TEMPDIR']),
- # this path is inside the container as /work/ccache is mounted
- '-e', "CCACHE_DIR={}".format(environment['CCACHE_DIR']),
- # a container-scoped log, useful for ccache verification.
- '-e', "CCACHE_LOGFILE={}".format(environment['CCACHE_LOGFILE']),
+ '-u', '{}:{}'.format(os.getuid(), os.getgid())
]
+ for e in environment.keys():
+ docker_arg_list += ['-e', '{}={}'.format(e, environment[e])]
docker_arg_list += [tag]
docker_arg_list.extend(command)
@@ -305,7 +301,7 @@ def container_run(platform: str,
return 0
-def list_platforms(arch='x86') -> str:
+def list_platforms(arch=machine()) -> str:
return "\nSupported platforms:\n{}".format('\n'.join(get_platforms(arch=arch)))
@@ -362,8 +358,8 @@ def main() -> int:
type=str)
parser.add_argument("-A", "--architecture",
- help="Architecture of images to build (x86 or aarch64). Default is x86.",
- default='x86',
+ help="Architecture of images to build (x86_64 or aarch64). Default is current machine type.",
+ default=machine(),
dest='architecture')
parser.add_argument("-b", "--build-only",
diff --git a/ci/docker/install/requirements_aarch64 b/ci/docker/install/requirements_aarch64
index 327a78f..1cfead0 100644
--- a/ci/docker/install/requirements_aarch64
+++ b/ci/docker/install/requirements_aarch64
@@ -30,3 +30,4 @@ astroid==2.3.3 # pylint and astroid need to be aligned
requests<2.19.0,>=2.18.4
setuptools
coverage
+wheel
diff --git a/ci/docker_cache.py b/ci/docker_cache.py
index f9d5b81..a512034 100755
--- a/ci/docker_cache.py
+++ b/ci/docker_cache.py
@@ -30,6 +30,7 @@ import os
import subprocess
import re
import sys
+from platform import machine
from typing import *
import build as build_util
@@ -225,7 +226,7 @@ def main() -> int:
args = parser.parse_args()
- platforms = build_util.get_platforms()
+ platforms = build_util.get_platforms(arch=machine())
if "dkr.ecr" in args.docker_registry:
_ecr_login(args.docker_registry)
diff --git a/cpp-package/example/get_data.sh b/cpp-package/example/get_data.sh
index fda69ce..ae42756 100755
--- 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/python_docs/themes/mx-theme/mxtheme/header_top.html b/docs/python_docs/themes/mx-theme/mxtheme/header_top.html
index 0b54d3c..eaba20b 100644
--- a/docs/python_docs/themes/mx-theme/mxtheme/header_top.html
+++ b/docs/python_docs/themes/mx-theme/mxtheme/header_top.html
@@ -1,6 +1,6 @@
<header class="site-header" role="banner">
<div class="wrapper">
- <a class="site-title" rel="author" href="/versions/1.8.0/"><img
+ <a class="site-title" rel="author" href="/versions/1.9.0/"><img
src="{{pathto('_static/mxnet_logo.png', 1)}}" class="site-header-logo"></a>
<nav class="site-nav">
<input type="checkbox" id="nav-trigger" class="nav-trigger"/>
@@ -13,19 +13,20 @@
</label>
<div class="trigger">
- <a class="page-link" href="/versions/1.8.0/get_started">Get Started</a>
- <a class="page-link" href="/versions/1.8.0/blog">Blog</a>
- <a class="page-link" href="/versions/1.8.0/features">Features</a>
- <a class="page-link" href="/versions/1.8.0/ecosystem">Ecosystem</a>
- <a class="page-link page-current" href="/versions/1.8.0/api">Docs & Tutorials</a>
+ <a class="page-link" href="/versions/1.9.0/get_started">Get Started</a>
+ <a class="page-link" href="/versions/1.9.0/blog">Blog</a>
+ <a class="page-link" href="/versions/1.9.0/features">Features</a>
+ <a class="page-link" href="/versions/1.9.0/ecosystem">Ecosystem</a>
+ <a class="page-link page-current" href="/versions/1.9.0/api">Docs & Tutorials</a>
<a class="page-link" href="https://github.com/apache/incubator-mxnet">GitHub</a>
<div class="dropdown">
- <span class="dropdown-header">1.8.0
+ <span class="dropdown-header">1.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>
</span>
<div class="dropdown-content">
<a class="dropdown-option" href="/">master</a><br>
- <a class="dropdown-option-active" href="/versions/1.8.0/">1.8.0</a><br>
+ <a class="dropdown-option-active" href="/versions/1.9.0/">1.9.0</a><br>
+ <a class="dropdown-option" href="/versions/1.8.0/">1.8.0</a><br>
<a class="dropdown-option" href="/versions/1.7.0/">1.7.0</a><br>
<a class="dropdown-option" href="/versions/1.6.0/">1.6.0</a><br>
<a class="dropdown-option" href="/versions/1.5.0/">1.5.0</a><br>
diff --git a/docs/static_site/src/404.html b/docs/static_site/src/404.html
index 8e8a2c6..e4bb464 100644
--- a/docs/static_site/src/404.html
+++ b/docs/static_site/src/404.html
@@ -1,23 +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.
--->
-
---
+ # 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.
+
layout: default
---
diff --git a/docs/static_site/src/_config.yml b/docs/static_site/src/_config.yml
index 9c9a622..483caaf 100644
--- a/docs/static_site/src/_config.yml
+++ b/docs/static_site/src/_config.yml
@@ -37,9 +37,10 @@ description: >- # this means to ignore newlines until "baseurl:"
twitter_username: apachemxnet
github_username: apache/incubator-mxnet
youtube_username: apachemxnet
-baseurl: /versions/1.8.0
+baseurl: /versions/1.9.0
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
index 71988d1..158e0b7 100644
--- a/docs/static_site/src/_config_beta.yml
+++ b/docs/static_site/src/_config_beta.yml
@@ -39,9 +39,10 @@ url: https://thomasdelteil.github.io
twitter_username: apachemxnet
github_username: apache/incubator-mxnet
youtube_username: apachemxnet
-baseurl: /versions/1.8.0
+baseurl: /versions/1.9.0
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
index 5a01957..f9c4592 100644
--- a/docs/static_site/src/_config_prod.yml
+++ b/docs/static_site/src/_config_prod.yml
@@ -39,9 +39,10 @@ twitter_username: apachemxnet
github_username: apache/incubator-mxnet
youtube_username: apachemxnet
google_analytics: UA-96378503-1
-baseurl: /versions/1.8.0
+baseurl: /versions/1.9.0
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
index e4a0a62..933c9ce 100644
--- 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 @@
<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
index 35d8e75..101ee78 100644
--- 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
index 4931b50..e62c87b 100644
--- 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
@@ -10,11 +10,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
index f035e85..de67885 100644
--- 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/_includes/header.html b/docs/static_site/src/_includes/header.html
index f6411a4..34ce780 100644
--- a/docs/static_site/src/_includes/header.html
+++ b/docs/static_site/src/_includes/header.html
@@ -87,13 +87,14 @@
<a class="page-link" href="{{'/api' | relative_url }}">Docs & Tutorials</a>
<a class="page-link" href="https://github.com/apache/incubator-mxnet">GitHub</a>
<div class="dropdown">
- <span class="dropdown-header">1.8.0
+ <span class="dropdown-header">1.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>
</span>
<div class="dropdown-content">
<a href="/">master</a>
- <a class="dropdown-option-active" href="/versions/1.8.0/">1.8.0</a>
- <a href="/versions/1.6.0/">1.7.0</a>
+ <a class="dropdown-option-active" href="/versions/1.9.0/">1.9.0</a>
+ <a href="/versions/1.8.0/">1.8.0</a>
+ <a href="/versions/1.7.0/">1.7.0</a>
<a href="/versions/1.6.0/">1.6.0</a>
<a href="/versions/1.5.0/">1.5.0</a>
<a href="/versions/1.4.1/">1.4.1</a>
diff --git a/docs/static_site/src/_layouts/default.html b/docs/static_site/src/_layouts/default.html
index 247013d..56e7037 100644
--- a/docs/static_site/src/_layouts/default.html
+++ b/docs/static_site/src/_layouts/default.html
@@ -1,4 +1,5 @@
<!DOCTYPE html>
+
<!---
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -7,9 +8,7 @@
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
@@ -17,6 +16,7 @@
specific language governing permissions and limitations
under the License.
-->
+
<html lang="{{ page.lang | default: site.lang | default: " en" }}">
{%- include head.html -%}
diff --git a/docs/static_site/src/_layouts/home.html b/docs/static_site/src/_layouts/home.html
index 5ee3353..9823d43 100644
--- a/docs/static_site/src/_layouts/home.html
+++ b/docs/static_site/src/_layouts/home.html
@@ -1,4 +1,5 @@
<!DOCTYPE html>
+
<!---
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -7,9 +8,7 @@
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
@@ -17,6 +16,7 @@
specific language governing permissions and limitations
under the License.
-->
+
<html lang="{{ page.lang | default: site.lang | default: " en" }}">
{%- include head.html -%}
diff --git a/docs/static_site/src/_layouts/page.html b/docs/static_site/src/_layouts/page.html
index fbdaf26..43a2050 100644
--- a/docs/static_site/src/_layouts/page.html
+++ b/docs/static_site/src/_layouts/page.html
@@ -1,22 +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.
--->
---
+ # 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.
+
layout: default
---
<script>
diff --git a/docs/static_site/src/_layouts/page_api.html b/docs/static_site/src/_layouts/page_api.html
index cb2ad6f..c5b50e3 100644
--- a/docs/static_site/src/_layouts/page_api.html
+++ b/docs/static_site/src/_layouts/page_api.html
@@ -1,22 +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.
--->
---
+ # 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.
+
layout: page
---
<div class="row">
diff --git a/docs/static_site/src/_layouts/page_category.html b/docs/static_site/src/_layouts/page_category.html
index 47c90cb..8216894 100644
--- a/docs/static_site/src/_layouts/page_category.html
+++ b/docs/static_site/src/_layouts/page_category.html
@@ -1,22 +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.
--->
---
+ # 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.
+
layout: page
---
<div class="row">
diff --git a/docs/static_site/src/_layouts/page_landing_tutorials.html b/docs/static_site/src/_layouts/page_landing_tutorials.html
index 38ae6de..45328e2 100644
--- a/docs/static_site/src/_layouts/page_landing_tutorials.html
+++ b/docs/static_site/src/_layouts/page_landing_tutorials.html
@@ -1,22 +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.
--->
---
+ # 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.
+
layout: page_api
---
<h2>List of available tutorials</h2>
diff --git a/docs/static_site/src/_layouts/post.html b/docs/static_site/src/_layouts/post.html
index 519000b..da21911 100644
--- a/docs/static_site/src/_layouts/post.html
+++ b/docs/static_site/src/_layouts/post.html
@@ -1,22 +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.
--->
---
+ # 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.
+
layout: default
---
<article class="post h-entry" itemscope itemtype="http://schema.org/BlogPosting">
diff --git a/docs/static_site/src/assets/main.scss b/docs/static_site/src/assets/main.scss
index adf2d9e..de06bdc 100644
--- a/docs/static_site/src/assets/main.scss
+++ b/docs/static_site/src/assets/main.scss
@@ -1,3 +1,5 @@
+---
+---
/* 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
@@ -15,8 +17,6 @@
* specific language governing permissions and limitations
* under the License. */
----
----
body {
background-image: url("{{'/assets/img/mxnet-background-compressed.jpeg' | relative_url}}");
}
diff --git a/docs/static_site/src/index.html b/docs/static_site/src/index.html
index 48f24c4..4edbad7 100644
--- a/docs/static_site/src/index.html
+++ b/docs/static_site/src/index.html
@@ -1,23 +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.
--->
-
---
+ # 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.
+
layout: home
key_features:
@@ -68,3 +64,4 @@ community:
link: mailto:dev@mxnet.apache.org
---
+
diff --git a/docs/static_site/src/pages/get_started/download.md b/docs/static_site/src/pages/get_started/download.md
index b12c2e3..4ba00ed 100644
--- 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
index 6dfa4bf..3603dcc 100755
--- 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}
diff --git a/tools/pip/setup.py b/tools/pip/setup.py
index bd18f1e..a8ab7b0 100644
--- a/tools/pip/setup.py
+++ b/tools/pip/setup.py
@@ -45,7 +45,7 @@ LIB_PATH = libinfo['find_lib_path']()
__version__ = libinfo['__version__']
# set by the CD pipeline
-is_release = os.environ.get("IS_RELEASE", "").strip()
+is_release = (os.environ.get("RELEASE_BUILD", "false").strip().lower() == "true")
# set by the travis build pipeline
travis_tag = os.environ.get("TRAVIS_TAG", "").strip()