Merge branch 'master' into export_resize_and_support_batch_size

apache · Jan 29, 2019 · 4d189f2 · 4d189f2
2 parents 4a86ba7 + 3a1a80a
commit 4d189f2
Show file tree

Hide file tree

Showing 48 changed files with 1,011 additions and 458 deletions.
diff --git a/.gitignore b/.gitignore
@@ -63,11 +63,9 @@ __pycache__
 *.states
 *.json
 *.d
-build
 cmake-build*
 data
 recommonmark
-deps
 
 # R
 *.Rcheck
@@ -96,6 +94,8 @@ input.txt*
 
 # Jetbrain
 .idea
+.gradle
+*.iml
 
 # ctags
 tags
@@ -104,28 +104,14 @@ tags
 cscope.out
 cscope.files
 
-# Scala package
-*.class
-scala-package/*/target/
-scala-package/*/*/target/
-*.scala_dependencies
-*.worksheet
-*.idea
-*.iml
-*.classpath
-*.project
-*.settings
-!scala-package/*/bin
-*.bak
-*/node_modules/
-
 # Eclipse project config
 .project
 .cproject
+.classpath
+.settings
 .pydevproject
 CMakeFiles
 cmake_install.cmake
-lib
 
 # Visual Studio Code
 .vscode
@@ -145,13 +131,12 @@ tools/pip_package/mxnet.egg-info
 tools/pip_package/mxnet
 
 # temporary path for building dependencies when building wheel
-./deps/
-./staticdeps/
-bld
-./tmp/*
-*.jar
-target
-bin/im2rec
+deps/
+staticdeps/
+tmp/
+build/
+lib/
+bin/
 model/
 
 # VTune

diff --git a/ci/docker/runtime_functions.sh b/ci/docker/runtime_functions.sh
@@ -1241,15 +1241,15 @@ nightly_tutorial_test_ubuntu_python2_gpu() {
 nightly_java_demo_test_cpu() {
     set -ex
     cd /work/mxnet/scala-package/mxnet-demo/java-demo
-    make java_ci_demo
+    mvn -Pci-nightly install
     bash bin/java_sample.sh
     bash bin/run_od.sh
 }
 
 nightly_scala_demo_test_cpu() {
     set -ex
     cd /work/mxnet/scala-package/mxnet-demo/scala-demo
-    make scala_ci_demo
+    mvn -Pci-nightly install
     bash bin/demo.sh
     bash bin/run_im.sh
 }

diff --git a/docs/build_version_doc/artifacts/.htaccess b/docs/build_version_doc/artifacts/.htaccess
@@ -4,7 +4,6 @@ RewriteRule ^get_started/why_mxnet.html$ %{ENV:default_version}/faq/why_mxnet.ht
 RewriteRule ^get_started.*$ %{ENV:default_version}/install/ [R=301,L]
 RewriteRule ^how_to.*$ %{ENV:default_version}/faq/ [R=301,L]
 RewriteRule ^api/python/symbol.html$ %{ENV:default_version}/api/python/symbol/symbol.html [R=301,L]
-RewriteRule ^(?:versions\/[^\/]+\/)?community/index.html$ %{ENV:default_version}/community/contribute.html [R=301,L]
 
 # Navigation bar redirects to latest info
 RewriteCond %{ENV:default_version}#\/$1 !^([^#]+)#\1$
@@ -22,4 +21,4 @@ RewriteRule ^versions/1.0.0/api/clojure/.*$ %{ENV:default_version}/error/api.htm
 RewriteRule ^versions/1.1.0/api/clojure/.*$ %{ENV:default_version}/error/api.html [R=301,L]
 RewriteRule ^versions/1.2.1/api/clojure/.*$ %{ENV:default_version}/error/api.html [R=301,L]
 
-ErrorDocument 404 https://mxnet.incubator.apache.org/error/404.html
+ErrorDocument 404 /error/404.html
diff --git a/docs/build_version_doc/artifacts/404.html b/docs/build_version_doc/artifacts/404.html
@@ -0,0 +1,50 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+<style>
+    { margin: 0; padding: 0; }
+
+    html {
+      background: url('https://raw.githubusercontent.com/dmlc/web-data/master/mxnet/image/mxnet-background-compressed.jpeg') no-repeat center center fixed;
+      -webkit-background-size: cover;
+      -moz-background-size: cover;
+      -o-background-size: cover;
+      background-size: cover;
+    }
+
+    h1, p {
+      color: white;
+      font-family: verdana;
+    }
+
+    a:link {
+      color: white;
+    }
+
+    a:visited {
+      color: linen;
+    }
+
+    a:hover {
+      color: powderblue;
+    }
+
+    a:active {
+      color: aqua;
+    }
+
+</style>
+  </head>
+  <body>
+    <div>
+      <a href="/" id="logo" ><img width="200"  src="https://raw.githubusercontent.com/dmlc/web-data/master/mxnet/image/mxnet_logo.png"></a>
+    </div>
+    <div>
+    <span id="page-does-not-exist"></span><h1>Page Does Not Exist</h1>
+    <p>If you’re here that means you requested a page that doesn’t exist. Sorry about that! Maybe try the search box to find what you’re looking for, or navigate to the <a href="/">Home Page</a>. Also, make sure you’re looking in the correct version, as some features may only be available in <a href="/~https://github.com/apache/incubator-mxnet/releases">newer versions</a> or the <a href="/versions/master">master branch</a>.</p>
+    </div>
+  </body>
+</html>
diff --git a/docs/build_version_doc/artifacts/api.html b/docs/build_version_doc/artifacts/api.html
@@ -0,0 +1,50 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+<style>
+    { margin: 0; padding: 0; }
+
+    html {
+      background: url('https://raw.githubusercontent.com/dmlc/web-data/master/mxnet/image/mxnet-background-compressed.jpeg') no-repeat center center fixed;
+      -webkit-background-size: cover;
+      -moz-background-size: cover;
+      -o-background-size: cover;
+      background-size: cover;
+    }
+
+    h1, p {
+      color: white;
+      font-family: verdana;
+    }
+
+    a:link {
+      color: white;
+    }
+
+    a:visited {
+      color: linen;
+    }
+
+    a:hover {
+      color: powderblue;
+    }
+
+    a:active {
+      color: aqua;
+    }
+
+</style>
+  </head>
+  <body>
+    <div>
+      <a href="/" id="logo" ><img width="200"  src="https://raw.githubusercontent.com/dmlc/web-data/master/mxnet/image/mxnet_logo.png"></a>
+    </div>
+    <div>
+    <span id="page-does-not-exist"></span><h1>API Not Available</h1>
+    <p>You selected an API that is not available for this version of MXNet. Try a more recent version of MXNet, or go the <a href="/versions/master">master branch</a>.</p>
+    </div>
+  </body>
+</html>
diff --git a/docs/build_version_doc/artifacts/index.html b/docs/build_version_doc/artifacts/index.html
diff --git a/docs/build_version_doc/update_all_version.sh b/docs/build_version_doc/update_all_version.sh
@@ -78,20 +78,6 @@ for tag in $tag_list; do
     echo "$tag" >> "$tag_file"
 done
 
-function update_mxnet_css {
-  tag=$1
-  echo "Begin update fixes.."
-  # All fixes are done on the master branch of mxnet-incubator repository
-  # During a nightly build, these fixes will be patched to all the versions in the asf-site repository including the master folder under versions directory.
-  # copy <master folder location> <version folder location>
-
-  echo "Copying mxnet.css from artifacts folder..."
-  cp "artifacts/mxnet.css"  "$built/versions/$tag/_static"
-
-  echo "Update fixes complete.."
-}
-
-
 
 # Update the specified tags with the Versions dropdown
 # Add various artifacts depending on the version
@@ -101,16 +87,6 @@ for tag in $tag_list; do
 
     python AddVersion.py --root_url "$root_url" --file_path "$built/versions/$tag" --current_version "$tag" --tag_default "$tag_default" || exit 1
 
-    # Patch any fixes to all versions except 0.11.0.
-    # Version 0.11.0 has old theme and does not make use of the current mxnet.css
-    # It also has its install page in /getting_started, so we skip updating that
-    if [ $tag != '0.11.0' ]; then
-        if [ -d $built/versions/$tag ]; then
-            echo "The $tag is going to be updated with new css and install pages."
-            update_mxnet_css $tag
-        fi
-    fi
-
     # Update all the files that are required to go into the root folder or live version
     if [ $tag == $tag_default ]
     then

diff --git a/docs/conf.py b/docs/conf.py
@@ -107,7 +107,7 @@
 
 # List of patterns, relative to source directory, that match files and
 # directories to ignore when looking for source files.
-exclude_patterns = ['3rdparty', 'api/python/model.md', 'build_version_doc', 'error', 'README.md', 'tutorial_utils', 'virtualenv']
+exclude_patterns = ['3rdparty', 'api/python/model.md', 'build_version_doc', 'README.md', 'tutorial_utils', 'virtualenv']
 
 
 # The reST default role (used for this markup: `text`) to use for all documents.

diff --git a/docs/error/404.md b/docs/error/404.md
diff --git a/docs/error/api.md b/docs/error/api.md
diff --git a/docs/install/java_setup.md b/docs/install/java_setup.md
@@ -85,6 +85,13 @@ Also, add the dependency which corresponds to your platform to the `dependencies
 The official Java Packages will be released with the release of MXNet 1.4 and will be available on  [MXNet Maven package repository](https://search.maven.org/#search%7Cga%7C1%7Cg%3A%22org.apache.mxnet%22).
 <hr>
 
+### Eclipse IDE Support
+You can convert your existing Maven project to a project that can run in Eclipse by:
+```
+mvn eclipse:eclipse
+```
+This can be done once you have your maven project properly configured.
+
 ## Source
 
 The previously mentioned setup with Maven is recommended. Otherwise, the following instructions for macOS and Ubuntu are provided for reference only:
@@ -99,11 +106,11 @@ The previously mentioned setup with Maven is recommended. Otherwise, the followi
 
 
 #### Build Java from an Existing MXNet Installation
-If you have already built MXNet **from source** and are looking to setup Java from that point, you may simply run the following from the MXNet source root:
+If you have already built MXNet **from source** and are looking to setup Java from that point, you may simply run the following from the MXNet `scala-package` folder:
 
 ```
-make scalapkg
-make scalainstall
+mvn package
+mvn install
 ```
 This will install both the Java Inference API and the required MXNet-Scala package. 
 <hr>