From 2d18a8a737c4eb68e23a5cf65156493941909c56 Mon Sep 17 00:00:00 2001 From: cloudygoose Date: Sun, 31 May 2015 23:16:47 +0800 Subject: ... --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index f72b271..858aeaa 100644 --- a/README.md +++ b/README.md @@ -28,7 +28,7 @@ Nerv uses [luaT]\(a [Torch] library\) to define lua class in C. Enables object-oriented programming in Nerv. * __[The Nerv utility functions](doc/nerv.md)__ Inlcudes some utility functions from luaT to implement __Nerv.Class__. -* __The Nerv Matrix Package__ +* __The Nerv Matrix Package(doc/nerv_matrix.md)__ The Matrix package is a basic package in __Nerv__ that is used to store and manipulate matrices. [luaT]:https://github.com/torch/torch7/tree/master/lib/luaT -- cgit v1.2.3-70-g09d2 From fb9548b7b43b1e2d5df76ee6312071996461c227 Mon Sep 17 00:00:00 2001 From: cloudygoose Date: Mon, 1 Jun 2015 16:27:41 +0800 Subject: added matrix doc --- doc/nerv_matrix.md | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 doc/nerv_matrix.md diff --git a/doc/nerv_matrix.md b/doc/nerv_matrix.md new file mode 100644 index 0000000..c710ac8 --- /dev/null +++ b/doc/nerv_matrix.md @@ -0,0 +1,32 @@ +#The Nerv Matrix Package# +Part of the [Nerv](../README.md) toolkit. + +##Description## +###Underlying structure### +In the begining is could be useful to know something about the underlying structure of a __Nerv__ matrix. +Every matrix object is a encapsulation of a C struct that describes the attributes of this matrix. +``` +typedef struct Matrix { + size_t stride; /* size of a row */ + long ncol, nrow, nmax; /* dimension of the matrix */ + union { + float *f; + double *d; + long *i; + } data; /* pointer to actual storage */ + long *data_ref; +} Matrix; +``` +It is worth mentioning that that `data_ref` is a counter which counts the number of references to its memory space, mind that it will also be increased when a row of the matrix is referenced(`col = m[2]`). A __Nerv__ matrix will deallocate its space when this counter is decreased to zero. +Also note that all assigning operation in __Nerv__ is reference copy, you can use `copy_tod` or `copy_toh` method to copy value. + +###Class hierarchy### +The class hierarchy of the matrix classes can be clearly observed in `matrix/init.c`. +First there is a abstract base class __Nerv.Matrix__, which is inherited by __Nerv.CuMatrix__ and __Nerv.MMatrix__(also abstract). +Finally, there is __Nerv.CuMatrixFloat__, __Nerv.CuMatrixDouble__, inheriting __Nerv.CuMatrix__, and __Nerv.MMatrixFloat__, __Nerv.MMatrixDouble__, inheriting __Nerv.MMatrix__. + +##Methods## +Mind that usually a matrix object can only do calculation with matrix of its own type(a __Nerv.CuMatrixFloat__ matrix can only do add operation with a __Nerv.CuMatrixFloat__). +In the methods description below, __Matrix__ could be __Nerv.CuMatrixFloat__, __Nerv.CuMatrixDouble__, __Nerv.MMatrixFloat__ or __Nerv.MMatrixDouble__. +* __Matrix = Matrix(int nrow, int ncol)__ +Returns a __Matrix__ object of `nrow` rows and `ncol` columns. \ No newline at end of file -- cgit v1.2.3-70-g09d2 From 03828f54358dfb7e44f9632996b2e24f61e25cd9 Mon Sep 17 00:00:00 2001 From: cloudygoose Date: Mon, 1 Jun 2015 16:28:18 +0800 Subject: ... --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 858aeaa..d55672b 100644 --- a/README.md +++ b/README.md @@ -28,7 +28,7 @@ Nerv uses [luaT]\(a [Torch] library\) to define lua class in C. Enables object-oriented programming in Nerv. * __[The Nerv utility functions](doc/nerv.md)__ Inlcudes some utility functions from luaT to implement __Nerv.Class__. -* __The Nerv Matrix Package(doc/nerv_matrix.md)__ +* __[The Nerv Matrix Package](doc/nerv_matrix.md)__ The Matrix package is a basic package in __Nerv__ that is used to store and manipulate matrices. [luaT]:https://github.com/torch/torch7/tree/master/lib/luaT -- cgit v1.2.3-70-g09d2