From b6cc0961b17f6204038158c445eddf411c97a3e2 Mon Sep 17 00:00:00 2001 From: Deven Desai Date: Thu, 14 Jun 2018 10:21:54 -0400 Subject: updates based on PR feedback There are two major changes (and a few minor ones which are not listed here...see PR discussion for details) 1. Eigen::half implementations for HIP and CUDA have been merged. This means that - `CUDA/Half.h` and `HIP/hcc/Half.h` got merged to a new file `GPU/Half.h` - `CUDA/PacketMathHalf.h` and `HIP/hcc/PacketMathHalf.h` got merged to a new file `GPU/PacketMathHalf.h` - `CUDA/TypeCasting.h` and `HIP/hcc/TypeCasting.h` got merged to a new file `GPU/TypeCasting.h` After this change the `HIP/hcc` directory only contains one file `math_constants.h`. That will go away too once that file becomes a part of the HIP install. 2. new macros EIGEN_GPUCC, EIGEN_GPU_COMPILE_PHASE and EIGEN_HAS_GPU_FP16 have been added and the code has been updated to use them where appropriate. - `EIGEN_GPUCC` is the same as `(EIGEN_CUDACC || EIGEN_HIPCC)` - `EIGEN_GPU_DEVICE_COMPILE` is the same as `(EIGEN_CUDA_ARCH || EIGEN_HIP_DEVICE_COMPILE)` - `EIGEN_HAS_GPU_FP16` is the same as `(EIGEN_HAS_CUDA_FP16 or EIGEN_HAS_HIP_FP16)` --- unsupported/test/cxx11_tensor_hip.cu | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'unsupported/test') diff --git a/unsupported/test/cxx11_tensor_hip.cu b/unsupported/test/cxx11_tensor_hip.cu index f1794aa87..b28840267 100644 --- a/unsupported/test/cxx11_tensor_hip.cu +++ b/unsupported/test/cxx11_tensor_hip.cu @@ -1222,9 +1222,8 @@ void test_cxx11_tensor_hip() CALL_SUBTEST(test_hip_elementwise()); CALL_SUBTEST(test_hip_props()); CALL_SUBTEST(test_hip_reduction()); - // FIXME : uncommenting following tests results in compile failure - // CALL_SUBTEST(test_hip_contraction()); - // CALL_SUBTEST(test_hip_contraction()); + CALL_SUBTEST(test_hip_contraction()); + CALL_SUBTEST(test_hip_contraction()); CALL_SUBTEST(test_hip_convolution_1d()); CALL_SUBTEST(test_hip_convolution_1d()); CALL_SUBTEST(test_hip_convolution_inner_dim_col_major_1d()); -- cgit v1.2.3