Correction: using driver API instead of runtime API.

Recompiled and retested successfully.

Author: notoraptor

src/gpuarray_buffer_cuda.c

@@ -1515,7 +1515,7 @@ static int cuda_property(gpucontext *c, gpudata *buf, gpukernel *k, int prop_id,
       cuda_exit(ctx);
       return GA_MEMORY_ERROR;
     }
-    ctx->err = cudaDeviceGetPCIBusId(s, 13, id);
+    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 ? */

src/gpuarray_buffer_opencl.c

@@ -1152,14 +1152,6 @@ static int cl_property(gpucontext *c, gpudata *buf, gpukernel *k, int prop_id,
     size_t *psz;
     cl_device_id id;
     cl_uint ui;
-    /* For GA_CTX_PROP_PCIBUSID (currently desactivated).
-     * According to http://www.makelinux.net/ldd3/chp-12-sect-1
-     * (accessed on 2016/11/09:15h41 EST):
-     * domain: 16 bits, bus: 8 bits, device: 5 bits, function: 3 bits. */
-    /*
-    uint32_t* busid;
-    uint32_t domain = 0, bus = 0, device = 0, function = 0;
-    */
 
   case GA_CTX_PROP_DEVNAME:
     ctx->err = clGetContextInfo(ctx->ctx, CL_CONTEXT_DEVICES, sizeof(id),
@@ -1181,42 +1173,7 @@ static int cl_property(gpucontext *c, gpudata *buf, gpukernel *k, int prop_id,
     return GA_NO_ERROR;
 
   case GA_CTX_PROP_PCIBUSID:
-    /* PS: Currently desactivated. This does not print the same
-     * Bus ID as cuda and nvidia-smi. For the moment, I don't find
-     * which info will display the correct PCI Bus ID with OpenCL. */
-    /*
-    ctx->err = clGetContextInfo(ctx->ctx, CL_CONTEXT_DEVICES, sizeof(id),
-                                &id, NULL);
-    if (ctx->err != CL_SUCCESS)
-      return GA_IMPL_ERROR;
-    ctx->err = clGetDeviceInfo(id, CL_DEVICE_VENDOR_ID, 0, NULL, &sz);
-    if (ctx->err != CL_SUCCESS)
-      return GA_IMPL_ERROR;
-    if(sz != 4)
-      return GA_IMPL_ERROR;
-    busid = malloc(sz);
-    if (busid == NULL)
-      return GA_MEMORY_ERROR;
-    ctx->err = clGetDeviceInfo(id, CL_DEVICE_VENDOR_ID, sz, busid, NULL);
-    if (ctx->err != CL_SUCCESS) {
-      free(busid);
-      return GA_IMPL_ERROR;
-    }
-    domain = *busid >> (32-16);
-    bus = *busid << 16 >> (32-8);
-    device = *busid << 24 >> (32-5);
-    function = *busid << 29 >> (32-3);
-    free(busid);
-    s = malloc(13);
-    sprintf(s, "%04x", domain);
-    sprintf(s + 5, "%02x", bus);
-    sprintf(s + 8, "%02x", device);
-    sprintf(s + 11, "%01x", function);
-    s[4] = s[7] = ':';
-    s[10] = '.';
-    *((char **)res) = s;
-    return GA_NO_ERROR;
-    */
+    /* For the moment, PCI Bus ID is not supported for OpenCL. */
     *((void **)res) = NULL;
     return GA_DEVSUP_ERROR;
 

src/private_cuda.h

@@ -3,10 +3,8 @@
 
 #ifdef __APPLE__
 #include <CUDA/cuda.h>
-#include <CUDA/cuda_runtime_api.h>
 #else
 #include <cuda.h>
-#include <cuda_runtime_api.h>
 #endif
 
 #include <cache.h>