Merge pull request #283 from notoraptor/master

Code added to get PCI Bus ID from a CUDA device.

Author: abergeron

.gitignore

@@ -1,3 +1,4 @@
+Build
 build
 Debug
 Release

pygpu/gpuarray.pxd

@@ -87,6 +87,7 @@ cdef extern from "gpuarray/buffer.h":
     int GA_CTX_DISABLE_ALLOCATION_CACHE
 
     int GA_CTX_PROP_DEVNAME
+    int GA_CTX_PROP_PCIBUSID
     int GA_CTX_PROP_MAXLSIZE
     int GA_CTX_PROP_LMEMSIZE
     int GA_CTX_PROP_NUMPROCS

pygpu/gpuarray.pyx

@@ -1016,6 +1016,19 @@ cdef class GpuContext:
                 free(tmp)
             return res
 
+    property pcibusid:
+        "Device PCI Bus ID for this context"
+        def __get__(self):
+            cdef char *tmp
+            cdef unicode res
+
+            ctx_property(self, GA_CTX_PROP_PCIBUSID, &tmp)
+            try:
+                res = tmp.decode('ascii')
+            finally:
+                free(tmp)
+            return res
+
     property maxlsize:
         "Maximum size of thread block (local size) for this context"
         def __get__(self):

src/gpuarray/buffer.h

@@ -680,6 +680,15 @@ GPUARRAY_PUBLIC gpucontext *gpukernel_context(gpukernel *k);
  */
 #define GA_CTX_PROP_COMM_OPS  18
 
+/**
+ * Get the device PCI Bus ID for the context.
+ *
+ * \note The returned string is allocated and must be freed by the caller.
+ *
+ * Type: `char *`
+ */
+#define GA_CTX_PROP_PCIBUSID 19
+
 /* Start at 512 for GA_BUFFER_PROP_ */
 #define GA_BUFFER_PROP_START  512
 

src/gpuarray_buffer_cuda.c

@@ -1502,6 +1502,30 @@ static int cuda_property(gpucontext *c, gpudata *buf, gpukernel *k, int prop_id,
     *((char **)res) = s;
     cuda_exit(ctx);
     return GA_NO_ERROR;
+  
+  case GA_CTX_PROP_PCIBUSID:
+    cuda_enter(ctx);
+    ctx->err = cuCtxGetDevice(&id);
+    if (ctx->err != CUDA_SUCCESS) {
+      cuda_exit(ctx);
+      return GA_IMPL_ERROR;
+    }
+    s = malloc(13);
+    if (s == NULL) {
+      cuda_exit(ctx);
+      return GA_MEMORY_ERROR;
+    }
+    ctx->err = cuDeviceGetPCIBusId(s, 13, id);
+    if (ctx->err != CUDA_SUCCESS) {
+      /* PS: in GA_CTX_PROP_DEVNAME above, s is not freed here.
+       * I think it should be freed, isn't it ? */
+      free(s);
+      cuda_exit(ctx);
+      return GA_IMPL_ERROR;
+    }
+    *((char **)res) = s;
+    cuda_exit(ctx);
+    return GA_NO_ERROR;
 
   case GA_CTX_PROP_MAXLSIZE:
     cuda_enter(ctx);

src/gpuarray_buffer_opencl.c

@@ -1172,6 +1172,11 @@ static int cl_property(gpucontext *c, gpudata *buf, gpukernel *k, int prop_id,
     *((char **)res) = s;
     return GA_NO_ERROR;
 
+  case GA_CTX_PROP_PCIBUSID:
+    /* For the moment, PCI Bus ID is not supported for OpenCL. */
+    *((void **)res) = NULL;
+    return GA_DEVSUP_ERROR;
+
   case GA_CTX_PROP_MAXLSIZE:
     ctx->err = clGetContextInfo(ctx->ctx, CL_CONTEXT_DEVICES, sizeof(id),
                                 &id, NULL);