diff options
| author | Mahmoud <[email protected]> | 2017-07-12 15:26:10 -0400 |
|---|---|---|
| committer | Mahmoud <[email protected]> | 2017-07-12 15:26:10 -0400 |
| commit | 40af9c870920903fe7df44d0b85f58ccffb7df71 (patch) | |
| tree | 1391bd6f51c6d587f6680bf30e162f31ba7cff82 /libcuda | |
| parent | 9ca55c4871597e12a161bedb607308c28ed434e2 (diff) | |
| parent | be451de4abf4fac2ea4b8bd2a79c6037ac635990 (diff) | |
Merge branch 'dev' of https://github.rcac.purdue.edu/abdallm/gpgpu-sim_distribution into dev
Diffstat (limited to 'libcuda')
| -rw-r--r-- | libcuda/cuda_runtime_api.cc | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/libcuda/cuda_runtime_api.cc b/libcuda/cuda_runtime_api.cc index 8d717c5..cbe8a11 100644 --- a/libcuda/cuda_runtime_api.cc +++ b/libcuda/cuda_runtime_api.cc @@ -126,7 +126,9 @@ #include "host_defines.h" #include "builtin_types.h" #include "driver_types.h" +#if (CUDART_VERSION < 8000) #include "__cudaFatFormat.h" +#endif #include "../src/gpgpu-sim/gpu-sim.h" #include "../src/cuda-sim/ptx_loader.h" #include "../src/cuda-sim/cuda-sim.h" @@ -1795,7 +1797,9 @@ void** CUDARTAPI __cudaRegisterFatBinary( void *fatCubin ) cuobjdumpRegisterFatBinary(fat_cubin_handle, filename); return (void**)fat_cubin_handle; - } else { + } + #if (CUDART_VERSION < 8000) + else { static unsigned source_num=1; unsigned long long fat_cubin_handle = next_fat_bin_handle++; __cudaFatCudaBinary *info = (__cudaFatCudaBinary *)fatCubin; @@ -1852,6 +1856,7 @@ void** CUDARTAPI __cudaRegisterFatBinary( void *fatCubin ) } return (void**)fat_cubin_handle; } + #endif } void __cudaUnregisterFatBinary(void **fatCubinHandle) |