Commit 6482b3d2 authored by fenglei.tian's avatar fenglei.tian

fix merge bug

parent f87ed029
...@@ -47,7 +47,7 @@ runtime::gpu::GPU_CallFrame::GPU_CallFrame(std::shared_ptr<GPU_ExternalFunction> ...@@ -47,7 +47,7 @@ runtime::gpu::GPU_CallFrame::GPU_CallFrame(std::shared_ptr<GPU_ExternalFunction>
} }
// Pass scalars as reference on the Device // Pass scalars as reference on the Device
cublasSetPointerMode(m_cublas_handle, CUBLAS_POINTER_MODE_HOST); cublasSetPointerMode(m_cublas_handle, CUBLAS_POINTER_MODE_DEVICE);
} }
runtime::gpu::GPU_CallFrame::~GPU_CallFrame() runtime::gpu::GPU_CallFrame::~GPU_CallFrame()
......
...@@ -6233,7 +6233,7 @@ TEST(${BACKEND_NAME}, convolution_outlining) ...@@ -6233,7 +6233,7 @@ TEST(${BACKEND_NAME}, convolution_outlining)
TEST(${BACKEND_NAME}, mkldnn_layouts) TEST(${BACKEND_NAME}, mkldnn_layouts)
{ {
ONLY_ENABLE_TEST_FOR("CPU", "${BACKEND_NAME}"); ONLY_ENABLE_TEST_FOR("CPU", "${BACKEND_NAME}");
Shape shape_a{1, 16, 2, 2}; Shape shape_a{1, 16, 2, 2};
auto A = make_shared<op::Parameter>(element::f32, shape_a); auto A = make_shared<op::Parameter>(element::f32, shape_a);
Shape shape_b{32, 16, 1, 1}; Shape shape_b{32, 16, 1, 1};
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment