[arrow] branch master updated: ARROW-3140: [Plasma] Fix Plasma build with GPU support

[uw...@apache.org]

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 658087e  ARROW-3140: [Plasma] Fix Plasma build with GPU support
658087e is described below

commit 658087e252cd4795c8c24cd1c0548fc39f313083
Author: Antoine Pitrou <an...@python.org>
AuthorDate: Thu Aug 30 13:26:39 2018 +0200

    ARROW-3140: [Plasma] Fix Plasma build with GPU support
    
    Author: Antoine Pitrou <an...@python.org>
    
    Closes #2498 from pitrou/ARROW-3140-plasma-gpu-build and squashes the following commits:
    
    51d591d4 <Antoine Pitrou> Fix GPU-less build
    32d6374a <Antoine Pitrou> ARROW-3140:  Fix Plasma build with GPU support
---
 cpp/src/plasma/common.h | 5 ++++-
 cpp/src/plasma/plasma.h | 2 --
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/cpp/src/plasma/common.h b/cpp/src/plasma/common.h
index 9c3c0c9..f7cdaf5 100644
--- a/cpp/src/plasma/common.h
+++ b/cpp/src/plasma/common.h
@@ -34,6 +34,9 @@
 
 #include "arrow/status.h"
 #include "arrow/util/logging.h"
+#ifdef PLASMA_GPU
+#include "arrow/gpu/cuda_api.h"
+#endif
 
 namespace plasma {
 
@@ -117,7 +120,7 @@ struct ObjectTableEntry {
   int64_t metadata_size;
 #ifdef PLASMA_GPU
   /// IPC GPU handle to share with clients.
-  std::shared_ptr<CudaIpcMemHandle> ipc_handle;
+  std::shared_ptr<::arrow::gpu::CudaIpcMemHandle> ipc_handle;
 #endif
   /// Number of clients currently using this object.
   int ref_count;
diff --git a/cpp/src/plasma/plasma.h b/cpp/src/plasma/plasma.h
index b4760fc..e63d967 100644
--- a/cpp/src/plasma/plasma.h
+++ b/cpp/src/plasma/plasma.h
@@ -41,8 +41,6 @@
 #include "plasma/common_generated.h"
 
 #ifdef PLASMA_GPU
-#include "arrow/gpu/cuda_api.h"
-
 using arrow::gpu::CudaIpcMemHandle;
 #endif