From 954879183b1e008d7f0fefb97e48a925c4e3fb16 Mon Sep 17 00:00:00 2001 From: Antonio Sanchez Date: Tue, 15 Jun 2021 12:15:58 -0700 Subject: Fix placement of permanent GPU defines. --- unsupported/Eigen/CXX11/src/Tensor/TensorGpuHipCudaDefines.h | 4 ---- unsupported/Eigen/CXX11/src/Tensor/TensorGpuHipCudaUndefines.h | 4 ++++ 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/unsupported/Eigen/CXX11/src/Tensor/TensorGpuHipCudaDefines.h b/unsupported/Eigen/CXX11/src/Tensor/TensorGpuHipCudaDefines.h index a89ea3e9a..cb53ce298 100644 --- a/unsupported/Eigen/CXX11/src/Tensor/TensorGpuHipCudaDefines.h +++ b/unsupported/Eigen/CXX11/src/Tensor/TensorGpuHipCudaDefines.h @@ -11,8 +11,6 @@ #if defined(EIGEN_USE_GPU) && !defined(EIGEN_CXX11_TENSOR_GPU_HIP_CUDA_DEFINES_H) #define EIGEN_CXX11_TENSOR_GPU_HIP_CUDA_DEFINES_H -#ifndef EIGEN_PERMANENTLY_ENABLE_GPU_HIP_CUDA_DEFINES - // Note that we are using EIGEN_USE_HIP here instead of EIGEN_HIPCC...this is by design // There is code in the Tensorflow codebase that will define EIGEN_USE_GPU, but // for some reason gets sent to the gcc/host compiler instead of the gpu/nvcc/hipcc compiler @@ -98,6 +96,4 @@ #endif // gpu_assert -#endif // EIGEN_PERMANENTLY_ENABLE_GPU_HIP_CUDA_DEFINES - #endif // EIGEN_CXX11_TENSOR_GPU_HIP_CUDA_DEFINES_H diff --git a/unsupported/Eigen/CXX11/src/Tensor/TensorGpuHipCudaUndefines.h b/unsupported/Eigen/CXX11/src/Tensor/TensorGpuHipCudaUndefines.h index db394bcbb..1d142f2ee 100644 --- a/unsupported/Eigen/CXX11/src/Tensor/TensorGpuHipCudaUndefines.h +++ b/unsupported/Eigen/CXX11/src/Tensor/TensorGpuHipCudaUndefines.h @@ -10,6 +10,8 @@ #if defined(EIGEN_CXX11_TENSOR_GPU_HIP_CUDA_DEFINES_H) +#ifndef EIGEN_PERMANENTLY_ENABLE_GPU_HIP_CUDA_DEFINES + #undef gpuStream_t #undef gpuDeviceProp_t #undef gpuError_t @@ -35,6 +37,8 @@ #undef gpuDeviceSynchronize #undef gpuMemcpy +#endif // EIGEN_PERMANENTLY_ENABLE_GPU_HIP_CUDA_DEFINES + #undef EIGEN_CXX11_TENSOR_GPU_HIP_CUDA_DEFINES_H #endif // EIGEN_CXX11_TENSOR_GPU_HIP_CUDA_DEFINES_H -- cgit v1.2.3