From cd8d53df21f3ad2810add2a8cff766c745f55a17 Mon Sep 17 00:00:00 2001
From: Joseph Redmon <pjreddie@gmail.com>
Date: Fri, 09 May 2014 22:14:52 +0000
Subject: [PATCH] So there WAS this huge bug. Gone now
---
src/mini_blas.h | 33 +++++++++++++++++++++++++--------
1 files changed, 25 insertions(+), 8 deletions(-)
diff --git a/src/mini_blas.h b/src/mini_blas.h
index 34f15de..cfbb6c4 100644
--- a/src/mini_blas.h
+++ b/src/mini_blas.h
@@ -1,3 +1,5 @@
+#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,
@@ -6,15 +8,30 @@
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);
-void im2col_gpu(float* data_im, const int channels,
- const int height, const int width, const int ksize, const int stride,
- float* data_col);
-void im2col_cpu(float* data_im, const int channels,
- const int height, const int width, const int ksize, const int stride,
- float* data_col);
+
+#ifdef GPU
+void im2col_ongpu(cl_mem data_im, const int batch,
+ const int channels, const int height, const int width,
+ const int ksize, const int stride, cl_mem data_col);
+
+void im2col_gpu(float *data_im,
+ const int batch, const int channels, const int height, const int width,
+ const int ksize, const int stride, float *data_col);
+
+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,
+ const int batch, const int channels, const int height, const int width,
+ const int ksize, const int stride, float* data_col);
+
void col2im_cpu(float* data_col, const int channels,
- const int height, const int width, const int ksize, const int stride,
- float* data_im);
+ const int height, const int width, const int ksize, const int stride,
+ float* data_im);
void test_blas();
void gemm_gpu(int TA, int TB, int M, int N, int K, float ALPHA,
--
Gitblit v1.10.0