incubator-systemml-website git commit: [SYSTEMML-1021] Create readme with build instructions
Repository: incubator-systemml-website Updated Branches: refs/heads/master 4aa30b1c3 -> 80a447117 [SYSTEMML-1021] Create readme with build instructions Closes #5. Project: http://git-wip-us.apache.org/repos/asf/incubator-systemml-website/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-systemml-website/commit/80a44711 Tree: http://git-wip-us.apache.org/repos/asf/incubator-systemml-website/tree/80a44711 Diff: http://git-wip-us.apache.org/repos/asf/incubator-systemml-website/diff/80a44711 Branch: refs/heads/master Commit: 80a447117538e0efe33b2b42b607aded5d1fd3a3 Parents: 4aa30b1 Author: Dexter LesacaAuthored: Fri Oct 7 13:50:56 2016 -0700 Committer: Deron Eriksson Committed: Fri Oct 7 13:50:56 2016 -0700 -- README.md| 22 ++ _src/assets/js/bundle.min.js | 0 2 files changed, 22 insertions(+) -- http://git-wip-us.apache.org/repos/asf/incubator-systemml-website/blob/80a44711/README.md -- diff --git a/README.md b/README.md new file mode 100644 index 000..6a819e6 --- /dev/null +++ b/README.md @@ -0,0 +1,22 @@ +# SystemML Website + +## Getting Started +### Prerequisites + Node.js and npm +In order to build this project you will need [node.js and npm](https://nodejs.org/). Detailed instructions can be found [here](https://github.com/nodejs/node/wiki/Installation). + + Gulp +We use Gulp to compile Sass and JS aswell as run the Jekyll build. You can install it with npm: +``` +$ npm install -g gulp +``` +### Build + Download dependancies +``` +$ npm install +``` + Build it: +``` +$ gulp +``` +If all goes well it open the site in your browser at `http://localhost:3000`. http://git-wip-us.apache.org/repos/asf/incubator-systemml-website/blob/80a44711/_src/assets/js/bundle.min.js -- diff --git a/_src/assets/js/bundle.min.js b/_src/assets/js/bundle.min.js old mode 100755 new mode 100644
incubator-systemml git commit: [maven-release-plugin] prepare release v0.11.0-incubating-rc2
Repository: incubator-systemml Updated Branches: refs/heads/master f49872e21 -> eceb8a652 [maven-release-plugin] prepare release v0.11.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/eceb8a65 Tree: http://git-wip-us.apache.org/repos/asf/incubator-systemml/tree/eceb8a65 Diff: http://git-wip-us.apache.org/repos/asf/incubator-systemml/diff/eceb8a65 Branch: refs/heads/master Commit: eceb8a6528f44b8616c49035b9961fc6fbb3d3d1 Parents: f49872e Author: Luciano ResendeAuthored: Fri Oct 7 13:40:18 2016 -0700 Committer: Luciano Resende Committed: Fri Oct 7 13:40:18 2016 -0700 -- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/eceb8a65/pom.xml -- diff --git a/pom.xml b/pom.xml index 25ae81f..c82b9e2 100644 --- a/pom.xml +++ b/pom.xml @@ -25,7 +25,7 @@ 18 org.apache.systemml - 0.12.0-incubating-SNAPSHOT + 0.11.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.11.0-incubating-rc2 JIRA
incubator-systemml git commit: [maven-release-plugin] prepare for next development iteration
Repository: incubator-systemml Updated Branches: refs/heads/master eceb8a652 -> 443467049 [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/44346704 Tree: http://git-wip-us.apache.org/repos/asf/incubator-systemml/tree/44346704 Diff: http://git-wip-us.apache.org/repos/asf/incubator-systemml/diff/44346704 Branch: refs/heads/master Commit: 44346704992ffbc33db2a29de8f8b1c4bbfed97e Parents: eceb8a6 Author: Luciano ResendeAuthored: Fri Oct 7 13:40:34 2016 -0700 Committer: Luciano Resende Committed: Fri Oct 7 13:40:34 2016 -0700 -- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/44346704/pom.xml -- diff --git a/pom.xml b/pom.xml index c82b9e2..25ae81f 100644 --- a/pom.xml +++ b/pom.xml @@ -25,7 +25,7 @@ 18 org.apache.systemml - 0.11.0-incubating + 0.12.0-incubating-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.11.0-incubating-rc2 + HEAD JIRA
[incubator-systemml] Git Push Summary
Repository: incubator-systemml Updated Tags: refs/tags/v0.11.0-incubating-rc2 [created] b00c9b650
incubator-systemml git commit: [HOTFIX] Fix wrong arrayutils import in transform utils
Repository: incubator-systemml Updated Branches: refs/heads/master bf66a402f -> f49872e21 [HOTFIX] Fix wrong arrayutils import in transform utils Project: http://git-wip-us.apache.org/repos/asf/incubator-systemml/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-systemml/commit/f49872e2 Tree: http://git-wip-us.apache.org/repos/asf/incubator-systemml/tree/f49872e2 Diff: http://git-wip-us.apache.org/repos/asf/incubator-systemml/diff/f49872e2 Branch: refs/heads/master Commit: f49872e213b5b3839d02dc29996c102b46100869 Parents: bf66a40 Author: Matthias BoehmAuthored: Fri Oct 7 12:07:04 2016 -0700 Committer: Matthias Boehm Committed: Fri Oct 7 12:07:04 2016 -0700 -- .../org/apache/sysml/runtime/transform/meta/TfMetaUtils.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/f49872e2/src/main/java/org/apache/sysml/runtime/transform/meta/TfMetaUtils.java -- diff --git a/src/main/java/org/apache/sysml/runtime/transform/meta/TfMetaUtils.java b/src/main/java/org/apache/sysml/runtime/transform/meta/TfMetaUtils.java index d12ff1d..80e7b23 100644 --- a/src/main/java/org/apache/sysml/runtime/transform/meta/TfMetaUtils.java +++ b/src/main/java/org/apache/sysml/runtime/transform/meta/TfMetaUtils.java @@ -31,8 +31,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map.Entry; -import jodd.util.ArraysUtil; - import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.ArrayUtils; import org.apache.sysml.api.jmlc.Connection; @@ -128,7 +126,7 @@ public class TfMetaUtils colList = new int[attrs.size()]; for(int i=0; i < colList.length; i++) { colList[i] = ids ? UtilFunctions.toInt(attrs.get(i)) : - (ArraysUtil.indexOf(colnames, attrs.get(i)) + 1); + (ArrayUtils.indexOf(colnames, attrs.get(i)) + 1); if( colList[i] <= 0 ) { throw new RuntimeException("Specified column '" + attrs.get(i)+"' does not exist.");
[1/3] incubator-systemml git commit: [SYSTEMML-1014] Fix sparse-safeness flags of matrix-scalar operators
Repository: incubator-systemml Updated Branches: refs/heads/master 80b463345 -> bf66a402f [SYSTEMML-1014] Fix sparse-safeness flags of matrix-scalar operators During the development of the 0.11 release, issues regarding the sparse-safe properties of left/right matrix-scalar operators have been introduced. This patch fixes these issues as well as issues regarding changing properties according to passed constant values. Furthermore, this also includes a fix of a related error message on allocating unsupported large dense blocks >16GB. Project: http://git-wip-us.apache.org/repos/asf/incubator-systemml/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-systemml/commit/18e65b56 Tree: http://git-wip-us.apache.org/repos/asf/incubator-systemml/tree/18e65b56 Diff: http://git-wip-us.apache.org/repos/asf/incubator-systemml/diff/18e65b56 Branch: refs/heads/master Commit: 18e65b5616a331fe3de63707278e695d5f4f8ec0 Parents: 80b4633 Author: Matthias BoehmAuthored: Thu Oct 6 19:49:45 2016 -0700 Committer: Matthias Boehm Committed: Thu Oct 6 19:49:45 2016 -0700 -- .../sysml/runtime/matrix/data/MatrixBlock.java | 3 +- .../matrix/operators/LeftScalarOperator.java| 37 ++--- .../matrix/operators/RightScalarOperator.java | 30 +++ .../matrix/operators/ScalarOperator.java| 57 ++-- 4 files changed, 66 insertions(+), 61 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/18e65b56/src/main/java/org/apache/sysml/runtime/matrix/data/MatrixBlock.java -- diff --git a/src/main/java/org/apache/sysml/runtime/matrix/data/MatrixBlock.java b/src/main/java/org/apache/sysml/runtime/matrix/data/MatrixBlock.java index 0b7801c..d3de376 100644 --- a/src/main/java/org/apache/sysml/runtime/matrix/data/MatrixBlock.java +++ b/src/main/java/org/apache/sysml/runtime/matrix/data/MatrixBlock.java @@ -353,8 +353,9 @@ public class MatrixBlock extends MatrixValue implements CacheBlock, Externalizab //check max size constraint (16GB dense), since java arrays are limited to 2^(32-1) elements) if( limit > Integer.MAX_VALUE ) { + String execType = OptimizerUtils.isSparkExecutionMode() ? "SPARK" : "MR"; throw new RuntimeException("Dense in-memory matrix block ("+rlen+"x"+clen+") exceeds supported size of "+Integer.MAX_VALUE+" elements (16GB). " + - "Please, reduce the JVM heapsize to execute this in MR."); + "Please, report this issue and reduce the JVM heapsize to execute this operation in "+execType+"."); } //allocate block if non-existing or too small (guaranteed to be 0-initialized), http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/18e65b56/src/main/java/org/apache/sysml/runtime/matrix/operators/LeftScalarOperator.java -- diff --git a/src/main/java/org/apache/sysml/runtime/matrix/operators/LeftScalarOperator.java b/src/main/java/org/apache/sysml/runtime/matrix/operators/LeftScalarOperator.java index 2abf775..b8349fc 100644 --- a/src/main/java/org/apache/sysml/runtime/matrix/operators/LeftScalarOperator.java +++ b/src/main/java/org/apache/sysml/runtime/matrix/operators/LeftScalarOperator.java @@ -25,44 +25,37 @@ import org.apache.sysml.runtime.functionobjects.GreaterThan; import org.apache.sysml.runtime.functionobjects.GreaterThanEquals; import org.apache.sysml.runtime.functionobjects.LessThan; import org.apache.sysml.runtime.functionobjects.LessThanEquals; -import org.apache.sysml.runtime.functionobjects.Power; import org.apache.sysml.runtime.functionobjects.ValueFunction; - +/** + * Scalar operator for scalar-matrix operations with scalar + * on the left-hand-side. + * + */ public class LeftScalarOperator extends ScalarOperator -{ - +{ private static final long serialVersionUID = 2360577666575746424L; public LeftScalarOperator(ValueFunction p, double cst) { super(p, cst); - - //disable sparse-safe for c^M because 1^0=1 - if( fn instanceof Power ) - sparseSafe = false; - } - - @Override - public double executeScalar(double in) throws DMLRuntimeException { - return fn.execute(_constant, in); } @Override public void setConstant(double cst) { + //overwrites constant and sparse safe flag super.setConstant(cst); -
[2/3] incubator-systemml git commit: [SYSTEMML-1019] Fix under-utilization local parfor w/o spark operations
[SYSTEMML-1019] Fix under-utilization local parfor w/o spark operations Project: http://git-wip-us.apache.org/repos/asf/incubator-systemml/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-systemml/commit/b30cedf3 Tree: http://git-wip-us.apache.org/repos/asf/incubator-systemml/tree/b30cedf3 Diff: http://git-wip-us.apache.org/repos/asf/incubator-systemml/diff/b30cedf3 Branch: refs/heads/master Commit: b30cedf301972638063067d1bfbb8fd5780756ee Parents: 18e65b5 Author: Matthias BoehmAuthored: Thu Oct 6 20:35:24 2016 -0700 Committer: Matthias Boehm Committed: Thu Oct 6 20:35:24 2016 -0700 -- .../runtime/controlprogram/parfor/opt/OptimizerRuleBased.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/b30cedf3/src/main/java/org/apache/sysml/runtime/controlprogram/parfor/opt/OptimizerRuleBased.java -- diff --git a/src/main/java/org/apache/sysml/runtime/controlprogram/parfor/opt/OptimizerRuleBased.java b/src/main/java/org/apache/sysml/runtime/controlprogram/parfor/opt/OptimizerRuleBased.java index f5fc9ad..d86d99f 100644 --- a/src/main/java/org/apache/sysml/runtime/controlprogram/parfor/opt/OptimizerRuleBased.java +++ b/src/main/java/org/apache/sysml/runtime/controlprogram/parfor/opt/OptimizerRuleBased.java @@ -1440,7 +1440,7 @@ public class OptimizerRuleBased extends Optimizer //ensure local memory constraint (for spark more conservative in order to //prevent unnecessary guarded collect) - double mem = OptimizerUtils.isSparkExecutionMode() ? _lm/2 : _lm; + double mem = (OptimizerUtils.isSparkExecutionMode() && !n.isCPOnly()) ? _lm/2 : _lm; kMax = Math.min( kMax, (int)Math.floor( mem / M ) ); kMax = Math.max( kMax, 1);
[3/3] incubator-systemml git commit: [SYSTEMML-1018] Fix transformdecode output schema (double for pt cols)
[SYSTEMML-1018] Fix transformdecode output schema (double for pt cols) So far transformdecode (in cp and spark) always created a pure string schema. This patch extends the decoder factory to automatically determine the schema (with double columns for pass-through columns, i.e., columns without transform specification). Overall, this leads to improved memory efficiency (due to encoding as native types) and improved performance of subsequent operations (e.g., by avoiding unnecessary string-double parsing). Furthermore, we now also consistently use array-based schemas in all decoders. Project: http://git-wip-us.apache.org/repos/asf/incubator-systemml/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-systemml/commit/bf66a402 Tree: http://git-wip-us.apache.org/repos/asf/incubator-systemml/tree/bf66a402 Diff: http://git-wip-us.apache.org/repos/asf/incubator-systemml/diff/bf66a402 Branch: refs/heads/master Commit: bf66a402ffb952fec27c642c6f2b9cc40927c410 Parents: b30cedf Author: Matthias BoehmAuthored: Thu Oct 6 22:54:04 2016 -0700 Committer: Matthias Boehm Committed: Thu Oct 6 22:54:04 2016 -0700 -- .../cp/ParameterizedBuiltinCPInstruction.java | 3 +-- .../spark/ParameterizedBuiltinSPInstruction.java | 9 - .../sysml/runtime/transform/decode/Decoder.java| 13 ++--- .../runtime/transform/decode/DecoderComposite.java | 4 ++-- .../runtime/transform/decode/DecoderDummycode.java | 4 +--- .../runtime/transform/decode/DecoderFactory.java | 17 + .../transform/decode/DecoderPassThrough.java | 6 ++ .../runtime/transform/decode/DecoderRecode.java| 5 ++--- 8 files changed, 31 insertions(+), 30 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/bf66a402/src/main/java/org/apache/sysml/runtime/instructions/cp/ParameterizedBuiltinCPInstruction.java -- diff --git a/src/main/java/org/apache/sysml/runtime/instructions/cp/ParameterizedBuiltinCPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/cp/ParameterizedBuiltinCPInstruction.java index 299fb3c..7b1fb57 100644 --- a/src/main/java/org/apache/sysml/runtime/instructions/cp/ParameterizedBuiltinCPInstruction.java +++ b/src/main/java/org/apache/sysml/runtime/instructions/cp/ParameterizedBuiltinCPInstruction.java @@ -24,7 +24,6 @@ import java.util.HashMap; import org.apache.sysml.lops.Lop; import org.apache.sysml.parser.ParameterizedBuiltinFunctionExpression; import org.apache.sysml.parser.Statement; -import org.apache.sysml.parser.Expression.ValueType; import org.apache.sysml.runtime.DMLRuntimeException; import org.apache.sysml.runtime.controlprogram.caching.CacheableData; import org.apache.sysml.runtime.controlprogram.caching.FrameObject; @@ -288,7 +287,7 @@ public class ParameterizedBuiltinCPInstruction extends ComputationCPInstruction //compute transformdecode Decoder decoder = DecoderFactory.createDecoder(getParameterMap().get("spec"), colnames, null, meta); - FrameBlock fbout = decoder.decode(data, new FrameBlock(meta.getNumColumns(), ValueType.STRING)); + FrameBlock fbout = decoder.decode(data, new FrameBlock(decoder.getSchema())); //release locks ec.setFrameOutput(output.getName(), fbout); http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/bf66a402/src/main/java/org/apache/sysml/runtime/instructions/spark/ParameterizedBuiltinSPInstruction.java -- diff --git a/src/main/java/org/apache/sysml/runtime/instructions/spark/ParameterizedBuiltinSPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/spark/ParameterizedBuiltinSPInstruction.java index df05702..7c5e39e 100644 --- a/src/main/java/org/apache/sysml/runtime/instructions/spark/ParameterizedBuiltinSPInstruction.java +++ b/src/main/java/org/apache/sysml/runtime/instructions/spark/ParameterizedBuiltinSPInstruction.java @@ -486,7 +486,7 @@ public class ParameterizedBuiltinSPInstruction extends ComputationSPInstruction //construct decoder and decode individual matrix blocks Decoder decoder = DecoderFactory.createDecoder(params.get("spec"), colnames, null, meta); JavaPairRDD out = in.mapToPair( - new RDDTransformDecodeFunction(decoder, meta.getNumColumns(), mc.getRowsPerBlock())); + new RDDTransformDecodeFunction(decoder, mc.getRowsPerBlock()));