From 0ee43c21af4fcd3aed070b1f5ad1eb9feb2ad159 Mon Sep 17 00:00:00 2001 From: Determinant Date: Wed, 17 Feb 2016 20:14:06 +0800 Subject: try to merge manually --- nerv/lib/matrix/generic/cumatrix.h | 1 + 1 file changed, 1 insertion(+) (limited to 'nerv/lib/matrix/generic/cumatrix.h') diff --git a/nerv/lib/matrix/generic/cumatrix.h b/nerv/lib/matrix/generic/cumatrix.h index 4f66a2c..5b8076f 100644 --- a/nerv/lib/matrix/generic/cumatrix.h +++ b/nerv/lib/matrix/generic/cumatrix.h @@ -61,6 +61,7 @@ void nerv_matrix_(scale_rows_by_col)(Matrix *a, const Matrix *b, Status *status); void nerv_matrix_(scale_rows_by_row)(Matrix *a, const Matrix *b, Status *status); +void nerv_matrix_(prefixsum_row)(Matrix *a, const Matrix *b, Status *status); void nerv_matrix_(thres_mask)(Matrix *a, Matrix *b, double thres, double low, double high, Status *status); -- cgit v1.2.3