try a basic merge

1 files changed, 1 insertions, 1 deletions

diff --git a/nerv/lib/matrix/cukernel.h b/nerv/lib/matrix/cukernel.h
index fe682d3..39d42eb 100644
--- a/nerv/lib/matrix/cukernel.h
+++ b/nerv/lib/matrix/cukernel.h
@@ -3,7 +3,7 @@ void cudak_(cuda_mul_elem)(const Matrix *a, const Matrix *b, Matrix *c);
 void cudak_(cuda_log_elem)(const Matrix *a, Matrix *b);
 void cudak_(cuda_sigmoid)(const Matrix *a, Matrix *b);
 void cudak_(cuda_sigmoid_grad)(const Matrix *output, const Matrix *err, Matrix *nerr);
-void cudak_(cuda_rand_uniform)(const Matrix *a); //a's curand_gen may be modified
+void cudak_(cuda_rand_uniform)(const Matrix *a); /* a's curand_gen may be modified */
 void cudak_(cuda_thres_mask)(const Matrix *a, const Matrix *b, double thres, double low, double high);
 void cudak_(cuda_tanh)(const Matrix *a, Matrix *b);
 void cudak_(cuda_tanh_grad)(const Matrix *output, const Matrix *err, Matrix *nerr);