From df31ca3b9e038d9b83226a3ed3fe3c8a4cf16bdd Mon Sep 17 00:00:00 2001 From: Benoit Steiner Date: Mon, 23 Nov 2015 10:03:53 -0800 Subject: [PATCH] Made it possible to refer t oa GPUDevice from code compile with a regular C++ compiler --- unsupported/Eigen/CXX11/Tensor | 6 +++--- unsupported/Eigen/CXX11/src/Tensor/TensorDeviceCuda.h | 2 -- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/unsupported/Eigen/CXX11/Tensor b/unsupported/Eigen/CXX11/Tensor index 17c4325b8..c681d3c20 100644 --- a/unsupported/Eigen/CXX11/Tensor +++ b/unsupported/Eigen/CXX11/Tensor @@ -8,8 +8,8 @@ // Public License v. 2.0. If a copy of the MPL was not distributed // with this file, You can obtain one at http://mozilla.org/MPL/2.0/. -#ifndef EIGEN_CXX11_TENSOR_MODULE -#define EIGEN_CXX11_TENSOR_MODULE +//#ifndef EIGEN_CXX11_TENSOR_MODULE +//#define EIGEN_CXX11_TENSOR_MODULE #include "Core" @@ -117,4 +117,4 @@ #include -#endif // EIGEN_CXX11_TENSOR_MODULE +//#endif // EIGEN_CXX11_TENSOR_MODULE diff --git a/unsupported/Eigen/CXX11/src/Tensor/TensorDeviceCuda.h b/unsupported/Eigen/CXX11/src/Tensor/TensorDeviceCuda.h index 7d80d0b91..c76d1ee3f 100644 --- a/unsupported/Eigen/CXX11/src/Tensor/TensorDeviceCuda.h +++ b/unsupported/Eigen/CXX11/src/Tensor/TensorDeviceCuda.h @@ -27,7 +27,6 @@ class StreamInterface { virtual void deallocate(void* buffer) const = 0; }; -#if defined(__CUDACC__) static cudaDeviceProp* m_deviceProperties; static bool m_devicePropInitialized = false; @@ -107,7 +106,6 @@ class CudaStreamDevice : public StreamInterface { const cudaStream_t* stream_; int device_; }; -#endif // __CUDACC__ struct GpuDevice { // The StreamInterface is not owned: the caller is