incubator-systemml git commit: [SYSTEMML-1206][SYSTEMML-1207][SYSTEMML-1210] Logo, favicon, trademark for docs

2017-01-26 Thread deron 
Repository: incubator-systemml
Updated Branches:
  refs/heads/gh-pages f802be0df -> 20e46a8ec


[SYSTEMML-1206][SYSTEMML-1207][SYSTEMML-1210] Logo, favicon, trademark for docs

Update project documentation logo to new logo from main website.
Update favicon.png to new favicon.png from main website.
Add trademark symbol to SystemML in header.
Modify styles, mostly for header.

Closes #365.


Project: http://git-wip-us.apache.org/repos/asf/incubator-systemml/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/incubator-systemml/commit/20e46a8e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-systemml/tree/20e46a8e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-systemml/diff/20e46a8e

Branch: refs/heads/gh-pages
Commit: 20e46a8ec69b450e495517db74d7d9868fe71ab6
Parents: f802be0
Author: Deron Eriksson 
Authored: Thu Jan 26 17:02:42 2017 -0800
Committer: Deron Eriksson 
Committed: Thu Jan 26 17:02:42 2017 -0800

--
 _layouts/global.html  |   2 +-
 css/main.css  |  21 +++--
 img/favicon.png   | Bin 2774 -> 461 bytes
 img/systemml-logo.png | Bin 40071 -> 982 bytes
 4 files changed, 16 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/20e46a8e/_layouts/global.html
--
diff --git a/_layouts/global.html b/_layouts/global.html
index f7cb969..1aa5296 100644
--- a/_layouts/global.html
+++ b/_layouts/global.html
@@ -28,7 +28,7 @@
 
 
 
-Apache SystemML 
(incubating)
+Apache SystemML™ (incubating)
 {{site.SYSTEMML_VERSION}}
 
 

http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/20e46a8e/css/main.css
--
diff --git a/css/main.css b/css/main.css
index 27bfe0d..661d9e6 100644
--- a/css/main.css
+++ b/css/main.css
@@ -5,6 +5,7 @@
 /* Overall */
 body {
   padding-top: 51px !important;
+  -moz-osx-font-smoothing: grayscale;
 }
 
 body #content {
@@ -38,25 +39,27 @@ a:hover code {
 
 /* Branding */
 .brand {
-  font-weight: bold !important;
+  font-weight: normal !important;
   padding-top: 0px;
   padding-bottom: 0px;
   max-width: 75%;
 }
 
 img.logo {
-  height: 100%;
-  margin-right: 0.2em;
+  height: 31px;
+  width: 32px;
+  margin-right: 10px;
   display: none;
+  margin-top: 10px;
+  margin-left: 10px;
 }
 
 /* Navigation Bar */
 .navbar {
-  background-color: #152935;
+  background-color: rgba(0, 0, 0, 0.9);
 }
 
 .navbar .container {
-  background-color: #152935;
   background-image: none;
 }
 
@@ -79,7 +82,7 @@ img.logo {
 }
 
 .navbar .projecttitle {
-  margin-top: 10px;
+  margin-top: 7px;
   height: 40px;
   white-space: nowrap;
 }
@@ -196,6 +199,12 @@ a {
   color: #0c8672;
 }
 
+#trademark {
+font-size: 0.5em;
+font-weight: 300;
+vertical-align: middle;
+}
+
 /* Media queries */
 @media only screen and (max-device-width: 768px) and (orientation : landscape) 
{
   /* landscape mobile */

http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/20e46a8e/img/favicon.png
--
diff --git a/img/favicon.png b/img/favicon.png
index 2388972..c5311b9 100644
Binary files a/img/favicon.png and b/img/favicon.png differ

http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/20e46a8e/img/systemml-logo.png
--
diff --git a/img/systemml-logo.png b/img/systemml-logo.png
index 87ae161..85e07bf 100644
Binary files a/img/systemml-logo.png and b/img/systemml-logo.png differ

incubator-systemml git commit: [SYSTEMML-1206][SYSTEMML-1207][SYSTEMML-1210] Logo, favicon, trademark for docs

2017-01-26 Thread deron 
Repository: incubator-systemml
Updated Branches:
  refs/heads/master 6bcc82359 -> 2fc337bdd


[SYSTEMML-1206][SYSTEMML-1207][SYSTEMML-1210] Logo, favicon, trademark for docs

Update project documentation logo to new logo from main website.
Update favicon.png to new favicon.png from main website.
Add trademark symbol to SystemML in header.
Modify styles, mostly for header.

Closes #365.


Project: http://git-wip-us.apache.org/repos/asf/incubator-systemml/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/incubator-systemml/commit/2fc337bd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-systemml/tree/2fc337bd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-systemml/diff/2fc337bd

Branch: refs/heads/master
Commit: 2fc337bddd71f693b902a2786d0d794d2ed340a5
Parents: 6bcc823
Author: Deron Eriksson 
Authored: Thu Jan 26 17:02:42 2017 -0800
Committer: Deron Eriksson 
Committed: Thu Jan 26 17:02:42 2017 -0800

--
 docs/_layouts/global.html  |   2 +-
 docs/css/main.css  |  21 +++--
 docs/img/favicon.png   | Bin 2774 -> 461 bytes
 docs/img/systemml-logo.png | Bin 40071 -> 982 bytes
 4 files changed, 16 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/2fc337bd/docs/_layouts/global.html
--
diff --git a/docs/_layouts/global.html b/docs/_layouts/global.html
index f7cb969..1aa5296 100644
--- a/docs/_layouts/global.html
+++ b/docs/_layouts/global.html
@@ -28,7 +28,7 @@
 
 
 
-Apache SystemML 
(incubating)
+Apache SystemML™ (incubating)
 {{site.SYSTEMML_VERSION}}
 
 

http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/2fc337bd/docs/css/main.css
--
diff --git a/docs/css/main.css b/docs/css/main.css
index 27bfe0d..661d9e6 100644
--- a/docs/css/main.css
+++ b/docs/css/main.css
@@ -5,6 +5,7 @@
 /* Overall */
 body {
   padding-top: 51px !important;
+  -moz-osx-font-smoothing: grayscale;
 }
 
 body #content {
@@ -38,25 +39,27 @@ a:hover code {
 
 /* Branding */
 .brand {
-  font-weight: bold !important;
+  font-weight: normal !important;
   padding-top: 0px;
   padding-bottom: 0px;
   max-width: 75%;
 }
 
 img.logo {
-  height: 100%;
-  margin-right: 0.2em;
+  height: 31px;
+  width: 32px;
+  margin-right: 10px;
   display: none;
+  margin-top: 10px;
+  margin-left: 10px;
 }
 
 /* Navigation Bar */
 .navbar {
-  background-color: #152935;
+  background-color: rgba(0, 0, 0, 0.9);
 }
 
 .navbar .container {
-  background-color: #152935;
   background-image: none;
 }
 
@@ -79,7 +82,7 @@ img.logo {
 }
 
 .navbar .projecttitle {
-  margin-top: 10px;
+  margin-top: 7px;
   height: 40px;
   white-space: nowrap;
 }
@@ -196,6 +199,12 @@ a {
   color: #0c8672;
 }
 
+#trademark {
+font-size: 0.5em;
+font-weight: 300;
+vertical-align: middle;
+}
+
 /* Media queries */
 @media only screen and (max-device-width: 768px) and (orientation : landscape) 
{
   /* landscape mobile */

http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/2fc337bd/docs/img/favicon.png
--
diff --git a/docs/img/favicon.png b/docs/img/favicon.png
index 2388972..c5311b9 100644
Binary files a/docs/img/favicon.png and b/docs/img/favicon.png differ

http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/2fc337bd/docs/img/systemml-logo.png
--
diff --git a/docs/img/systemml-logo.png b/docs/img/systemml-logo.png
index 87ae161..85e07bf 100644
Binary files a/docs/img/systemml-logo.png and b/docs/img/systemml-logo.png 
differ

[incubator-systemml] Git Push Summary

2017-01-26 Thread acs_s 
Repository: incubator-systemml
Updated Tags:  refs/tags/v0.12.0-incubating-rc2 [created] 120b61436

incubator-systemml git commit: [maven-release-plugin] prepare for next development iteration

2017-01-26 Thread acs_s 
Repository: incubator-systemml
Updated Branches:
  refs/heads/branch-0.12 d96a17f64 -> 09c635629


[maven-release-plugin] prepare for next development iteration


Project: http://git-wip-us.apache.org/repos/asf/incubator-systemml/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/incubator-systemml/commit/09c63562
Tree: http://git-wip-us.apache.org/repos/asf/incubator-systemml/tree/09c63562
Diff: http://git-wip-us.apache.org/repos/asf/incubator-systemml/diff/09c63562

Branch: refs/heads/branch-0.12
Commit: 09c635629e2745d38131f8d696f897c4c148d33f
Parents: d96a17f
Author: Arvind Surve 
Authored: Thu Jan 26 11:41:53 2017 -0800
Committer: Arvind Surve 
Committed: Thu Jan 26 11:41:53 2017 -0800

--
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/09c63562/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 8f56442..7e75074 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,7 +25,7 @@
18

org.apache.systemml
-   0.12.0-incubating
+   0.12.1-SNAPSHOT
systemml
jar
SystemML
@@ -41,7 +41,7 @@

scm:git:g...@github.com:apache/incubator-systemml

scm:git:https://git-wip-us.apache.org/repos/asf/incubator-systemml

https://git-wip-us.apache.org/repos/asf?p=incubator-systemml.git
-   v0.12.0-incubating-rc2
+   HEAD


JIRA

incubator-systemml git commit: [maven-release-plugin] prepare release v0.12.0-incubating-rc2

2017-01-26 Thread acs_s 
Repository: incubator-systemml
Updated Branches:
  refs/heads/branch-0.12 6648ae571 -> d96a17f64


[maven-release-plugin] prepare release v0.12.0-incubating-rc2


Project: http://git-wip-us.apache.org/repos/asf/incubator-systemml/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/incubator-systemml/commit/d96a17f6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-systemml/tree/d96a17f6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-systemml/diff/d96a17f6

Branch: refs/heads/branch-0.12
Commit: d96a17f64cef7f251d9592679ecdee7ac17feb04
Parents: 6648ae5
Author: Arvind Surve 
Authored: Thu Jan 26 11:41:37 2017 -0800
Committer: Arvind Surve 
Committed: Thu Jan 26 11:41:37 2017 -0800

--
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/d96a17f6/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 9ac7e24..8f56442 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,7 +25,7 @@
18

org.apache.systemml
-   0.12.1-incubating-SNAPSHOT
+   0.12.0-incubating
systemml
jar
SystemML
@@ -41,7 +41,7 @@

scm:git:g...@github.com:apache/incubator-systemml

scm:git:https://git-wip-us.apache.org/repos/asf/incubator-systemml

https://git-wip-us.apache.org/repos/asf?p=incubator-systemml.git
-   HEAD
+   v0.12.0-incubating-rc2


JIRA

incubator-systemml git commit: [SYSTEMML-1191] Create RC builds from branch

2017-01-26 Thread acs_s 
Repository: incubator-systemml
Updated Branches:
  refs/heads/branch-0.12 6837b9a2e -> 6648ae571


[SYSTEMML-1191] Create RC builds from branch


Project: http://git-wip-us.apache.org/repos/asf/incubator-systemml/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/incubator-systemml/commit/6648ae57
Tree: http://git-wip-us.apache.org/repos/asf/incubator-systemml/tree/6648ae57
Diff: http://git-wip-us.apache.org/repos/asf/incubator-systemml/diff/6648ae57

Branch: refs/heads/branch-0.12
Commit: 6648ae5710ece1042d8b8e4f0d6ec7a62756bf59
Parents: 6837b9a
Author: Arvind Surve 
Authored: Thu Jan 26 11:22:17 2017 -0800
Committer: Arvind Surve 
Committed: Thu Jan 26 11:22:17 2017 -0800

--
 dev/release/release-build.sh | 24 +---
 pom.xml  |  2 +-
 2 files changed, 14 insertions(+), 12 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/6648ae57/dev/release/release-build.sh
--
diff --git a/dev/release/release-build.sh b/dev/release/release-build.sh
index 54152f2..a118997 100755
--- a/dev/release/release-build.sh
+++ b/dev/release/release-build.sh
@@ -61,6 +61,9 @@ release-build.sh --release-prepare 
--releaseVersion="0.11.0-incubating" --develo
 release-build.sh --release-prepare --releaseVersion="0.11.0-incubating" 
--developmentVersion="0.12.0-SNAPSHOT" --releaseRc="rc1" 
--tag="v0.11.0-incubating-rc1"
 release-build.sh --release-prepare --releaseVersion="0.11.0-incubating" 
--developmentVersion="0.12.0-SNAPSHOT" --releaseRc="rc1" 
--tag="v0.11.0-incubating-rc1"  --gitCommitHash="a874b73" --dryRun
 
+# Create 0.12 RC2 builds from branch-0.12 
+./release-build.sh --release-prepare --releaseVersion="0.12.0-incubating" 
--developmentVersion="0.12.1-incubating-SNAPSHOT" --releaseRc="rc2" 
--tag="v0.12.0-incubating-rc2" --gitCommitHash="branch-0.12"
+
 release-build.sh --release-publish --gitCommitHash="a874b73"
 release-build.sh --release-publish --gitTag="v0.11.0-incubating-rc1"
 
@@ -141,12 +144,12 @@ while [ "${1+defined}" ]; do
 done
 
 
-for env in GPG_PASSPHRASE; do
-  if [ -z "${!env}" ]; then
-echo "ERROR: $env must be set to run this script"
-exit_with_usage
-  fi
-done
+if [[ -z "$GPG_PASSPHRASE" ]]; then
+echo 'The environment variable GPG_PASSPHRASE is not set. Enter the 
passphrase to'
+echo 'unlock the GPG signing key that will be used to sign the release!'
+echo
+stty -echo && printf "GPG passphrase: " && read GPG_PASSPHRASE && printf 
'\n' && stty echo
+fi
 
 if [[ "$RELEASE_PREPARE" == "true" && -z "$RELEASE_VERSION" ]]; then
 echo "ERROR: --releaseVersion must be passed as an argument to run this 
script"
@@ -223,7 +226,7 @@ echo "  "
 function checkout_code {
 # Checkout code
 rm -rf $RELEASE_WORK_DIR
-mkdir $RELEASE_WORK_DIR
+mkdir -p $RELEASE_WORK_DIR
 cd $RELEASE_WORK_DIR
 git clone https://git-wip-us.apache.org/repos/asf/incubator-systemml.git
 cd incubator-systemml
@@ -245,7 +248,7 @@ if [[ "$RELEASE_PREPARE" == "true" ]]; then
 cd $RELEASE_WORK_DIR/incubator-systemml
 
 # Build and prepare the release
-$MVN $PUBLISH_PROFILES release:clean release:prepare $DRY_RUN 
-Dgpg.passphrase="$GPG_PASSPHRASE" -DskipTests -Darguments="-DskipTests" 
-DreleaseVersion="$RELEASE_VERSION" -DdevelopmentVersion="$DEVELOPMENT_VERSION" 
-Dtag="$RELEASE_TAG"
+$MVN $PUBLISH_PROFILES release:clean release:prepare $DRY_RUN 
-Darguments="-Dgpg.passphrase=\"$GPG_PASSPHRASE\" -DskipTests" 
-DreleaseVersion="$RELEASE_VERSION" -DdevelopmentVersion="$DEVELOPMENT_VERSION" 
-Dtag="$RELEASE_TAG"
 
 cd $RELEASE_WORK_DIR
 
@@ -282,8 +285,7 @@ if [[ "$RELEASE_PUBLISH" == "true" ]]; then
 cd $RELEASE_WORK_DIR/incubator-systemml
 
 #Deploy scala 2.10
-mvn 
-DaltDeploymentRepository=apache.releases.https::default::https://repository.apache.org/service/local/staging/deploy/maven2
 clean package gpg:sign install:install deploy:deploy -DskiptTests 
-Darguments="-DskipTests" -Dgpg.passphrase=$GPG_PASSPHRASE $PUBLISH_PROFILES
-
+mvn 
-DaltDeploymentRepository=apache.releases.https::default::https://repository.apache.org/service/local/staging/deploy/maven2
 clean package gpg:sign install:install deploy:deploy -DskiptTests 
-Darguments="-DskipTests -Dgpg.passphrase=\"$GPG_PASSPHRASE\"" 
-Dgpg.passphrase="$GPG_PASSPHRASE" $PUBLISH_PROFILES
 cd "$BASE_DIR" #exit target
 
 exit 0
@@ -308,7 +310,7 @@ if [[ "$RELEASE_SNAPSHOT" == "true" ]]; then
 fi
 
 #Deploy scala 2.10
-$MVN 
-DaltDeploymentRepository=apache.snapshots.https::default::https://repository.apache.org/content/repositories/snapshots
 clean package gpg:sign install:install deploy:deploy -DskiptTests 
-Darguments="-DskipTests" -Dgpg.passphrase=$GPG_PASSPHRASE

incubator-systemml git commit: [SYSTEMML-1198] Ensure release jar included an loaded in Python release artifact

2017-01-26 Thread gweidner 
Repository: incubator-systemml
Updated Branches:
  refs/heads/branch-0.12 379d69063 -> 6837b9a2e


[SYSTEMML-1198] Ensure release jar included an loaded in Python release artifact

Added check for jar without 'snapshot' in file name to handle python artifact
from release build.

Closes #362.


Project: http://git-wip-us.apache.org/repos/asf/incubator-systemml/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/incubator-systemml/commit/6837b9a2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-systemml/tree/6837b9a2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-systemml/diff/6837b9a2

Branch: refs/heads/branch-0.12
Commit: 6837b9a2e85ae0a6b93be6b1920a3e75f12034a2
Parents: 379d690
Author: Glenn Weidner 
Authored: Thu Jan 26 09:09:34 2017 -0800
Committer: Glenn Weidner 
Committed: Thu Jan 26 09:09:34 2017 -0800

--
 src/main/python/pre_setup.py| 2 +-
 src/main/python/systemml/classloader.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/6837b9a2/src/main/python/pre_setup.py
--
diff --git a/src/main/python/pre_setup.py b/src/main/python/pre_setup.py
index 394c4e5..5443a6d 100644
--- a/src/main/python/pre_setup.py
+++ b/src/main/python/pre_setup.py
@@ -30,6 +30,6 @@ if os.path.exists(java_dir_full_path):
 os.mkdir(java_dir_full_path)
 root_dir = os.path.dirname(os.path.dirname(os.path.dirname(os.getcwd(
 for file in os.listdir(os.path.join(root_dir, 'target')):
-if fnmatch.fnmatch(file, 'systemml-*-incubating-SNAPSHOT.jar'):
+if fnmatch.fnmatch(file, 'systemml-*-incubating-SNAPSHOT.jar') or 
fnmatch.fnmatch(file, 'systemml-*-incubating.jar'):
 shutil.copyfile(os.path.join(root_dir, 'target', file),
 os.path.join(java_dir_full_path, file))

http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/6837b9a2/src/main/python/systemml/classloader.py
--
diff --git a/src/main/python/systemml/classloader.py 
b/src/main/python/systemml/classloader.py
index 1085be4..79c0aad 100644
--- a/src/main/python/systemml/classloader.py
+++ b/src/main/python/systemml/classloader.py
@@ -55,7 +55,7 @@ def createJavaObject(sc, obj_type):
 jar_file_name = '_ignore.jar'
 java_dir = os.path.join(imp.find_module("systemml")[1], 
"systemml-java")
 for file in os.listdir(java_dir):
-if fnmatch.fnmatch(file, 'systemml-*-incubating-SNAPSHOT.jar'):
+if fnmatch.fnmatch(file, 'systemml-*-incubating-SNAPSHOT.jar') or 
fnmatch.fnmatch(file, 'systemml-*-incubating.jar'):
 jar_file_name = os.path.join(java_dir, file)
 err_msg = 'Unable to load SystemML.jar into current pyspark session.'
 hint = 'Provide the following argument to pyspark: --driver-class-path 
'

incubator-systemml git commit: [SYSTEMML-1198] Ensure release jar included an loaded in Python release artifact

2017-01-26 Thread gweidner 
Repository: incubator-systemml
Updated Branches:
  refs/heads/master 14ddd3e90 -> 852ba1e78


[SYSTEMML-1198] Ensure release jar included an loaded in Python release artifact

Added check for jar without 'snapshot' in file name to handle python artifact
from release build.

Closes #362.


Project: http://git-wip-us.apache.org/repos/asf/incubator-systemml/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/incubator-systemml/commit/852ba1e7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-systemml/tree/852ba1e7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-systemml/diff/852ba1e7

Branch: refs/heads/master
Commit: 852ba1e787c9d7748f90c0186ecc012f55bfc8f2
Parents: 14ddd3e
Author: Glenn Weidner 
Authored: Thu Jan 26 09:09:34 2017 -0800
Committer: Glenn Weidner 
Committed: Thu Jan 26 09:09:34 2017 -0800

--
 src/main/python/pre_setup.py| 2 +-
 src/main/python/systemml/classloader.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/852ba1e7/src/main/python/pre_setup.py
--
diff --git a/src/main/python/pre_setup.py b/src/main/python/pre_setup.py
index 394c4e5..5443a6d 100644
--- a/src/main/python/pre_setup.py
+++ b/src/main/python/pre_setup.py
@@ -30,6 +30,6 @@ if os.path.exists(java_dir_full_path):
 os.mkdir(java_dir_full_path)
 root_dir = os.path.dirname(os.path.dirname(os.path.dirname(os.getcwd(
 for file in os.listdir(os.path.join(root_dir, 'target')):
-if fnmatch.fnmatch(file, 'systemml-*-incubating-SNAPSHOT.jar'):
+if fnmatch.fnmatch(file, 'systemml-*-incubating-SNAPSHOT.jar') or 
fnmatch.fnmatch(file, 'systemml-*-incubating.jar'):
 shutil.copyfile(os.path.join(root_dir, 'target', file),
 os.path.join(java_dir_full_path, file))

http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/852ba1e7/src/main/python/systemml/classloader.py
--
diff --git a/src/main/python/systemml/classloader.py 
b/src/main/python/systemml/classloader.py
index 1085be4..79c0aad 100644
--- a/src/main/python/systemml/classloader.py
+++ b/src/main/python/systemml/classloader.py
@@ -55,7 +55,7 @@ def createJavaObject(sc, obj_type):
 jar_file_name = '_ignore.jar'
 java_dir = os.path.join(imp.find_module("systemml")[1], 
"systemml-java")
 for file in os.listdir(java_dir):
-if fnmatch.fnmatch(file, 'systemml-*-incubating-SNAPSHOT.jar'):
+if fnmatch.fnmatch(file, 'systemml-*-incubating-SNAPSHOT.jar') or 
fnmatch.fnmatch(file, 'systemml-*-incubating.jar'):
 jar_file_name = os.path.join(java_dir, file)
 err_msg = 'Unable to load SystemML.jar into current pyspark session.'
 hint = 'Provide the following argument to pyspark: --driver-class-path 
'

incubator-systemml git commit: [SYSTEMML-1195] Improve parfor parameter documentation

2017-01-26 Thread deron 
Repository: incubator-systemml
Updated Branches:
  refs/heads/master 10476fc24 -> 4c9fbf4d7


[SYSTEMML-1195] Improve parfor parameter documentation

Add missing parfor log and profile parameters to DML Language Reference.
Update missing parameter values for mode, datapartitioner, and resultmerge
parameters.

Closes #358.


Project: http://git-wip-us.apache.org/repos/asf/incubator-systemml/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/incubator-systemml/commit/4c9fbf4d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-systemml/tree/4c9fbf4d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-systemml/diff/4c9fbf4d

Branch: refs/heads/master
Commit: 4c9fbf4d7030bb2c66738d2b34bb59392e6436bb
Parents: 10476fc
Author: Deron Eriksson 
Authored: Thu Jan 26 00:51:34 2017 -0800
Committer: Deron Eriksson 
Committed: Thu Jan 26 00:51:34 2017 -0800

--
 docs/dml-language-reference.md | 118 +---
 1 file changed, 70 insertions(+), 48 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/4c9fbf4d/docs/dml-language-reference.md
--
diff --git a/docs/dml-language-reference.md b/docs/dml-language-reference.md
index c828e70..f3fba3b 100644
--- a/docs/dml-language-reference.md
+++ b/docs/dml-language-reference.md
@@ -357,51 +357,73 @@ The syntax and semantics of a `parfor` (parallel `for`) 
statement are equivalent
}
 
 ::= <,>*
-::= check = 
-   ||= par = 
-   ||= mode = 
-   ||= taskpartitioner = 
-   ||= tasksize = 
-   ||= datapartitioner = 
-   ||= resultmerge = 
-   ||= opt = 
-
-is one of the following tokens: 0 1
-  is an arbitrary integer number
- is one of the following tokens: LOCAL 
REMOTE_MR
-is one of the following tokens: FIXED 
NAIVE STATIC FACTORING FACTORING_CMIN FACTORING_CMAX
-  is an arbitrary integer number
- is one of the following tokens: NONE 
LOCAL REMOTE_MR
-  is one of the following tokens: LOCAL_MEM 
LOCAL_FILE LOCAL_AUTOMATIC REMOTE_MR
-  is one of the following tokens: NONE 
CONSTRAINED RULEBASED HEURISTIC GREEDY FULL_DP
-
-If any of these parameters is not specified, the following respective defaults 
are used: `check = 1`, `par = [number of virtual processors on master node]`, 
`mode = LOCAL`, `taskpartitioner = FIXED`, `tasksize = 1`, `datapartitioner = 
NONE`, `resultmerge = LOCAL_AUTOMATIC`, `opt = RULEBASED`.
+::
+  = check = 
+   || = par = 
+   || = mode = 
+   || = taskpartitioner = 
+   || = tasksize = 
+   || = datapartitioner = 
+   || = resultmerge = 
+   || = opt = 
+   || = log = 
+   || = profile = 
+
+0 1
+  arbitrary integer number
+ LOCAL REMOTE_MR REMOTE_MR_DP REMOTE_SPARK 
REMOTE_SPARK_DP
+FIXED NAIVE STATIC FACTORING 
FACTORING_CMIN FACTORING_CMAX
+  arbitrary integer number
+ NONE LOCAL REMOTE_MR REMOTE_SPARK
+  LOCAL_MEM LOCAL_FILE LOCAL_AUTOMATIC 
REMOTE_MR REMOTE_SPARK
+  NONE RULEBASED CONSTRAINED HEURISTIC 
GREEDY FULL_DP
+  ALL TRACE DEBUG INFO WARN ERROR FATAL OFF
+0 1
+
+
+If any of these parameters is not specified, the following respective defaults 
are used:
+
+**Table 2**: Parfor default parameter values
+
+Parameter Name  | Default Value
+--- | -
+check   | 1
+par | [number of virtual processors on master node]
+mode| LOCAL
+taskpartitioner | FIXED
+tasksize| 1
+datapartitioner | NONE
+resultmerge | LOCAL_AUTOMATIC
+opt | RULEBASED
+log | INFO
+profile | 0
+
 
 Of particular note is the `check` parameter. SystemML's `parfor` statement by 
default (`check = 1`) performs dependency analysis in an
 attempt to guarantee result correctness for parallel execution. For example, 
the following `parfor` statement is **incorrect** because
-the iterations do not act independently, so they are not parallizable. The 
iterations incorrectly try to increment the same `sum` variable.
+the iterations do not act independently, so they are not parallelizable. The 
iterations incorrectly try to increment the same `sum` variable.
 
sum = 0
parfor(i in 1:3) {
-   sum = sum + i; # not parallizable - generates error
+   sum = sum + i; # not parallelizable - generates error
}
print(sum)
 
 SystemML's `parfor` dependency analysis can occasionally result in false 
positives, as in the following example. This example creates a 2x30