Repository: systemml Updated Branches: refs/heads/master 628ffad1b -> 6363295cd
[MINOR] Fix sphinx build warnings for python documentation Closes #638. Project: http://git-wip-us.apache.org/repos/asf/systemml/repo Commit: http://git-wip-us.apache.org/repos/asf/systemml/commit/6363295c Tree: http://git-wip-us.apache.org/repos/asf/systemml/tree/6363295c Diff: http://git-wip-us.apache.org/repos/asf/systemml/diff/6363295c Branch: refs/heads/master Commit: 6363295cd44c09365cd93ebfee04384495a67000 Parents: 628ffad Author: Glenn Weidner <[email protected]> Authored: Thu Aug 24 15:24:18 2017 -0700 Committer: Glenn Weidner <[email protected]> Committed: Thu Aug 24 15:24:18 2017 -0700 ---------------------------------------------------------------------- src/main/python/systemml/converters.py | 4 ++-- src/main/python/systemml/defmatrix.py | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/systemml/blob/6363295c/src/main/python/systemml/converters.py ---------------------------------------------------------------------- diff --git a/src/main/python/systemml/converters.py b/src/main/python/systemml/converters.py index 1309cb9..aaa9f88 100644 --- a/src/main/python/systemml/converters.py +++ b/src/main/python/systemml/converters.py @@ -218,8 +218,8 @@ def convertToNumPyArr(sc, mb): # Returns the mean of a model if defined otherwise None def getDatasetMean(dataset_name): """ - Input Parameters - ---------------- + Parameters + ---------- dataset_name: Name of the dataset used to train model. This name is artificial name based on dataset used to train the model. Returns http://git-wip-us.apache.org/repos/asf/systemml/blob/6363295c/src/main/python/systemml/defmatrix.py ---------------------------------------------------------------------- diff --git a/src/main/python/systemml/defmatrix.py b/src/main/python/systemml/defmatrix.py index 3e13bf2..e9bd4b1 100644 --- a/src/main/python/systemml/defmatrix.py +++ b/src/main/python/systemml/defmatrix.py @@ -406,17 +406,17 @@ class matrix(object): 3. A matrix object can either be evaluated or not. If evaluated, the attribute 'data' is set to one of the supported types (for example: NumPy array or DataFrame). In this case, the attribute 'op' is set to None. If not evaluated, the attribute 'op' which refers to one of the intermediate node of AST and if of type DMLOp. In this case, the attribute 'data' is set to None. - 5. DMLOp has an attribute 'inputs' which contains list of matrix objects or DMLOp. - 6. To simplify the traversal, every matrix object is considered immutable and an matrix operations creates a new matrix object. + 4. DMLOp has an attribute 'inputs' which contains list of matrix objects or DMLOp. + 5. To simplify the traversal, every matrix object is considered immutable and an matrix operations creates a new matrix object. As an example: `m1 = sml.matrix(np.ones((3,3)))` creates a matrix object backed by 'data=(np.ones((3,3))'. `m1 = m1 * 2` will create a new matrix object which is now backed by 'op=DMLOp( ... )' whose input is earlier created matrix object. - 7. Left indexing (implemented in __setitem__ method) is a special case, where Python expects the existing object to be mutated. + 6. Left indexing (implemented in __setitem__ method) is a special case, where Python expects the existing object to be mutated. To ensure the above property, we make deep copy of existing object and point any references to the left-indexed matrix to the newly created object. Then the left-indexed matrix is set to be backed by DMLOp consisting of following pydml: left-indexed-matrix = new-deep-copied-matrix left-indexed-matrix[index] = value - 8. Please use m.print_ast() and/or type `m` for debugging. Here is a sample session: + 7. Please use m.print_ast() and/or type `m` for debugging. Here is a sample session: >>> npm = np.ones((3,3)) >>> m1 = sml.matrix(npm + 3)
