Repository: incubator-systemml Updated Branches: refs/heads/gh-pages 5c4e27c70 -> fd96a3ea9
[SYSTEMML-871] Remove optional python flag from docs examples Update Beginner's Guide and Engine Dev Guide for python flag. Fix or remove broken links in DML Language Ref. Closes #406. Project: http://git-wip-us.apache.org/repos/asf/incubator-systemml/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-systemml/commit/fd96a3ea Tree: http://git-wip-us.apache.org/repos/asf/incubator-systemml/tree/fd96a3ea Diff: http://git-wip-us.apache.org/repos/asf/incubator-systemml/diff/fd96a3ea Branch: refs/heads/gh-pages Commit: fd96a3ea9579fa6c1d5d042a95d090b40c9f2eb3 Parents: 5c4e27c Author: Deron Eriksson <de...@us.ibm.com> Authored: Tue Feb 28 11:48:06 2017 -0800 Committer: Deron Eriksson <de...@us.ibm.com> Committed: Tue Feb 28 11:48:06 2017 -0800 ---------------------------------------------------------------------- beginners-guide-to-dml-and-pydml.md | 18 +++++++++--------- dml-language-reference.md | 4 +--- engine-dev-guide.md | 2 +- 3 files changed, 11 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/fd96a3ea/beginners-guide-to-dml-and-pydml.md ---------------------------------------------------------------------- diff --git a/beginners-guide-to-dml-and-pydml.md b/beginners-guide-to-dml-and-pydml.md index 8479ef7..e82909d 100644 --- a/beginners-guide-to-dml-and-pydml.md +++ b/beginners-guide-to-dml-and-pydml.md @@ -50,13 +50,13 @@ DML and PyDML scripts can be invoked in a variety of ways. Suppose that we have print('hello ' + $1) -One way to begin working with SystemML is to [download a standalone distribution of SystemML](http://systemml.apache.org/download.html) +One way to begin working with SystemML is to [download a binary distribution of SystemML](http://systemml.apache.org/download.html) and use the `runStandaloneSystemML.sh` and `runStandaloneSystemML.bat` scripts to run SystemML in standalone -mode. The name of the DML or PyDML script -is passed as the first argument to these scripts, along with a variety of arguments. +mode. The name of the DML or PyDML script is passed as the first argument to these scripts, +along with a variety of arguments. Note that PyDML invocation can be forced with the addition of a `-python` flag. ./runStandaloneSystemML.sh hello.dml -args world - ./runStandaloneSystemML.sh hello.pydml -python -args world + ./runStandaloneSystemML.sh hello.pydml -args world # Data Types @@ -778,7 +778,7 @@ for (i in 0:numRowsToPrint-1): <div data-lang="PyDML Named Arguments and Results" markdown="1"> Example #1 Arguments: - -f ex.pydml -python -nvargs M=m.csv rowsToPrint=1 colsToPrint=3 + -f ex.pydml -nvargs M=m.csv rowsToPrint=1 colsToPrint=3 Example #1 Results: [0,0]:1.0 @@ -786,7 +786,7 @@ for (i in 0:numRowsToPrint-1): [0,2]:3.0 Example #2 Arguments: - -f ex.pydml -python -nvargs M=m.csv + -f ex.pydml -nvargs M=m.csv Example #2 Results: [0,0]:1.0 @@ -860,7 +860,7 @@ for (i in 0:numRowsToPrint-1): <div data-lang="PyDML Positional Arguments and Results" markdown="1"> Example #1 Arguments: - -f ex.pydml -python -args m.csv 1 3 + -f ex.pydml -args m.csv 1 3 Example #1 Results: [0,0]:1.0 @@ -868,7 +868,7 @@ for (i in 0:numRowsToPrint-1): [0,2]:3.0 Example #2 Arguments: - -f ex.pydml -python -args m.csv + -f ex.pydml -args m.csv Example #2 Results: [0,0]:1.0 @@ -885,5 +885,5 @@ for (i in 0:numRowsToPrint-1): The [Language Reference](dml-language-reference.html) contains highly detailed information regarding DML. -In addition, many excellent examples of DML and PyDML can be found in the [`scripts`](https://github.com/apache/incubator-systemml/tree/master/scripts) directory. +In addition, many excellent examples can be found in the [`scripts`](https://github.com/apache/incubator-systemml/tree/master/scripts) directory. http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/fd96a3ea/dml-language-reference.md ---------------------------------------------------------------------- diff --git a/dml-language-reference.md b/dml-language-reference.md index fca2b9b..31f7d23 100644 --- a/dml-language-reference.md +++ b/dml-language-reference.md @@ -61,8 +61,6 @@ limitations under the License. * [Transforming Frames](dml-language-reference.html#transforming-frames) * [Modules](dml-language-reference.html#modules) * [Reserved Keywords](dml-language-reference.html#reserved-keywords) - * [Invocation of SystemML](dml-language-reference.html#invocation-of-systemml) - * [MLContext API](dml-language-reference.html#mlcontext-api) ## Introduction @@ -334,7 +332,7 @@ var is an integer scalar variable. lower, upper, and increment are integer expre [lower]:[upper] defines a sequence of numbers with increment 1: {lower, lower + 1, lower + 2, â¦, upper â 1, upper}. -Similarly, seq([lower],[upper],[increment]) defines a sequence of numbers: {lower, lower + increment, lower + 2(increment), ⦠}. For each element in the sequence, var is assigned the value, and statements in the for loop body are executed. +Similarly, `seq([lower],[upper],[increment])` defines a sequence of numbers: {lower, lower + increment, lower + 2(increment), ⦠}. For each element in the sequence, var is assigned the value, and statements in the for loop body are executed. The for loop body may contain any sequence of statements. The statements in the for statement body must be surrounded by braces, even if the body only has a single statement. http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/fd96a3ea/engine-dev-guide.md ---------------------------------------------------------------------- diff --git a/engine-dev-guide.md b/engine-dev-guide.md index 8dff7f7..557f864 100644 --- a/engine-dev-guide.md +++ b/engine-dev-guide.md @@ -63,7 +63,7 @@ The `DMLScript` class serves as the main entrypoint to SystemML. Executing `DMLScript` with no arguments displays usage information. A script file can be specified using the `-f` argument. In Eclipse, a Debug Configuration can be created with `DMLScript` as the Main class and any arguments specified as -Program arguments. A PyDML script requires the addition of a `-python` switch. +Program arguments. Suppose that we have a `hello.dml` script containing the following:
