This is an automated email from the ASF dual-hosted git repository.
uwe pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/arrow.git
The following commit(s) were added to refs/heads/master by this push:
new 5dd9bff ARROW-2107: [GLib] Follow arrow::gpu::CudaIpcMemHandle API
change
5dd9bff is described below
commit 5dd9bffc1d026c84d3a9d4115173c4ecd1d1a314
Author: Kouhei Sutou <[email protected]>
AuthorDate: Wed Feb 7 15:29:24 2018 +0100
ARROW-2107: [GLib] Follow arrow::gpu::CudaIpcMemHandle API change
Author: Kouhei Sutou <[email protected]>
Closes #1565 from kou/glib-follow-gpu-cuda-ipc-memory-handle-change and
squashes the following commits:
99ebf14 [Kouhei Sutou] [GLib] Follow arrow::gpu::CudaIpcMemHandle API change
---
c_glib/arrow-gpu-glib/cuda.cpp | 22 +++++++++++-----------
c_glib/arrow-gpu-glib/cuda.hpp | 4 ++--
2 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/c_glib/arrow-gpu-glib/cuda.cpp b/c_glib/arrow-gpu-glib/cuda.cpp
index c2a9af5..7f2a050 100644
--- a/c_glib/arrow-gpu-glib/cuda.cpp
+++ b/c_glib/arrow-gpu-glib/cuda.cpp
@@ -238,7 +238,7 @@
garrow_gpu_cuda_context_class_init(GArrowGPUCUDAContextClass *klass)
*/
spec = g_param_spec_pointer("context",
"Context",
- "The raw
std::shared_ptr<arrow::gpu::CudaContext> *",
+ "The raw
std::shared_ptr<arrow::gpu::CudaContext>",
static_cast<GParamFlags>(G_PARAM_WRITABLE |
G_PARAM_CONSTRUCT_ONLY));
g_object_class_install_property(gobject_class, PROP_CONTEXT, spec);
@@ -427,10 +427,10 @@ GArrowGPUCUDAIPCMemoryHandle *
garrow_gpu_cuda_buffer_export(GArrowGPUCUDABuffer *buffer, GError **error)
{
auto arrow_buffer = garrow_gpu_cuda_buffer_get_raw(buffer);
- std::unique_ptr<arrow::gpu::CudaIpcMemHandle> arrow_handle;
+ std::shared_ptr<arrow::gpu::CudaIpcMemHandle> arrow_handle;
auto status = arrow_buffer->ExportForIpc(&arrow_handle);
if (garrow_error_check(error, status,
"[gpu][cuda][buffer][export-for-ipc]")) {
- return garrow_gpu_cuda_ipc_memory_handle_new_raw(arrow_handle.release());
+ return garrow_gpu_cuda_ipc_memory_handle_new_raw(&arrow_handle);
} else {
return NULL;
}
@@ -527,7 +527,7 @@ garrow_gpu_cuda_host_buffer_new(gint64 size, GError **error)
typedef struct GArrowGPUCUDAIPCMemoryHandlePrivate_ {
- arrow::gpu::CudaIpcMemHandle *ipc_memory_handle;
+ std::shared_ptr<arrow::gpu::CudaIpcMemHandle> ipc_memory_handle;
} GArrowGPUCUDAIPCMemoryHandlePrivate;
enum {
@@ -548,7 +548,7 @@ garrow_gpu_cuda_ipc_memory_handle_finalize(GObject *object)
{
auto priv = GARROW_GPU_CUDA_IPC_MEMORY_HANDLE_GET_PRIVATE(object);
- delete priv->ipc_memory_handle;
+ priv->ipc_memory_handle = nullptr;
G_OBJECT_CLASS(garrow_gpu_cuda_ipc_memory_handle_parent_class)->finalize(object);
}
@@ -564,7 +564,7 @@ garrow_gpu_cuda_ipc_memory_handle_set_property(GObject
*object,
switch (prop_id) {
case PROP_IPC_MEMORY_HANDLE:
priv->ipc_memory_handle =
- static_cast<arrow::gpu::CudaIpcMemHandle *>(g_value_get_pointer(value));
+ *static_cast<std::shared_ptr<arrow::gpu::CudaIpcMemHandle>
*>(g_value_get_pointer(value));
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);
@@ -608,7 +608,7 @@
garrow_gpu_cuda_ipc_memory_handle_class_init(GArrowGPUCUDAIPCMemoryHandleClass *
*/
spec = g_param_spec_pointer("ipc-memory-handle",
"IPC Memory Handle",
- "The raw arrow::gpu::CudaIpcMemHandle *",
+ "The raw
std::shared_ptr<arrow::gpu::CudaIpcMemHandle>",
static_cast<GParamFlags>(G_PARAM_WRITABLE |
G_PARAM_CONSTRUCT_ONLY));
g_object_class_install_property(gobject_class, PROP_IPC_MEMORY_HANDLE, spec);
@@ -630,11 +630,11 @@ garrow_gpu_cuda_ipc_memory_handle_new(const guint8 *data,
gsize size,
GError **error)
{
- std::unique_ptr<arrow::gpu::CudaIpcMemHandle> arrow_handle;
+ std::shared_ptr<arrow::gpu::CudaIpcMemHandle> arrow_handle;
auto status = arrow::gpu::CudaIpcMemHandle::FromBuffer(data, &arrow_handle);
if (garrow_error_check(error, status,
"[gpu][cuda][ipc-memory-handle][new]")) {
- return garrow_gpu_cuda_ipc_memory_handle_new_raw(arrow_handle.release());
+ return garrow_gpu_cuda_ipc_memory_handle_new_raw(&arrow_handle);
} else {
return NULL;
}
@@ -845,7 +845,7 @@ garrow_gpu_cuda_context_get_raw(GArrowGPUCUDAContext
*context)
}
GArrowGPUCUDAIPCMemoryHandle *
-garrow_gpu_cuda_ipc_memory_handle_new_raw(arrow::gpu::CudaIpcMemHandle
*arrow_handle)
+garrow_gpu_cuda_ipc_memory_handle_new_raw(std::shared_ptr<arrow::gpu::CudaIpcMemHandle>
*arrow_handle)
{
auto handle = g_object_new(GARROW_GPU_TYPE_CUDA_IPC_MEMORY_HANDLE,
"ipc-memory-handle", arrow_handle,
@@ -853,7 +853,7 @@
garrow_gpu_cuda_ipc_memory_handle_new_raw(arrow::gpu::CudaIpcMemHandle *arrow_ha
return GARROW_GPU_CUDA_IPC_MEMORY_HANDLE(handle);
}
-arrow::gpu::CudaIpcMemHandle *
+std::shared_ptr<arrow::gpu::CudaIpcMemHandle>
garrow_gpu_cuda_ipc_memory_handle_get_raw(GArrowGPUCUDAIPCMemoryHandle *handle)
{
if (!handle)
diff --git a/c_glib/arrow-gpu-glib/cuda.hpp b/c_glib/arrow-gpu-glib/cuda.hpp
index 3eeff8b..4b5b03c 100644
--- a/c_glib/arrow-gpu-glib/cuda.hpp
+++ b/c_glib/arrow-gpu-glib/cuda.hpp
@@ -29,8 +29,8 @@ std::shared_ptr<arrow::gpu::CudaContext>
garrow_gpu_cuda_context_get_raw(GArrowGPUCUDAContext *context);
GArrowGPUCUDAIPCMemoryHandle *
-garrow_gpu_cuda_ipc_memory_handle_new_raw(arrow::gpu::CudaIpcMemHandle
*arrow_handle);
-arrow::gpu::CudaIpcMemHandle *
+garrow_gpu_cuda_ipc_memory_handle_new_raw(std::shared_ptr<arrow::gpu::CudaIpcMemHandle>
*arrow_handle);
+std::shared_ptr<arrow::gpu::CudaIpcMemHandle>
garrow_gpu_cuda_ipc_memory_handle_get_raw(GArrowGPUCUDAIPCMemoryHandle
*handle);
GArrowGPUCUDABuffer *
--
To stop receiving notification emails like this one, please contact
[email protected].
