diff options
| author | txh18 <cloudygooseg@gmail.com> | 2015-12-10 22:31:10 +0800 |
|---|---|---|
| committer | txh18 <cloudygooseg@gmail.com> | 2015-12-10 22:31:10 +0800 |
| commit | 217c7f5b5c5193cfc7db20b2ee25fc66c54569b6 (patch) | |
| tree | 39d9237cd3a53cd5072cea42fc19f8b1dec2e209 /nerv/lib/matrix/matrix.h | |
| parent | 5cf7e88df3aa4cf60819e955f0f537d2cfeccaac (diff) | |
| parent | 1b0f2ab768e34f126ce946e1689cd47c86f41645 (diff) | |
merge conflict resolve
Diffstat (limited to 'nerv/lib/matrix/matrix.h')
| -rw-r--r-- | nerv/lib/matrix/matrix.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/nerv/lib/matrix/matrix.h b/nerv/lib/matrix/matrix.h index 5a85c08..a28fd97 100644 --- a/nerv/lib/matrix/matrix.h +++ b/nerv/lib/matrix/matrix.h @@ -13,6 +13,7 @@ typedef struct Matrix { double *d; long *i; } data; /* pointer to actual storage */ + unsigned long offset; /* the actual beginning of the matrix */ long *data_ref; curandGenerator_t *curand_gen; } Matrix; |