You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@systemml.apache.org by gw...@apache.org on 2017/09/08 00:41:11 UTC
[1/2] systemml git commit: [SYSTEMML-1860] Update release-process for
python doc and add api menu item
Repository: systemml
Updated Branches:
refs/heads/gh-pages 4e22b91ea -> 288bc35c3
[SYSTEMML-1860] Update release-process for python doc and add api menu item
Closes #648.
Project: http://git-wip-us.apache.org/repos/asf/systemml/repo
Commit: http://git-wip-us.apache.org/repos/asf/systemml/commit/24245fd5
Tree: http://git-wip-us.apache.org/repos/asf/systemml/tree/24245fd5
Diff: http://git-wip-us.apache.org/repos/asf/systemml/diff/24245fd5
Branch: refs/heads/gh-pages
Commit: 24245fd5ec5ac288bc3b2599ef3892a269e33ccc
Parents: 4e22b91
Author: Glenn Weidner <gw...@us.ibm.com>
Authored: Thu Aug 31 16:16:39 2017 -0700
Committer: Glenn Weidner <gw...@us.ibm.com>
Committed: Thu Aug 31 16:16:39 2017 -0700
----------------------------------------------------------------------
_layouts/global.html | 3 ++-
release-process.md | 18 ++++++++++++++++--
2 files changed, 18 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/systemml/blob/24245fd5/_layouts/global.html
----------------------------------------------------------------------
diff --git a/_layouts/global.html b/_layouts/global.html
index 5e84276..4286c9c 100644
--- a/_layouts/global.html
+++ b/_layouts/global.html
@@ -77,7 +77,8 @@
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown">API Docs<b class="caret"></b></a>
<ul class="dropdown-menu" role="menu">
- <li><a href="./api/java/index.html">Javadoc</a></li>
+ <li><a href="./api/java/index.html">Java</a></li>
+ <li><a href="./api/python/index.html">Python</a></li>
</ul>
</li>
{% endif %}
http://git-wip-us.apache.org/repos/asf/systemml/blob/24245fd5/release-process.md
----------------------------------------------------------------------
diff --git a/release-process.md b/release-process.md
index 4a31f8b..d8d74f4 100644
--- a/release-process.md
+++ b/release-process.md
@@ -204,7 +204,7 @@ this OS X example.
./runStandaloneSystemML.sh hello.dml
cd ..
- # verify standalon zip works
+ # verify standalone zip works
rm -rf systemml-1.0.0-bin
unzip systemml-1.0.0-bin.zip
cd systemml-1.0.0-bin
@@ -428,6 +428,7 @@ Copy contents of `systemml/docs/_site` to `systemml-website-site/docs/1.0.0`.
Delete any unnecessary files (`Gemfile`, `Gemfile.lock`).
Create `systemml-website-site/docs/1.0.0/api/java` folder for javadocs.
+Create `systemml-website-site/docs/1.0.0/api/python` folder for pythondocs.
Update `systemml/pom.xml` project version to what should be displayed in javadocs (such as `1.0.0`).
@@ -437,7 +438,20 @@ Build project (which generates javadocs).
Copy contents of `systemml/target/apidocs` to `systemml-website-site/docs/1.0.0/api/java`.
-Open up `file:///.../systemml-website-site/docs/1.0.0/index.html` and verify `API Docs` → `Javadoc` link works and that the correct Javadoc version is displayed. Verify feedback links under `Issues` menu are not present.
+Define environment variables to match version and release number used in updated `systemml/pom.xml`. Both environment variables are referenced when building pythondocs with Sphinx.
+
+ $ export SYSTEMML_VERSION=1.0
+ $ export SYSTEMML_RELEASE=1.0.0
+
+Generate pythondocs with Sphinx.
+
+ $ cd systemml/src/main/pythondoc
+ $ make html
+
+Copy contents of `systemml/target/pydocs/html` to `systemml-website-site/docs/1.0.0/api/python`.
+
+Open up `file:///.../systemml-website-site/docs/1.0.0/index.html` and verify `API Docs` → `Java` link works and that the correct Javadoc version is displayed.
+Verify `API Docs` → `Python` link works and that the same Pythondoc version is displayed. Verify feedback links under `Issues` menu are not present.
Clean up any unnecessary files (such as deleting `.DS_Store` files on OS X).
[2/2] systemml git commit: [MINOR] Update version in README files
Posted by gw...@apache.org.
[MINOR] Update version in README files
Updated version and removed incubating.
Project: http://git-wip-us.apache.org/repos/asf/systemml/repo
Commit: http://git-wip-us.apache.org/repos/asf/systemml/commit/288bc35c
Tree: http://git-wip-us.apache.org/repos/asf/systemml/tree/288bc35c
Diff: http://git-wip-us.apache.org/repos/asf/systemml/diff/288bc35c
Branch: refs/heads/gh-pages
Commit: 288bc35c3f8bde4c3478ad093ade1e03275488e8
Parents: 24245fd
Author: Glenn Weidner <gw...@us.ibm.com>
Authored: Thu Sep 7 16:42:32 2017 -0700
Committer: Glenn Weidner <gw...@us.ibm.com>
Committed: Thu Sep 7 16:42:32 2017 -0700
----------------------------------------------------------------------
spark-mlcontext-programming-guide.md | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/systemml/blob/288bc35c/spark-mlcontext-programming-guide.md
----------------------------------------------------------------------
diff --git a/spark-mlcontext-programming-guide.md b/spark-mlcontext-programming-guide.md
index 22f5a1b..e935c65 100644
--- a/spark-mlcontext-programming-guide.md
+++ b/spark-mlcontext-programming-guide.md
@@ -174,7 +174,7 @@ MLResults
## LeNet on MNIST Example
-SystemML features the DML-based [`nn` library for deep learning](https://github.com/apache/incubator-systemml/tree/master/scripts/nn).
+SystemML features the DML-based [`nn` library for deep learning](https://github.com/apache/systemml/tree/master/scripts/nn).
At project build time, SystemML automatically generates wrapper classes for DML scripts
to enable convenient access to scripts and execution of functions.
@@ -1220,7 +1220,7 @@ via `ml.scripts.algorithms.Univar_Stats`, as shown below. This feature is not av
{% highlight scala %}
val habermanUrl = "http://archive.ics.uci.edu/ml/machine-learning-databases/haberman/haberman.data"
val typesRDD = sc.parallelize(Array("1.0,1.0,1.0,2.0"))
-val scriptUrl = "https://raw.githubusercontent.com/apache/incubator-systemml/master/scripts/algorithms/Univar-Stats.dml"
+val scriptUrl = "https://raw.githubusercontent.com/apache/systemml/master/scripts/algorithms/Univar-Stats.dml"
ml.scripts.algorithms.Univar_Stats.in("A", new java.net.URL(habermanUrl)).in("K", typesRDD).in("$CONSOLE_OUTPUT", true).execute
{% endhighlight %}
</div>
@@ -1233,8 +1233,8 @@ habermanUrl: String = http://archive.ics.uci.edu/ml/machine-learning-databases/h
scala> val typesRDD = sc.parallelize(Array("1.0,1.0,1.0,2.0"))
typesRDD: org.apache.spark.rdd.RDD[String] = ParallelCollectionRDD[21] at parallelize at <console>:30
-scala> val scriptUrl = "https://raw.githubusercontent.com/apache/incubator-systemml/master/scripts/algorithms/Univar-Stats.dml"
-scriptUrl: String = https://raw.githubusercontent.com/apache/incubator-systemml/master/scripts/algorithms/Univar-Stats.dml
+scala> val scriptUrl = "https://raw.githubusercontent.com/apache/systemml/master/scripts/algorithms/Univar-Stats.dml"
+scriptUrl: String = https://raw.githubusercontent.com/apache/systemml/master/scripts/algorithms/Univar-Stats.dml
scala> ml.scripts.algorithms.Univar_Stats.in("A", new java.net.URL(habermanUrl)).in("K", typesRDD).in("$CONSOLE_OUTPUT", true).execute
17/06/05 17:23:37 WARN RewriteRemovePersistentReadWrite: Non-registered persistent write of variable 'baseStats' (line 186).