From 7129d998db0a8dd74125ad7081f3d220cbce96f0 Mon Sep 17 00:00:00 2001 From: Benoit Steiner Date: Tue, 19 Apr 2016 14:55:21 -0700 Subject: Simplified the code that launches cuda kernels. --- unsupported/Eigen/CXX11/src/Tensor/TensorDeviceCuda.h | 9 --------- 1 file changed, 9 deletions(-) (limited to 'unsupported/Eigen/CXX11/src/Tensor/TensorDeviceCuda.h') diff --git a/unsupported/Eigen/CXX11/src/Tensor/TensorDeviceCuda.h b/unsupported/Eigen/CXX11/src/Tensor/TensorDeviceCuda.h index 8e7f5dddb..1d2d162dc 100644 --- a/unsupported/Eigen/CXX11/src/Tensor/TensorDeviceCuda.h +++ b/unsupported/Eigen/CXX11/src/Tensor/TensorDeviceCuda.h @@ -291,18 +291,9 @@ struct GpuDevice { int max_blocks_; }; -#if !defined(__CUDA_ARCH__) #define LAUNCH_CUDA_KERNEL(kernel, gridsize, blocksize, sharedmem, device, ...) \ (kernel) <<< (gridsize), (blocksize), (sharedmem), (device).stream() >>> (__VA_ARGS__); \ assert(cudaGetLastError() == cudaSuccess); -#elif __CUDA_ARCH__ >= 350 -#define LAUNCH_CUDA_KERNEL(kernel, ...) \ - { const auto __attribute__((__unused__)) __makeTheKernelInstantiate = &(kernel); } \ - eigen_assert(false && "Cannot launch a kernel from another kernel" __CUDA_ARCH__ kernel); -#else -#define LAUNCH_CUDA_KERNEL(kernel, ...) \ - eigen_assert(false && "Cannot launch a kernel from another kernel" __CUDA_ARCH__ kernel); -#endif // FIXME: Should be device and kernel specific. -- cgit v1.2.3