GitHub-Proxy/eigen
1
0
Fork 0
mirror of https://gitlab.com/libeigen/eigen.git synced 2025-07-09 22:51:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix placement of permanent GPU defines.

Browse Source 
(cherry picked from commit 954879183b1e008d7f0fefb97e48a925c4e3fb16)
This commit is contained in:
Antonio Sanchez 2021-06-15 12:15:58 -07:00 committed by Antonio Sánchez
parent 47722a66f2
commit 2d6eaaf687
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
unsupported/Eigen/CXX11/src/Tensor/TensorGpuHipCudaDefines.h
View File

@ -11,8 +11,6 @@
#if defined(EIGEN_USE_GPU) && !defined(EIGEN_CXX11_TENSOR_GPU_HIP_CUDA_DEFINES_H) #if defined(EIGEN_USE_GPU) && !defined(EIGEN_CXX11_TENSOR_GPU_HIP_CUDA_DEFINES_H)
#define 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 // 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 // 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 // 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 // gpu_assert
#endif // EIGEN_PERMANENTLY_ENABLE_GPU_HIP_CUDA_DEFINES
#endif // EIGEN_CXX11_TENSOR_GPU_HIP_CUDA_DEFINES_H #endif // EIGEN_CXX11_TENSOR_GPU_HIP_CUDA_DEFINES_H

4
unsupported/Eigen/CXX11/src/Tensor/TensorGpuHipCudaUndefines.h
View File

@ -10,6 +10,8 @@
#if defined(EIGEN_CXX11_TENSOR_GPU_HIP_CUDA_DEFINES_H) #if defined(EIGEN_CXX11_TENSOR_GPU_HIP_CUDA_DEFINES_H)
#ifndef EIGEN_PERMANENTLY_ENABLE_GPU_HIP_CUDA_DEFINES
#undef gpuStream_t #undef gpuStream_t
#undef gpuDeviceProp_t #undef gpuDeviceProp_t
#undef gpuError_t #undef gpuError_t
@ -35,6 +37,8 @@
#undef gpuDeviceSynchronize #undef gpuDeviceSynchronize
#undef gpuMemcpy #undef gpuMemcpy
#endif // EIGEN_PERMANENTLY_ENABLE_GPU_HIP_CUDA_DEFINES
#undef EIGEN_CXX11_TENSOR_GPU_HIP_CUDA_DEFINES_H #undef EIGEN_CXX11_TENSOR_GPU_HIP_CUDA_DEFINES_H
#endif // EIGEN_CXX11_TENSOR_GPU_HIP_CUDA_DEFINES_H #endif // EIGEN_CXX11_TENSOR_GPU_HIP_CUDA_DEFINES_H