5 files changed, 55 insertions, 0 deletions

diff --git a/nerv/lib/matrix/generic/cukernel.cu b/nerv/lib/matrix/generic/cukernel.cu
index 82bea14..4447f7c 100644
--- a/nerv/lib/matrix/generic/cukernel.cu
+++ b/nerv/lib/matrix/generic/cukernel.cu
@@ -263,6 +263,14 @@ __global__ void cudak_(add_row)(const MATRIX_ELEM *a, MATRIX_ELEM *b,
     b[j + i * stride] += beta * a[j];
 }
 
+__global__ void cudak_(add_col)(const MATRIX_ELEM *a, MATRIX_ELEM *b,
+                                int nrow, int ncol, int astride, int bstride, double beta) {
+    int j = blockIdx.x * blockDim.x + threadIdx.x;
+    int i = blockIdx.y * blockDim.y + threadIdx.y;
+    if (i >= nrow || j >= ncol) return;
+    b[j + i * bstride] += beta * a[i * astride];
+}
+
 __global__ void cudak_(fill)(MATRIX_ELEM *a,
                             int nrow, int ncol, int stride, double val) {
     int j = blockIdx.x * blockDim.x + threadIdx.x;
@@ -735,6 +743,17 @@ extern "C" {
         cudaStreamSynchronize(0);
     }
 
+    void cudak_(cuda_add_col)(const Matrix *a, Matrix *b, double beta) {
+        dim3 threadsPerBlock(CUDA_THREADS_N, CUDA_THREADS_N);
+        dim3 numBlocks(CEIL_DIV(b->ncol, threadsPerBlock.x),
+                CEIL_DIV(b->nrow, threadsPerBlock.y));
+        cudak_(add_col)<<<numBlocks, threadsPerBlock>>> \
+            (MATRIX_ELEM_PTR(a), MATRIX_ELEM_PTR(b), b->nrow, b->ncol,
+            a->stride / sizeof(MATRIX_ELEM),
+            b->stride / sizeof(MATRIX_ELEM), beta);
+        cudaStreamSynchronize(0);
+    }
+
     void cudak_(cuda_fill)(Matrix *a, double val) {
         dim3 threadsPerBlock(CUDA_THREADS_N, CUDA_THREADS_N);
         dim3 numBlocks(CEIL_DIV(a->ncol, threadsPerBlock.x),
diff --git a/nerv/lib/matrix/generic/cumatrix.c b/nerv/lib/matrix/generic/cumatrix.c
index 432222a..52cfe50 100644
--- a/nerv/lib/matrix/generic/cumatrix.c
+++ b/nerv/lib/matrix/generic/cumatrix.c
@@ -244,6 +244,18 @@ void nerv_matrix_(add_row)(Matrix *b, const Matrix *a, double beta,
     NERV_SET_STATUS(status, NERV_NORMAL, 0);
 }
 
+void nerv_matrix_(add_col)(Matrix *b, const Matrix *a, double beta,
+                            CuContext *context, Status *status) {
+    if (a->nrow != b->nrow)
+        NERV_EXIT_STATUS(status, MAT_MISMATCH_DIM, 0);
+    if (a->ncol != 1)
+        NERV_EXIT_STATUS(status, MAT_COL_VECTOR_EXP, 0);
+    PROFILE_START
+    cudak_(cuda_add_col)(a, b, beta);
+    PROFILE_STOP
+    NERV_SET_STATUS(status, NERV_NORMAL, 0);
+}
+
 void nerv_matrix_(fill)(Matrix *self, double val,
                         CuContext *context, Status *status) {
     PROFILE_START
diff --git a/nerv/lib/matrix/generic/cumatrix.h b/nerv/lib/matrix/generic/cumatrix.h
index 459513b..9addae3 100644
--- a/nerv/lib/matrix/generic/cumatrix.h
+++ b/nerv/lib/matrix/generic/cumatrix.h
@@ -34,6 +34,8 @@ void nerv_matrix_(rowmax_idx)(Matrix *a, Matrix **b, Matrix **idx,
                                 CuContext *context, Status *status);
 void nerv_matrix_(add_row)(Matrix *b, const Matrix *a, double beta,
                             CuContext *context, Status *status);
+void nerv_matrix_(add_col)(Matrix *b, const Matrix *a, double beta,
+                            CuContext *context, Status *status);
 void nerv_matrix_(clip)(Matrix *self, double val1, double val2,
                         CuContext *context, Status *status);
 void nerv_matrix_(fill)(Matrix *self, double val,
diff --git a/nerv/lib/matrix/generic/mmatrix.c b/nerv/lib/matrix/generic/mmatrix.c
index e76d4fb..54360d5 100644
--- a/nerv/lib/matrix/generic/mmatrix.c
+++ b/nerv/lib/matrix/generic/mmatrix.c
@@ -243,6 +243,26 @@ void nerv_matrix_(add_row)(Matrix *b, const Matrix *a, double beta,
     NERV_SET_STATUS(status, NERV_NORMAL, 0);
 }
 
+void nerv_matrix_(add_col)(Matrix *b, const Matrix *a, double beta,
+                            MContext *context, Status *status) {
+    if (a->nrow != b->nrow)
+        NERV_EXIT_STATUS(status, MAT_MISMATCH_DIM, 0);
+    if (a->ncol != 1)
+        NERV_EXIT_STATUS(status, MAT_COL_VECTOR_EXP, 0);
+    MATRIX_ELEM *arow = MATRIX_ELEM_PTR(a);
+    MATRIX_ELEM *brow = MATRIX_ELEM_PTR(b);
+    int i, j;
+    size_t astride = a->stride, bstride = b->stride;
+    for (i = 0; i < b->nrow; i++)
+    {
+        for (j = 0; j < b->ncol; j++)
+            brow[j] += arow[0] * beta;
+        arow = MATRIX_NEXT_ROW_PTR(arow, astride);
+        brow = MATRIX_NEXT_ROW_PTR(brow, bstride);
+    }
+    NERV_SET_STATUS(status, NERV_NORMAL, 0);
+}
+
 void nerv_matrix_(clip)(Matrix *self, double val1, double val2,
                         MContext *context, Status *status) {
     int i, j;
diff --git a/nerv/lib/matrix/generic/mmatrix.h b/nerv/lib/matrix/generic/mmatrix.h
index 7f494d6..2a3fea8 100644
--- a/nerv/lib/matrix/generic/mmatrix.h
+++ b/nerv/lib/matrix/generic/mmatrix.h
@@ -35,6 +35,8 @@ void nerv_matrix_(rowmax_idx)(Matrix *a, Matrix **b, Matrix **idx,
                             MContext *context, Status *status);
 void nerv_matrix_(add_row)(Matrix *b, const Matrix *a, double beta,
                             MContext *context, Status *status);
+void nerv_matrix_(add_col)(Matrix *b, const Matrix *a, double beta,
+                            MContext *context, Status *status);
 void nerv_matrix_(clip)(Matrix *self, double val1, double val2,
                         MContext *context, Status *status);
 void nerv_matrix_(diagonalize)(Matrix *self, MContext *context, Status *status);