summaryrefslogtreecommitdiff
path: root/src/routines
diff options
context:
space:
mode:
authorCedric Nugteren <web@cedricnugteren.nl>2017-08-24 21:11:12 +0200
committerCedric Nugteren <web@cedricnugteren.nl>2017-08-24 21:11:12 +0200
commit4d9d03ba512fb404537180a42cf17fb3e10a8033 (patch)
tree8205f3939bdaea2c22af48b8adc0d83a85dd937b /src/routines
parenta8c26594d9ee5b735b9d1b0400ac7eba4abf02fb (diff)
Completed im2col implementation
Diffstat (limited to 'src/routines')
-rw-r--r--src/routines/levelx/xim2col.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/routines/levelx/xim2col.cpp b/src/routines/levelx/xim2col.cpp
index 10c9c10c..51171eb5 100644
--- a/src/routines/levelx/xim2col.cpp
+++ b/src/routines/levelx/xim2col.cpp
@@ -22,7 +22,7 @@ namespace clblast {
// Constructor: forwards to base class constructor
template <typename T>
Xim2col<T>::Xim2col(Queue &queue, EventPointer event, const std::string &name):
- Routine(queue, event, name, {}, PrecisionValue<T>(), {}, {
+ Routine(queue, event, name, {"Copy"}, PrecisionValue<T>(), {}, {
#include "../../kernels/levelx/im2col.opencl"
}) {
}
@@ -71,10 +71,10 @@ void Xim2col<T>::DoIm2col(const size_t channels, const size_t height, const size
kernel.SetArgument(15, static_cast<int>(col_offset));
// Launches the kernel
- const auto h_ceiled = Ceil(output_h, 16);
- const auto w_ceiled = Ceil(output_w, 16);
- auto global = std::vector<size_t>{h_ceiled, w_ceiled, channels};
- auto local = std::vector<size_t>{16, 16, 1};
+ const auto w_ceiled = Ceil(output_w, db_["COPY_DIMY"]);
+ const auto h_ceiled = Ceil(output_h, db_["COPY_DIMX"]);
+ const auto global = std::vector<size_t>{w_ceiled, h_ceiled, channels};
+ const auto local = std::vector<size_t>{db_["COPY_DIMX"], db_["COPY_DIMY"], 1};
RunKernel(kernel, queue_, device_, global, local, event_);
}