From ad197da08da7ef414db90dbb97e92c575363c280 Mon Sep 17 00:00:00 2001 From: Cedric Nugteren Date: Sat, 6 Jan 2018 13:38:44 +0100 Subject: [PATCH] Fixed the CUDA interface: replaced nullptr with 0 --- include/clblast_cuda.h | 2 +- src/clblast_cuda.cpp | 4 ++-- src/routines/level3/xgemm.hpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/clblast_cuda.h b/include/clblast_cuda.h index e0d1d638..e1237936 100644 --- a/include/clblast_cuda.h +++ b/include/clblast_cuda.h @@ -494,7 +494,7 @@ StatusCode Gemm(const Layout layout, const Transpose a_transpose, const Transpos const T beta, CUdeviceptr c_buffer, const size_t c_offset, const size_t c_ld, const CUcontext context, const CUdevice device, - CUdeviceptr temp_buffer = nullptr); + CUdeviceptr temp_buffer = 0); // Symmetric matrix-matrix multiplication: SSYMM/DSYMM/CSYMM/ZSYMM/HSYMM template diff --git a/src/clblast_cuda.cpp b/src/clblast_cuda.cpp index 21514c74..348ff3f5 100644 --- a/src/clblast_cuda.cpp +++ b/src/clblast_cuda.cpp @@ -1732,8 +1732,8 @@ StatusCode Gemm(const Layout layout, const Transpose a_transpose, const Transpos const auto device_cpp = Device(device); auto queue_cpp = Queue(context_cpp, device_cpp); auto routine = Xgemm(queue_cpp, nullptr); - const auto temp_buffer_provided = temp_buffer != nullptr; - auto temp_buffer_cpp = temp_buffer_provided ? Buffer(temp_buffer) : Buffer(nullptr); + const auto temp_buffer_provided = temp_buffer != 0; + auto temp_buffer_cpp = temp_buffer_provided ? Buffer(temp_buffer) : Buffer(0); routine.DoGemm(layout, a_transpose, b_transpose, m, n, k, alpha, diff --git a/src/routines/level3/xgemm.hpp b/src/routines/level3/xgemm.hpp index b354de1b..b51d1771 100644 --- a/src/routines/level3/xgemm.hpp +++ b/src/routines/level3/xgemm.hpp @@ -159,7 +159,7 @@ class Xgemm: public Routine { const Buffer &b_buffer, const size_t b_offset, const size_t b_ld, const T beta, const Buffer &c_buffer, const size_t c_offset, const size_t c_ld, - const Buffer &temp_buffer = Buffer(nullptr), const bool temp_buffer_provided = false); + const Buffer &temp_buffer = Buffer(0), const bool temp_buffer_provided = false); // Indirect version of GEMM (with pre and post-processing kernels) void GemmIndirect(const size_t m, const size_t n, const size_t k,