From e36182cd8c5dd5c6d0aa1f77cf5cdca87e8bb1f0 Mon Sep 17 00:00:00 2001
From: Joseph Redmon <pjreddie@gmail.com>
Date: Fri, 21 Nov 2014 23:35:19 +0000
Subject: [PATCH] cleaned up data parsing a lot. probably nothing broken?

---
 src/mini_blas.h |   81 +++++++++++++++++++++++++++++++++++-----
 1 files changed, 70 insertions(+), 11 deletions(-)

diff --git a/src/mini_blas.h b/src/mini_blas.h
index 46a37d3..07b7cc6 100644
--- a/src/mini_blas.h
+++ b/src/mini_blas.h
@@ -1,11 +1,70 @@
-void pm(int M, int N, double *A);
-void gemm(int TA, int TB, int M, int N, int K, double ALPHA, 
-                    double *A, int lda, 
-                    double *B, int ldb,
-                    double BETA,
-                    double *C, int ldc);
-void im2row(double *image, int h, int w, int c, int size, int stride, double *matrix);
-void im2col(double *image, int h, int w, int c, int size, int stride, double *matrix);
-void im2col_cpu(double* data_im, const int channels,
-        const int height, const int width, const int ksize, const int stride,
-        double* data_col);
+#include "opencl.h"
+
+void pm(int M, int N, float *A);
+void gemm(int TA, int TB, int M, int N, int K, float ALPHA, 
+                    float *A, int lda, 
+                    float *B, int ldb,
+                    float BETA,
+                    float *C, int ldc);
+float *random_matrix(int rows, int cols);
+void time_random_matrix(int TA, int TB, int m, int k, int n);
+
+#ifdef GPU
+void axpy_ongpu(int N, float ALPHA, cl_mem X, int INCX, cl_mem Y, int INCY);
+void axpy_ongpu_offset(int N, float ALPHA, cl_mem X, int OFFX, int INCX, cl_mem Y, int OFFY, int INCY);
+void copy_ongpu(int N, cl_mem X, int INCX, cl_mem Y, int INCY);
+void copy_ongpu_offset(int N, cl_mem X, int OFFX, int INCX, cl_mem Y, int OFFY, int INCY);
+void scal_ongpu(int N, float ALPHA, cl_mem X, int INCX);
+void im2col_ongpu(cl_mem data_im, int batch,
+         int channels, int height, int width,
+         int ksize, int stride, int pad, cl_mem data_col);
+
+void col2im_gpu(float *data_col,  int batch,
+         int channels,  int height,  int width,
+         int ksize,  int stride,  int pad, float *data_im);
+void col2im_ongpu(cl_mem data_col, int batch,
+        int channels, int height, int width,
+        int ksize, int stride, int pad, cl_mem data_im);
+
+void im2col_gpu(float *data_im, int batch,
+         int channels, int height, int width,
+         int ksize, int stride, int pad, float *data_col);
+
+void gemm_ongpu_offset(int TA, int TB, int M, int N, int K, float ALPHA, 
+        cl_mem A_gpu, int a_off, int lda, 
+        cl_mem B_gpu, int b_off, int ldb,
+        float BETA,
+        cl_mem C_gpu, int c_off, int ldc);
+
+void gemm_ongpu(int TA, int TB, int M, int N, int K, float ALPHA, 
+        cl_mem A_gpu, int lda, 
+        cl_mem B_gpu, int ldb,
+        float BETA,
+        cl_mem C_gpu, int ldc);
+#endif
+
+void im2col_cpu(float* data_im, int batch,
+    int channels, int height, int width,
+    int ksize, int stride, int pad, float* data_col);
+
+void col2im_cpu(float* data_col, int batch,
+        int channels, int height, int width,
+        int ksize, int stride, int pad, float* data_im);
+
+void test_blas();
+
+void gemm_gpu(int TA, int TB, int M, int N, int K, float ALPHA, 
+        float *A, int lda, 
+        float *B, int ldb,
+        float BETA,
+        float *C, int ldc);
+void gemm_cpu(int TA, int TB, int M, int N, int K, float ALPHA, 
+                    float *A, int lda, 
+                    float *B, int ldb,
+                    float BETA,
+                    float *C, int ldc);
+void axpy_cpu(int N, float ALPHA, float *X, int INCX, float *Y, int INCY);
+void copy_cpu(int N, float *X, int INCX, float *Y, int INCY);
+void scal_cpu(int N, float ALPHA, float *X, int INCX);
+float dot_cpu(int N, float *X, int INCX, float *Y, int INCY);
+void test_gpu_blas();

--
Gitblit v1.10.0