Merge branch 'pr-186'
Project: http://git-wip-us.apache.org/repos/asf/incubator-systemml/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-systemml/commit/71013e75 Tree: http://git-wip-us.apache.org/repos/asf/incubator-systemml/tree/71013e75 Diff: http://git-wip-us.apache.org/repos/asf/incubator-systemml/diff/71013e75 Branch: refs/heads/master Commit: 71013e758bb994337cda42435f7ff5d736e21342 Parents: b0d3c6c 8cb28b8 Author: Matthias Boehm <[email protected]> Authored: Sat Jul 16 17:19:00 2016 -0700 Committer: Matthias Boehm <[email protected]> Committed: Sat Jul 16 17:19:00 2016 -0700 ---------------------------------------------------------------------- .../sysml/runtime/io/MatrixReaderFactory.java | 14 +++--- .../sysml/runtime/matrix/data/LibMatrixAgg.java | 14 +++--- .../sysml/runtime/matrix/data/LibMatrixDNN.java | 41 ++++++++++++----- .../runtime/matrix/data/LibMatrixDatagen.java | 11 +++-- .../runtime/matrix/data/LibMatrixMult.java | 47 +++++++++++++++----- .../runtime/matrix/data/LibMatrixReorg.java | 2 +- .../sysml/runtime/matrix/data/MatrixBlock.java | 21 +++++++++ 7 files changed, 114 insertions(+), 36 deletions(-) ----------------------------------------------------------------------
