From 064d686c57387f02cf4395aa2c8b5810975a967a Mon Sep 17 00:00:00 2001 From: Rasmus Munk Larsen <4643818-rmlarsen1@users.noreply.gitlab.com> Date: Thu, 26 Feb 2026 07:03:38 -0800 Subject: [PATCH] Remove CXX11/ directory nesting for Tensor modules libeigen/eigen!2199 Co-authored-by: Rasmus Munk Larsen --- Eigen/src/Core/util/GpuHipCudaDefines.inc | 4 +- Eigen/src/ThreadPool/InternalHeaderCheck.h | 3 +- ci/scripts/run-clang-tidy.sh | 15 +- unsupported/Eigen/CMakeLists.txt | 3 + unsupported/Eigen/CXX11/CMakeLists.txt | 3 +- unsupported/Eigen/CXX11/Tensor | 144 +----------------- unsupported/Eigen/CXX11/TensorSymmetry | 42 +---- unsupported/Eigen/CXX11/ThreadPool | 3 +- .../CXX11/src/Tensor/InternalHeaderCheck.h | 3 - .../CXX11/src/Tensor/TensorContractionCuda.h | 7 - .../Eigen/CXX11/src/Tensor/TensorDeviceCuda.h | 7 - .../src/TensorSymmetry/InternalHeaderCheck.h | 4 - unsupported/Eigen/Tensor | 142 +++++++++++++++++ unsupported/Eigen/TensorSymmetry | 40 +++++ unsupported/Eigen/ThreadPool | 1 + .../Eigen/src/Tensor/InternalHeaderCheck.h | 3 + .../Eigen/{CXX11 => }/src/Tensor/README.md | 0 .../Eigen/{CXX11 => }/src/Tensor/Tensor.h | 0 .../{CXX11 => }/src/Tensor/TensorArgMax.h | 0 .../{CXX11 => }/src/Tensor/TensorAssign.h | 0 .../Eigen/{CXX11 => }/src/Tensor/TensorBase.h | 0 .../{CXX11 => }/src/Tensor/TensorBlock.h | 0 .../src/Tensor/TensorBroadcasting.h | 0 .../{CXX11 => }/src/Tensor/TensorChipping.h | 0 .../src/Tensor/TensorConcatenation.h | 0 .../src/Tensor/TensorContraction.h | 1 + .../src/Tensor/TensorContractionBlocking.h | 0 .../Eigen/src/Tensor/TensorContractionCuda.h | 7 + .../src/Tensor/TensorContractionGpu.h | 0 .../src/Tensor/TensorContractionMapper.h | 0 .../src/Tensor/TensorContractionSycl.h | 0 .../src/Tensor/TensorContractionThreadPool.h | 0 .../{CXX11 => }/src/Tensor/TensorConversion.h | 0 .../src/Tensor/TensorConvolution.h | 0 .../src/Tensor/TensorConvolutionSycl.h | 0 .../{CXX11 => }/src/Tensor/TensorCostModel.h | 0 .../{CXX11 => }/src/Tensor/TensorCustomOp.h | 0 .../{CXX11 => }/src/Tensor/TensorDevice.h | 0 .../Eigen/src/Tensor/TensorDeviceCuda.h | 7 + .../src/Tensor/TensorDeviceDefault.h | 0 .../{CXX11 => }/src/Tensor/TensorDeviceGpu.h | 0 .../{CXX11 => }/src/Tensor/TensorDeviceSycl.h | 0 .../src/Tensor/TensorDeviceThreadPool.h | 0 .../src/Tensor/TensorDimensionList.h | 0 .../{CXX11 => }/src/Tensor/TensorDimensions.h | 0 .../{CXX11 => }/src/Tensor/TensorEvalTo.h | 0 .../{CXX11 => }/src/Tensor/TensorEvaluator.h | 0 .../{CXX11 => }/src/Tensor/TensorExecutor.h | 2 +- .../Eigen/{CXX11 => }/src/Tensor/TensorExpr.h | 0 .../Eigen/{CXX11 => }/src/Tensor/TensorFFT.h | 0 .../{CXX11 => }/src/Tensor/TensorFixedSize.h | 0 .../{CXX11 => }/src/Tensor/TensorForcedEval.h | 0 .../src/Tensor/TensorForwardDeclarations.h | 0 .../{CXX11 => }/src/Tensor/TensorFunctors.h | 0 .../{CXX11 => }/src/Tensor/TensorGenerator.h | 0 .../src/Tensor/TensorGlobalFunctions.h | 0 .../Eigen/{CXX11 => }/src/Tensor/TensorIO.h | 0 .../{CXX11 => }/src/Tensor/TensorImagePatch.h | 0 .../{CXX11 => }/src/Tensor/TensorIndexList.h | 7 +- .../{CXX11 => }/src/Tensor/TensorInflation.h | 0 .../src/Tensor/TensorInitializer.h | 0 .../{CXX11 => }/src/Tensor/TensorIntDiv.h | 0 .../{CXX11 => }/src/Tensor/TensorLayoutSwap.h | 0 .../{CXX11 => }/src/Tensor/TensorMacros.h | 0 .../Eigen/{CXX11 => }/src/Tensor/TensorMap.h | 0 .../Eigen/{CXX11 => }/src/Tensor/TensorMeta.h | 0 .../{CXX11 => }/src/Tensor/TensorMorphing.h | 0 .../{CXX11 => }/src/Tensor/TensorPadding.h | 0 .../{CXX11 => }/src/Tensor/TensorPatch.h | 0 .../{CXX11 => }/src/Tensor/TensorRandom.h | 0 .../{CXX11 => }/src/Tensor/TensorReduction.h | 0 .../src/Tensor/TensorReductionGpu.h | 0 .../src/Tensor/TensorReductionSycl.h | 0 .../Eigen/{CXX11 => }/src/Tensor/TensorRef.h | 0 .../{CXX11 => }/src/Tensor/TensorReverse.h | 0 .../Eigen/{CXX11 => }/src/Tensor/TensorRoll.h | 0 .../Eigen/{CXX11 => }/src/Tensor/TensorScan.h | 0 .../{CXX11 => }/src/Tensor/TensorScanSycl.h | 0 .../{CXX11 => }/src/Tensor/TensorShuffling.h | 0 .../{CXX11 => }/src/Tensor/TensorStorage.h | 0 .../{CXX11 => }/src/Tensor/TensorStriding.h | 0 .../{CXX11 => }/src/Tensor/TensorTrace.h | 0 .../{CXX11 => }/src/Tensor/TensorTraits.h | 0 .../{CXX11 => }/src/Tensor/TensorUInt128.h | 0 .../src/Tensor/TensorVolumePatch.h | 0 .../src/TensorSymmetry/DynamicSymmetry.h | 6 +- .../src/TensorSymmetry/InternalHeaderCheck.h | 3 + .../src/TensorSymmetry/StaticSymmetry.h | 0 .../{CXX11 => }/src/TensorSymmetry/Symmetry.h | 0 .../TensorSymmetry/util/TemplateGroupTheory.h | 0 .../src/util => src/TensorUtil}/CXX11Meta.h | 2 +- .../TensorUtil}/CXX11Workarounds.h | 0 unsupported/doc/examples/SYCL/CwiseMul.cpp | 2 +- unsupported/test/cxx11_tensor_argmax.cpp | 2 +- unsupported/test/cxx11_tensor_argmax_gpu.cu | 2 +- unsupported/test/cxx11_tensor_argmax_sycl.cpp | 2 +- unsupported/test/cxx11_tensor_assign.cpp | 2 +- .../test/cxx11_tensor_block_access.cpp | 2 +- unsupported/test/cxx11_tensor_block_eval.cpp | 2 +- unsupported/test/cxx11_tensor_block_io.cpp | 2 +- .../test/cxx11_tensor_broadcast_sycl.cpp | 2 +- .../test/cxx11_tensor_broadcasting.cpp | 2 +- .../test/cxx11_tensor_builtins_sycl.cpp | 2 +- .../test/cxx11_tensor_cast_float16_gpu.cu | 2 +- unsupported/test/cxx11_tensor_casts.cpp | 2 +- unsupported/test/cxx11_tensor_chipping.cpp | 2 +- .../test/cxx11_tensor_chipping_sycl.cpp | 2 +- unsupported/test/cxx11_tensor_comparisons.cpp | 2 +- .../cxx11_tensor_complex_cwise_ops_gpu.cu | 2 +- unsupported/test/cxx11_tensor_complex_gpu.cu | 2 +- .../test/cxx11_tensor_concatenation.cpp | 2 +- .../test/cxx11_tensor_concatenation_sycl.cpp | 2 +- unsupported/test/cxx11_tensor_const.cpp | 2 +- unsupported/test/cxx11_tensor_contract_gpu.cu | 2 +- .../test/cxx11_tensor_contract_sycl.cpp | 2 +- unsupported/test/cxx11_tensor_contraction.cpp | 2 +- unsupported/test/cxx11_tensor_convolution.cpp | 2 +- .../test/cxx11_tensor_convolution_sycl.cpp | 2 +- .../test/cxx11_tensor_custom_index.cpp | 2 +- unsupported/test/cxx11_tensor_custom_op.cpp | 2 +- .../test/cxx11_tensor_custom_op_sycl.cpp | 2 +- unsupported/test/cxx11_tensor_device.cu | 2 +- unsupported/test/cxx11_tensor_device_sycl.cpp | 2 +- unsupported/test/cxx11_tensor_dimension.cpp | 2 +- unsupported/test/cxx11_tensor_empty.cpp | 2 +- unsupported/test/cxx11_tensor_executor.cpp | 2 +- unsupported/test/cxx11_tensor_expr.cpp | 2 +- unsupported/test/cxx11_tensor_fft.cpp | 2 +- unsupported/test/cxx11_tensor_fixed_size.cpp | 2 +- unsupported/test/cxx11_tensor_forced_eval.cpp | 2 +- .../test/cxx11_tensor_forced_eval_sycl.cpp | 2 +- unsupported/test/cxx11_tensor_generator.cpp | 2 +- .../test/cxx11_tensor_generator_sycl.cpp | 2 +- unsupported/test/cxx11_tensor_gpu.cu | 2 +- unsupported/test/cxx11_tensor_ifft.cpp | 2 +- .../test/cxx11_tensor_image_op_sycl.cpp | 2 +- unsupported/test/cxx11_tensor_image_patch.cpp | 2 +- .../test/cxx11_tensor_image_patch_sycl.cpp | 2 +- unsupported/test/cxx11_tensor_index_list.cpp | 2 +- unsupported/test/cxx11_tensor_inflation.cpp | 2 +- .../test/cxx11_tensor_inflation_sycl.cpp | 2 +- unsupported/test/cxx11_tensor_intdiv.cpp | 2 +- unsupported/test/cxx11_tensor_io.cpp | 2 +- unsupported/test/cxx11_tensor_layout_swap.cpp | 2 +- .../test/cxx11_tensor_layout_swap_sycl.cpp | 2 +- unsupported/test/cxx11_tensor_lvalue.cpp | 2 +- unsupported/test/cxx11_tensor_map.cpp | 2 +- unsupported/test/cxx11_tensor_math.cpp | 2 +- unsupported/test/cxx11_tensor_math_sycl.cpp | 2 +- .../test/cxx11_tensor_mixed_indices.cpp | 2 +- unsupported/test/cxx11_tensor_morphing.cpp | 2 +- .../test/cxx11_tensor_morphing_sycl.cpp | 2 +- unsupported/test/cxx11_tensor_move.cpp | 2 +- .../test/cxx11_tensor_notification.cpp | 2 +- .../test/cxx11_tensor_of_bfloat16_gpu.cu | 2 +- unsupported/test/cxx11_tensor_of_complex.cpp | 2 +- .../test/cxx11_tensor_of_const_values.cpp | 2 +- .../test/cxx11_tensor_of_float16_gpu.cu | 2 +- .../test/cxx11_tensor_of_float16_sycl.cpp | 2 +- unsupported/test/cxx11_tensor_of_strings.cpp | 2 +- unsupported/test/cxx11_tensor_padding.cpp | 2 +- .../test/cxx11_tensor_padding_sycl.cpp | 2 +- unsupported/test/cxx11_tensor_patch.cpp | 2 +- unsupported/test/cxx11_tensor_patch_sycl.cpp | 2 +- unsupported/test/cxx11_tensor_random.cpp | 2 +- unsupported/test/cxx11_tensor_random_gpu.cu | 2 +- unsupported/test/cxx11_tensor_random_sycl.cpp | 2 +- unsupported/test/cxx11_tensor_reduction.cpp | 2 +- .../test/cxx11_tensor_reduction_gpu.cu | 2 +- .../test/cxx11_tensor_reduction_sycl.cpp | 2 +- unsupported/test/cxx11_tensor_ref.cpp | 2 +- unsupported/test/cxx11_tensor_reverse.cpp | 2 +- .../test/cxx11_tensor_reverse_sycl.cpp | 2 +- unsupported/test/cxx11_tensor_roll.cpp | 2 +- unsupported/test/cxx11_tensor_roundings.cpp | 2 +- unsupported/test/cxx11_tensor_scan.cpp | 2 +- unsupported/test/cxx11_tensor_scan_gpu.cu | 2 +- unsupported/test/cxx11_tensor_scan_sycl.cpp | 2 +- unsupported/test/cxx11_tensor_shuffling.cpp | 2 +- .../test/cxx11_tensor_shuffling_sycl.cpp | 2 +- unsupported/test/cxx11_tensor_simple.cpp | 2 +- unsupported/test/cxx11_tensor_striding.cpp | 2 +- .../test/cxx11_tensor_striding_sycl.cpp | 2 +- unsupported/test/cxx11_tensor_sugar.cpp | 2 +- unsupported/test/cxx11_tensor_sycl.cpp | 2 +- unsupported/test/cxx11_tensor_symmetry.cpp | 4 +- unsupported/test/cxx11_tensor_thread_pool.cpp | 2 +- unsupported/test/cxx11_tensor_trace.cpp | 2 +- unsupported/test/cxx11_tensor_uint128.cpp | 2 +- .../test/cxx11_tensor_volume_patch.cpp | 2 +- .../test/cxx11_tensor_volume_patch_sycl.cpp | 2 +- 191 files changed, 336 insertions(+), 323 deletions(-) delete mode 100644 unsupported/Eigen/CXX11/src/Tensor/InternalHeaderCheck.h delete mode 100644 unsupported/Eigen/CXX11/src/Tensor/TensorContractionCuda.h delete mode 100644 unsupported/Eigen/CXX11/src/Tensor/TensorDeviceCuda.h delete mode 100644 unsupported/Eigen/CXX11/src/TensorSymmetry/InternalHeaderCheck.h create mode 100644 unsupported/Eigen/Tensor create mode 100644 unsupported/Eigen/TensorSymmetry create mode 100644 unsupported/Eigen/ThreadPool create mode 100644 unsupported/Eigen/src/Tensor/InternalHeaderCheck.h rename unsupported/Eigen/{CXX11 => }/src/Tensor/README.md (100%) rename unsupported/Eigen/{CXX11 => }/src/Tensor/Tensor.h (100%) rename unsupported/Eigen/{CXX11 => }/src/Tensor/TensorArgMax.h (100%) rename unsupported/Eigen/{CXX11 => }/src/Tensor/TensorAssign.h (100%) rename unsupported/Eigen/{CXX11 => }/src/Tensor/TensorBase.h (100%) rename unsupported/Eigen/{CXX11 => }/src/Tensor/TensorBlock.h (100%) rename unsupported/Eigen/{CXX11 => }/src/Tensor/TensorBroadcasting.h (100%) rename unsupported/Eigen/{CXX11 => }/src/Tensor/TensorChipping.h (100%) rename unsupported/Eigen/{CXX11 => }/src/Tensor/TensorConcatenation.h (100%) rename unsupported/Eigen/{CXX11 => }/src/Tensor/TensorContraction.h (99%) rename unsupported/Eigen/{CXX11 => }/src/Tensor/TensorContractionBlocking.h (100%) create mode 100644 unsupported/Eigen/src/Tensor/TensorContractionCuda.h rename unsupported/Eigen/{CXX11 => }/src/Tensor/TensorContractionGpu.h (100%) rename unsupported/Eigen/{CXX11 => }/src/Tensor/TensorContractionMapper.h (100%) rename unsupported/Eigen/{CXX11 => }/src/Tensor/TensorContractionSycl.h (100%) rename unsupported/Eigen/{CXX11 => }/src/Tensor/TensorContractionThreadPool.h (100%) rename unsupported/Eigen/{CXX11 => }/src/Tensor/TensorConversion.h (100%) rename unsupported/Eigen/{CXX11 => }/src/Tensor/TensorConvolution.h (100%) rename unsupported/Eigen/{CXX11 => }/src/Tensor/TensorConvolutionSycl.h (100%) rename unsupported/Eigen/{CXX11 => }/src/Tensor/TensorCostModel.h (100%) rename unsupported/Eigen/{CXX11 => }/src/Tensor/TensorCustomOp.h (100%) rename unsupported/Eigen/{CXX11 => }/src/Tensor/TensorDevice.h (100%) create mode 100644 unsupported/Eigen/src/Tensor/TensorDeviceCuda.h rename unsupported/Eigen/{CXX11 => }/src/Tensor/TensorDeviceDefault.h (100%) rename unsupported/Eigen/{CXX11 => }/src/Tensor/TensorDeviceGpu.h (100%) rename unsupported/Eigen/{CXX11 => }/src/Tensor/TensorDeviceSycl.h (100%) rename unsupported/Eigen/{CXX11 => }/src/Tensor/TensorDeviceThreadPool.h (100%) rename unsupported/Eigen/{CXX11 => }/src/Tensor/TensorDimensionList.h (100%) rename unsupported/Eigen/{CXX11 => }/src/Tensor/TensorDimensions.h (100%) rename unsupported/Eigen/{CXX11 => }/src/Tensor/TensorEvalTo.h (100%) rename unsupported/Eigen/{CXX11 => }/src/Tensor/TensorEvaluator.h (100%) rename unsupported/Eigen/{CXX11 => }/src/Tensor/TensorExecutor.h (99%) rename unsupported/Eigen/{CXX11 => }/src/Tensor/TensorExpr.h (100%) rename unsupported/Eigen/{CXX11 => }/src/Tensor/TensorFFT.h (100%) rename unsupported/Eigen/{CXX11 => }/src/Tensor/TensorFixedSize.h (100%) rename unsupported/Eigen/{CXX11 => }/src/Tensor/TensorForcedEval.h (100%) rename unsupported/Eigen/{CXX11 => }/src/Tensor/TensorForwardDeclarations.h (100%) rename unsupported/Eigen/{CXX11 => }/src/Tensor/TensorFunctors.h (100%) rename unsupported/Eigen/{CXX11 => }/src/Tensor/TensorGenerator.h (100%) rename unsupported/Eigen/{CXX11 => }/src/Tensor/TensorGlobalFunctions.h (100%) rename unsupported/Eigen/{CXX11 => }/src/Tensor/TensorIO.h (100%) rename unsupported/Eigen/{CXX11 => }/src/Tensor/TensorImagePatch.h (100%) rename unsupported/Eigen/{CXX11 => }/src/Tensor/TensorIndexList.h (99%) rename unsupported/Eigen/{CXX11 => }/src/Tensor/TensorInflation.h (100%) rename unsupported/Eigen/{CXX11 => }/src/Tensor/TensorInitializer.h (100%) rename unsupported/Eigen/{CXX11 => }/src/Tensor/TensorIntDiv.h (100%) rename unsupported/Eigen/{CXX11 => }/src/Tensor/TensorLayoutSwap.h (100%) rename unsupported/Eigen/{CXX11 => }/src/Tensor/TensorMacros.h (100%) rename unsupported/Eigen/{CXX11 => }/src/Tensor/TensorMap.h (100%) rename unsupported/Eigen/{CXX11 => }/src/Tensor/TensorMeta.h (100%) rename unsupported/Eigen/{CXX11 => }/src/Tensor/TensorMorphing.h (100%) rename unsupported/Eigen/{CXX11 => }/src/Tensor/TensorPadding.h (100%) rename unsupported/Eigen/{CXX11 => }/src/Tensor/TensorPatch.h (100%) rename unsupported/Eigen/{CXX11 => }/src/Tensor/TensorRandom.h (100%) rename unsupported/Eigen/{CXX11 => }/src/Tensor/TensorReduction.h (100%) rename unsupported/Eigen/{CXX11 => }/src/Tensor/TensorReductionGpu.h (100%) rename unsupported/Eigen/{CXX11 => }/src/Tensor/TensorReductionSycl.h (100%) rename unsupported/Eigen/{CXX11 => }/src/Tensor/TensorRef.h (100%) rename unsupported/Eigen/{CXX11 => }/src/Tensor/TensorReverse.h (100%) rename unsupported/Eigen/{CXX11 => }/src/Tensor/TensorRoll.h (100%) rename unsupported/Eigen/{CXX11 => }/src/Tensor/TensorScan.h (100%) rename unsupported/Eigen/{CXX11 => }/src/Tensor/TensorScanSycl.h (100%) rename unsupported/Eigen/{CXX11 => }/src/Tensor/TensorShuffling.h (100%) rename unsupported/Eigen/{CXX11 => }/src/Tensor/TensorStorage.h (100%) rename unsupported/Eigen/{CXX11 => }/src/Tensor/TensorStriding.h (100%) rename unsupported/Eigen/{CXX11 => }/src/Tensor/TensorTrace.h (100%) rename unsupported/Eigen/{CXX11 => }/src/Tensor/TensorTraits.h (100%) rename unsupported/Eigen/{CXX11 => }/src/Tensor/TensorUInt128.h (100%) rename unsupported/Eigen/{CXX11 => }/src/Tensor/TensorVolumePatch.h (100%) rename unsupported/Eigen/{CXX11 => }/src/TensorSymmetry/DynamicSymmetry.h (98%) create mode 100644 unsupported/Eigen/src/TensorSymmetry/InternalHeaderCheck.h rename unsupported/Eigen/{CXX11 => }/src/TensorSymmetry/StaticSymmetry.h (100%) rename unsupported/Eigen/{CXX11 => }/src/TensorSymmetry/Symmetry.h (100%) rename unsupported/Eigen/{CXX11 => }/src/TensorSymmetry/util/TemplateGroupTheory.h (100%) rename unsupported/Eigen/{CXX11/src/util => src/TensorUtil}/CXX11Meta.h (88%) rename unsupported/Eigen/{CXX11/src/util => src/TensorUtil}/CXX11Workarounds.h (100%) diff --git a/Eigen/src/Core/util/GpuHipCudaDefines.inc b/Eigen/src/Core/util/GpuHipCudaDefines.inc index 4e1050053..f3d4023c1 100644 --- a/Eigen/src/Core/util/GpuHipCudaDefines.inc +++ b/Eigen/src/Core/util/GpuHipCudaDefines.inc @@ -15,11 +15,11 @@ // 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 // When compiling such files, gcc will end up trying to pick up the CUDA headers by -// default (see the code within "unsupported/Eigen/CXX11/Tensor" that is guarded by EIGEN_USE_GPU) +// default (see the code within "unsupported/Eigen/Tensor" that is guarded by EIGEN_USE_GPU) // This will obviously not work when trying to compile tensorflow on a system with no CUDA // To work around this issue for HIP systems (and leave the default behaviour intact), the // HIP tensorflow build defines EIGEN_USE_HIP when compiling all source files, and -// "unsupported/Eigen/CXX11/Tensor" has been updated to use HIP header when EIGEN_USE_HIP is +// "unsupported/Eigen/Tensor" has been updated to use HIP header when EIGEN_USE_HIP is // defined. In continuation of that requirement, the guard here needs to be EIGEN_USE_HIP as well #if defined(EIGEN_USE_HIP) diff --git a/Eigen/src/ThreadPool/InternalHeaderCheck.h b/Eigen/src/ThreadPool/InternalHeaderCheck.h index 5b27ef436..4384cc66a 100644 --- a/Eigen/src/ThreadPool/InternalHeaderCheck.h +++ b/Eigen/src/ThreadPool/InternalHeaderCheck.h @@ -1,4 +1,3 @@ #ifndef EIGEN_THREADPOOL_MODULE_H -#error \ - "Please include unsupported/Eigen/CXX11/ThreadPool instead of including headers inside the src directory directly." +#error "Please include Eigen/ThreadPool instead of including headers inside the src directory directly." #endif diff --git a/ci/scripts/run-clang-tidy.sh b/ci/scripts/run-clang-tidy.sh index 6b40deab6..dfda74665 100755 --- a/ci/scripts/run-clang-tidy.sh +++ b/ci/scripts/run-clang-tidy.sh @@ -22,8 +22,9 @@ if [ ! -f "${BUILD_DIR}/compile_commands.json" ]; then exit 1 fi -# External-dependency modules that require third-party headers we don't have. -SKIP_MODULES="AccelerateSupport|CholmodSupport|KLUSupport|MetisSupport|PaStiXSupport|PardisoSupport|SPQRSupport|SuperLUSupport|UmfPackSupport" +# External-dependency modules that require third-party headers we don't have, +# and utility-only directories with no standalone module header. +SKIP_MODULES="AccelerateSupport|CholmodSupport|KLUSupport|MetisSupport|PaStiXSupport|PardisoSupport|SPQRSupport|SuperLUSupport|UmfPackSupport|TensorUtil" # Get changed files (Added, Modified, Renamed). CHANGED_FILES=$(git diff --name-only --diff-filter=AMR "${BASE_SHA}" HEAD) @@ -44,23 +45,23 @@ module_include_for_header() { local header="$1" local module - # Handle Eigen/src//... -> Eigen/ + # Handle Eigen/src//... and unsupported/Eigen/src//... + # Extract just the bare module name first. if [[ "${header}" =~ ^Eigen/src/([^/]+)/ ]]; then module="${BASH_REMATCH[1]}" - # Handle unsupported/Eigen/src//... -> unsupported/Eigen/ elif [[ "${header}" =~ ^unsupported/Eigen/src/([^/]+)/ ]]; then - module="unsupported/Eigen/${BASH_REMATCH[1]}" + module="${BASH_REMATCH[1]}" else return 1 fi - # Skip external-dependency modules. + # Skip external-dependency modules and utility-only directories. if [[ "${module}" =~ ^(${SKIP_MODULES})$ ]]; then return 1 fi if [[ "${header}" =~ ^unsupported/ ]]; then - echo "${module}" + echo "unsupported/Eigen/${module}" else echo "Eigen/${module}" fi diff --git a/unsupported/Eigen/CMakeLists.txt b/unsupported/Eigen/CMakeLists.txt index 1517ba956..6d3c57e18 100644 --- a/unsupported/Eigen/CMakeLists.txt +++ b/unsupported/Eigen/CMakeLists.txt @@ -19,6 +19,9 @@ set(Eigen_HEADERS SparseExtra SpecialFunctions Splines + Tensor + TensorSymmetry + ThreadPool ) install(FILES diff --git a/unsupported/Eigen/CXX11/CMakeLists.txt b/unsupported/Eigen/CXX11/CMakeLists.txt index 385ed240c..f31b4bcd4 100644 --- a/unsupported/Eigen/CXX11/CMakeLists.txt +++ b/unsupported/Eigen/CXX11/CMakeLists.txt @@ -1,8 +1,7 @@ +# Forwarding headers for backward compatibility. set(Eigen_CXX11_HEADERS Tensor TensorSymmetry ThreadPool) install(FILES ${Eigen_CXX11_HEADERS} DESTINATION ${INCLUDE_INSTALL_DIR}/unsupported/Eigen/CXX11 COMPONENT Devel ) - -install(DIRECTORY src DESTINATION ${INCLUDE_INSTALL_DIR}/unsupported/Eigen/CXX11 COMPONENT Devel FILES_MATCHING PATTERN "*.h") diff --git a/unsupported/Eigen/CXX11/Tensor b/unsupported/Eigen/CXX11/Tensor index 7375a9b42..c80aa4200 100644 --- a/unsupported/Eigen/CXX11/Tensor +++ b/unsupported/Eigen/CXX11/Tensor @@ -1,142 +1,2 @@ -// This file is part of Eigen, a lightweight C++ template library -// for linear algebra. -// -// Copyright (C) 2014 Benoit Steiner -// Copyright (C) 2013 Christian Seiler -// -// This Source Code Form is subject to the terms of the Mozilla -// 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_H -#define EIGEN_CXX11_TENSOR_MODULE_H - -#include "../../../Eigen/Core" - -#include "../SpecialFunctions" - -#include "../../../Eigen/src/Core/util/DisableStupidWarnings.h" - -// IWYU pragma: begin_exports -#include "../../../Eigen/src/Core/util/Meta.h" -#include "../../../Eigen/src/Core/util/MaxSizeVector.h" -// IWYU pragma: end_exports - -/** \defgroup CXX11_Tensor_Module Tensor Module - * - * This module provides a Tensor class for storing arbitrarily indexed - * objects. - * - * \code - * #include - * \endcode - * - * Much of the documentation can be found \ref eigen_tensors "here". - */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#if defined(EIGEN_USE_THREADS) || defined(EIGEN_USE_SYCL) -#include "../../../Eigen/ThreadPool" -#endif - -#ifdef EIGEN_USE_GPU -#include -#if defined(EIGEN_USE_HIP) -#include -#else -#include -#endif -#endif - -// IWYU pragma: begin_exports -#include "src/Tensor/TensorMacros.h" -#include "src/Tensor/TensorForwardDeclarations.h" -#include "src/Tensor/TensorMeta.h" -#include "src/Tensor/TensorFunctors.h" -#include "src/Tensor/TensorCostModel.h" -#include "src/Tensor/TensorDeviceDefault.h" -#include "src/Tensor/TensorDeviceThreadPool.h" -#include "src/Tensor/TensorDeviceGpu.h" -#ifndef gpu_assert -#define gpu_assert(x) -#endif -#include "src/Tensor/TensorDeviceSycl.h" -#include "src/Tensor/TensorIndexList.h" -#include "src/Tensor/TensorDimensionList.h" -#include "src/Tensor/TensorDimensions.h" -#include "src/Tensor/TensorInitializer.h" -#include "src/Tensor/TensorTraits.h" -#include "src/Tensor/TensorRandom.h" -#include "src/Tensor/TensorUInt128.h" -#include "src/Tensor/TensorIntDiv.h" -#include "src/Tensor/TensorGlobalFunctions.h" - -#include "src/Tensor/TensorIO.h" - -#include "src/Tensor/TensorBase.h" -#include "src/Tensor/TensorBlock.h" - -#include "src/Tensor/TensorEvaluator.h" -#include "src/Tensor/TensorExpr.h" -#include "src/Tensor/TensorReduction.h" -#include "src/Tensor/TensorReductionGpu.h" -#include "src/Tensor/TensorArgMax.h" -#include "src/Tensor/TensorConcatenation.h" -#include "src/Tensor/TensorContractionMapper.h" -#include "src/Tensor/TensorContractionBlocking.h" -#include "src/Tensor/TensorContraction.h" -#include "src/Tensor/TensorContractionThreadPool.h" -#include "src/Tensor/TensorContractionGpu.h" -#include "src/Tensor/TensorConversion.h" -#include "src/Tensor/TensorConvolution.h" -#include "src/Tensor/TensorFFT.h" -#include "src/Tensor/TensorPatch.h" -#include "src/Tensor/TensorImagePatch.h" -#include "src/Tensor/TensorVolumePatch.h" -#include "src/Tensor/TensorBroadcasting.h" -#include "src/Tensor/TensorChipping.h" -#include "src/Tensor/TensorInflation.h" -#include "src/Tensor/TensorLayoutSwap.h" -#include "src/Tensor/TensorMorphing.h" -#include "src/Tensor/TensorPadding.h" -#include "src/Tensor/TensorReverse.h" -#include "src/Tensor/TensorRoll.h" -#include "src/Tensor/TensorShuffling.h" -#include "src/Tensor/TensorStriding.h" -#include "src/Tensor/TensorCustomOp.h" -#include "src/Tensor/TensorEvalTo.h" -#include "src/Tensor/TensorForcedEval.h" -#include "src/Tensor/TensorGenerator.h" -#include "src/Tensor/TensorAssign.h" -#include "src/Tensor/TensorScan.h" -#include "src/Tensor/TensorTrace.h" - -#ifdef EIGEN_USE_SYCL -#include "src/Tensor/TensorReductionSycl.h" -#include "src/Tensor/TensorConvolutionSycl.h" -#include "src/Tensor/TensorContractionSycl.h" -#include "src/Tensor/TensorScanSycl.h" -#endif - -#include "src/Tensor/TensorExecutor.h" -#include "src/Tensor/TensorDevice.h" - -#include "src/Tensor/TensorStorage.h" -#include "src/Tensor/Tensor.h" -#include "src/Tensor/TensorFixedSize.h" -#include "src/Tensor/TensorMap.h" -#include "src/Tensor/TensorRef.h" -// IWYU pragma: end_exports - -#include "../../../Eigen/src/Core/util/ReenableStupidWarnings.h" - -// #endif // EIGEN_CXX11_TENSOR_MODULE_H +// Forwarding header for backward compatibility. +#include "../Tensor" // IWYU pragma: export diff --git a/unsupported/Eigen/CXX11/TensorSymmetry b/unsupported/Eigen/CXX11/TensorSymmetry index 0bf9a48b3..5222978f0 100644 --- a/unsupported/Eigen/CXX11/TensorSymmetry +++ b/unsupported/Eigen/CXX11/TensorSymmetry @@ -1,40 +1,2 @@ -// This file is part of Eigen, a lightweight C++ template library -// for linear algebra. -// -// Copyright (C) 2013 Christian Seiler -// -// This Source Code Form is subject to the terms of the Mozilla -// 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_TENSORSYMMETRY_MODULE_H -#define EIGEN_CXX11_TENSORSYMMETRY_MODULE_H - -#include "Tensor" - -#include "../../../Eigen/src/Core/util/DisableStupidWarnings.h" - -#include "src/util/CXX11Meta.h" - -/** \defgroup TensorSymmetry_Module Tensor Symmetry Module - * - * This module provides a classes that allow for the definition of - * symmetries w.r.t. tensor indices. - * - * Including this module will implicitly include the Tensor module. - * - * \code - * #include - * \endcode - */ - -// IWYU pragma: begin_exports -#include "src/TensorSymmetry/util/TemplateGroupTheory.h" -#include "src/TensorSymmetry/Symmetry.h" -#include "src/TensorSymmetry/StaticSymmetry.h" -#include "src/TensorSymmetry/DynamicSymmetry.h" -// IWYU pragma: end_exports - -#include "../../../Eigen/src/Core/util/ReenableStupidWarnings.h" - -#endif // EIGEN_CXX11_TENSORSYMMETRY_MODULE_H +// Forwarding header for backward compatibility. +#include "../TensorSymmetry" // IWYU pragma: export diff --git a/unsupported/Eigen/CXX11/ThreadPool b/unsupported/Eigen/CXX11/ThreadPool index d48733376..c215d5f07 100644 --- a/unsupported/Eigen/CXX11/ThreadPool +++ b/unsupported/Eigen/CXX11/ThreadPool @@ -1 +1,2 @@ -#include "../../../Eigen/ThreadPool" // IWYU pragma: export +// Forwarding header for backward compatibility. +#include "../ThreadPool" // IWYU pragma: export diff --git a/unsupported/Eigen/CXX11/src/Tensor/InternalHeaderCheck.h b/unsupported/Eigen/CXX11/src/Tensor/InternalHeaderCheck.h deleted file mode 100644 index 9e4c1ed9c..000000000 --- a/unsupported/Eigen/CXX11/src/Tensor/InternalHeaderCheck.h +++ /dev/null @@ -1,3 +0,0 @@ -#ifndef EIGEN_CXX11_TENSOR_MODULE_H -#error "Please include unsupported/Eigen/CXX11/Tensor instead of including headers inside the src directory directly." -#endif diff --git a/unsupported/Eigen/CXX11/src/Tensor/TensorContractionCuda.h b/unsupported/Eigen/CXX11/src/Tensor/TensorContractionCuda.h deleted file mode 100644 index dbea8aa92..000000000 --- a/unsupported/Eigen/CXX11/src/Tensor/TensorContractionCuda.h +++ /dev/null @@ -1,7 +0,0 @@ - -#if defined(__clang__) || defined(__GNUC__) -#warning \ - "Deprecated header file, please either include the main Eigen/CXX11/Tensor header or the respective TensorContractionGpu.h file" -#endif - -#include "TensorContractionGpu.h" diff --git a/unsupported/Eigen/CXX11/src/Tensor/TensorDeviceCuda.h b/unsupported/Eigen/CXX11/src/Tensor/TensorDeviceCuda.h deleted file mode 100644 index c2c8ed002..000000000 --- a/unsupported/Eigen/CXX11/src/Tensor/TensorDeviceCuda.h +++ /dev/null @@ -1,7 +0,0 @@ - -#if defined(__clang__) || defined(__GNUC__) -#warning \ - "Deprecated header file, please either include the main Eigen/CXX11/Tensor header or the respective TensorDeviceGpu.h file" -#endif - -#include "TensorDeviceGpu.h" diff --git a/unsupported/Eigen/CXX11/src/TensorSymmetry/InternalHeaderCheck.h b/unsupported/Eigen/CXX11/src/TensorSymmetry/InternalHeaderCheck.h deleted file mode 100644 index b1b2e14c6..000000000 --- a/unsupported/Eigen/CXX11/src/TensorSymmetry/InternalHeaderCheck.h +++ /dev/null @@ -1,4 +0,0 @@ -#ifndef EIGEN_CXX11_TENSORSYMMETRY_MODULE_H -#error \ - "Please include unsupported/Eigen/CXX11/TensorSymmetry instead of including headers inside the src directory directly." -#endif diff --git a/unsupported/Eigen/Tensor b/unsupported/Eigen/Tensor new file mode 100644 index 000000000..6053b0164 --- /dev/null +++ b/unsupported/Eigen/Tensor @@ -0,0 +1,142 @@ +// This file is part of Eigen, a lightweight C++ template library +// for linear algebra. +// +// Copyright (C) 2014 Benoit Steiner +// Copyright (C) 2013 Christian Seiler +// +// This Source Code Form is subject to the terms of the Mozilla +// 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_H +#define EIGEN_CXX11_TENSOR_MODULE_H + +#include "../../Eigen/Core" + +#include "SpecialFunctions" + +#include "../../Eigen/src/Core/util/DisableStupidWarnings.h" + +// IWYU pragma: begin_exports +#include "../../Eigen/src/Core/util/Meta.h" +#include "../../Eigen/src/Core/util/MaxSizeVector.h" +// IWYU pragma: end_exports + +/** \defgroup CXX11_Tensor_Module Tensor Module + * + * This module provides a Tensor class for storing arbitrarily indexed + * objects. + * + * \code + * #include + * \endcode + * + * Much of the documentation can be found \ref eigen_tensors "here". + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#if defined(EIGEN_USE_THREADS) || defined(EIGEN_USE_SYCL) +#include "../../Eigen/ThreadPool" +#endif + +#ifdef EIGEN_USE_GPU +#include +#if defined(EIGEN_USE_HIP) +#include +#else +#include +#endif +#endif + +// IWYU pragma: begin_exports +#include "src/Tensor/TensorMacros.h" +#include "src/Tensor/TensorForwardDeclarations.h" +#include "src/Tensor/TensorMeta.h" +#include "src/Tensor/TensorFunctors.h" +#include "src/Tensor/TensorCostModel.h" +#include "src/Tensor/TensorDeviceDefault.h" +#include "src/Tensor/TensorDeviceThreadPool.h" +#include "src/Tensor/TensorDeviceGpu.h" +#ifndef gpu_assert +#define gpu_assert(x) +#endif +#include "src/Tensor/TensorDeviceSycl.h" +#include "src/Tensor/TensorIndexList.h" +#include "src/Tensor/TensorDimensionList.h" +#include "src/Tensor/TensorDimensions.h" +#include "src/Tensor/TensorInitializer.h" +#include "src/Tensor/TensorTraits.h" +#include "src/Tensor/TensorRandom.h" +#include "src/Tensor/TensorUInt128.h" +#include "src/Tensor/TensorIntDiv.h" +#include "src/Tensor/TensorGlobalFunctions.h" + +#include "src/Tensor/TensorIO.h" + +#include "src/Tensor/TensorBase.h" +#include "src/Tensor/TensorBlock.h" + +#include "src/Tensor/TensorEvaluator.h" +#include "src/Tensor/TensorExpr.h" +#include "src/Tensor/TensorReduction.h" +#include "src/Tensor/TensorReductionGpu.h" +#include "src/Tensor/TensorArgMax.h" +#include "src/Tensor/TensorConcatenation.h" +#include "src/Tensor/TensorContractionMapper.h" +#include "src/Tensor/TensorContractionBlocking.h" +#include "src/Tensor/TensorContraction.h" +#include "src/Tensor/TensorContractionThreadPool.h" +#include "src/Tensor/TensorContractionGpu.h" +#include "src/Tensor/TensorConversion.h" +#include "src/Tensor/TensorConvolution.h" +#include "src/Tensor/TensorFFT.h" +#include "src/Tensor/TensorPatch.h" +#include "src/Tensor/TensorImagePatch.h" +#include "src/Tensor/TensorVolumePatch.h" +#include "src/Tensor/TensorBroadcasting.h" +#include "src/Tensor/TensorChipping.h" +#include "src/Tensor/TensorInflation.h" +#include "src/Tensor/TensorLayoutSwap.h" +#include "src/Tensor/TensorMorphing.h" +#include "src/Tensor/TensorPadding.h" +#include "src/Tensor/TensorReverse.h" +#include "src/Tensor/TensorRoll.h" +#include "src/Tensor/TensorShuffling.h" +#include "src/Tensor/TensorStriding.h" +#include "src/Tensor/TensorCustomOp.h" +#include "src/Tensor/TensorEvalTo.h" +#include "src/Tensor/TensorForcedEval.h" +#include "src/Tensor/TensorGenerator.h" +#include "src/Tensor/TensorAssign.h" +#include "src/Tensor/TensorScan.h" +#include "src/Tensor/TensorTrace.h" + +#ifdef EIGEN_USE_SYCL +#include "src/Tensor/TensorReductionSycl.h" +#include "src/Tensor/TensorConvolutionSycl.h" +#include "src/Tensor/TensorContractionSycl.h" +#include "src/Tensor/TensorScanSycl.h" +#endif + +#include "src/Tensor/TensorExecutor.h" +#include "src/Tensor/TensorDevice.h" + +#include "src/Tensor/TensorStorage.h" +#include "src/Tensor/Tensor.h" +#include "src/Tensor/TensorFixedSize.h" +#include "src/Tensor/TensorMap.h" +#include "src/Tensor/TensorRef.h" +// IWYU pragma: end_exports + +#include "../../Eigen/src/Core/util/ReenableStupidWarnings.h" + +// #endif // EIGEN_CXX11_TENSOR_MODULE_H diff --git a/unsupported/Eigen/TensorSymmetry b/unsupported/Eigen/TensorSymmetry new file mode 100644 index 000000000..2981da723 --- /dev/null +++ b/unsupported/Eigen/TensorSymmetry @@ -0,0 +1,40 @@ +// This file is part of Eigen, a lightweight C++ template library +// for linear algebra. +// +// Copyright (C) 2013 Christian Seiler +// +// This Source Code Form is subject to the terms of the Mozilla +// 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_TENSORSYMMETRY_MODULE_H +#define EIGEN_CXX11_TENSORSYMMETRY_MODULE_H + +#include "Tensor" + +#include "../../Eigen/src/Core/util/DisableStupidWarnings.h" + +#include "src/TensorUtil/CXX11Meta.h" + +/** \defgroup TensorSymmetry_Module Tensor Symmetry Module + * + * This module provides a classes that allow for the definition of + * symmetries w.r.t. tensor indices. + * + * Including this module will implicitly include the Tensor module. + * + * \code + * #include + * \endcode + */ + +// IWYU pragma: begin_exports +#include "src/TensorSymmetry/util/TemplateGroupTheory.h" +#include "src/TensorSymmetry/Symmetry.h" +#include "src/TensorSymmetry/StaticSymmetry.h" +#include "src/TensorSymmetry/DynamicSymmetry.h" +// IWYU pragma: end_exports + +#include "../../Eigen/src/Core/util/ReenableStupidWarnings.h" + +#endif // EIGEN_CXX11_TENSORSYMMETRY_MODULE_H diff --git a/unsupported/Eigen/ThreadPool b/unsupported/Eigen/ThreadPool new file mode 100644 index 000000000..60121711f --- /dev/null +++ b/unsupported/Eigen/ThreadPool @@ -0,0 +1 @@ +#include "../../Eigen/ThreadPool" // IWYU pragma: export diff --git a/unsupported/Eigen/src/Tensor/InternalHeaderCheck.h b/unsupported/Eigen/src/Tensor/InternalHeaderCheck.h new file mode 100644 index 000000000..b74192489 --- /dev/null +++ b/unsupported/Eigen/src/Tensor/InternalHeaderCheck.h @@ -0,0 +1,3 @@ +#ifndef EIGEN_CXX11_TENSOR_MODULE_H +#error "Please include unsupported/Eigen/Tensor instead of including headers inside the src directory directly." +#endif diff --git a/unsupported/Eigen/CXX11/src/Tensor/README.md b/unsupported/Eigen/src/Tensor/README.md similarity index 100% rename from unsupported/Eigen/CXX11/src/Tensor/README.md rename to unsupported/Eigen/src/Tensor/README.md diff --git a/unsupported/Eigen/CXX11/src/Tensor/Tensor.h b/unsupported/Eigen/src/Tensor/Tensor.h similarity index 100% rename from unsupported/Eigen/CXX11/src/Tensor/Tensor.h rename to unsupported/Eigen/src/Tensor/Tensor.h diff --git a/unsupported/Eigen/CXX11/src/Tensor/TensorArgMax.h b/unsupported/Eigen/src/Tensor/TensorArgMax.h similarity index 100% rename from unsupported/Eigen/CXX11/src/Tensor/TensorArgMax.h rename to unsupported/Eigen/src/Tensor/TensorArgMax.h diff --git a/unsupported/Eigen/CXX11/src/Tensor/TensorAssign.h b/unsupported/Eigen/src/Tensor/TensorAssign.h similarity index 100% rename from unsupported/Eigen/CXX11/src/Tensor/TensorAssign.h rename to unsupported/Eigen/src/Tensor/TensorAssign.h diff --git a/unsupported/Eigen/CXX11/src/Tensor/TensorBase.h b/unsupported/Eigen/src/Tensor/TensorBase.h similarity index 100% rename from unsupported/Eigen/CXX11/src/Tensor/TensorBase.h rename to unsupported/Eigen/src/Tensor/TensorBase.h diff --git a/unsupported/Eigen/CXX11/src/Tensor/TensorBlock.h b/unsupported/Eigen/src/Tensor/TensorBlock.h similarity index 100% rename from unsupported/Eigen/CXX11/src/Tensor/TensorBlock.h rename to unsupported/Eigen/src/Tensor/TensorBlock.h diff --git a/unsupported/Eigen/CXX11/src/Tensor/TensorBroadcasting.h b/unsupported/Eigen/src/Tensor/TensorBroadcasting.h similarity index 100% rename from unsupported/Eigen/CXX11/src/Tensor/TensorBroadcasting.h rename to unsupported/Eigen/src/Tensor/TensorBroadcasting.h diff --git a/unsupported/Eigen/CXX11/src/Tensor/TensorChipping.h b/unsupported/Eigen/src/Tensor/TensorChipping.h similarity index 100% rename from unsupported/Eigen/CXX11/src/Tensor/TensorChipping.h rename to unsupported/Eigen/src/Tensor/TensorChipping.h diff --git a/unsupported/Eigen/CXX11/src/Tensor/TensorConcatenation.h b/unsupported/Eigen/src/Tensor/TensorConcatenation.h similarity index 100% rename from unsupported/Eigen/CXX11/src/Tensor/TensorConcatenation.h rename to unsupported/Eigen/src/Tensor/TensorConcatenation.h diff --git a/unsupported/Eigen/CXX11/src/Tensor/TensorContraction.h b/unsupported/Eigen/src/Tensor/TensorContraction.h similarity index 99% rename from unsupported/Eigen/CXX11/src/Tensor/TensorContraction.h rename to unsupported/Eigen/src/Tensor/TensorContraction.h index c58a1c6d0..fd1a21419 100644 --- a/unsupported/Eigen/CXX11/src/Tensor/TensorContraction.h +++ b/unsupported/Eigen/src/Tensor/TensorContraction.h @@ -228,6 +228,7 @@ struct TensorContractionKernel { const StorageIndex depth, const StorageIndex cols, const ResScalar alpha, const ResScalar beta) { // Default GEBP kernel does not support beta. + EIGEN_ONLY_USED_FOR_DEBUG(beta); eigen_assert(beta == ResScalar(1)); static const int kComputeStrideFromBlockDimensions = -1; GebpKernel()(output_mapper, lhsBlock, rhsBlock, rows, depth, cols, alpha, diff --git a/unsupported/Eigen/CXX11/src/Tensor/TensorContractionBlocking.h b/unsupported/Eigen/src/Tensor/TensorContractionBlocking.h similarity index 100% rename from unsupported/Eigen/CXX11/src/Tensor/TensorContractionBlocking.h rename to unsupported/Eigen/src/Tensor/TensorContractionBlocking.h diff --git a/unsupported/Eigen/src/Tensor/TensorContractionCuda.h b/unsupported/Eigen/src/Tensor/TensorContractionCuda.h new file mode 100644 index 000000000..54415af8b --- /dev/null +++ b/unsupported/Eigen/src/Tensor/TensorContractionCuda.h @@ -0,0 +1,7 @@ + +#if defined(__clang__) || defined(__GNUC__) +#warning \ + "Deprecated header file, please either include the main unsupported/Eigen/Tensor header or the respective TensorContractionGpu.h file" +#endif + +#include "TensorContractionGpu.h" diff --git a/unsupported/Eigen/CXX11/src/Tensor/TensorContractionGpu.h b/unsupported/Eigen/src/Tensor/TensorContractionGpu.h similarity index 100% rename from unsupported/Eigen/CXX11/src/Tensor/TensorContractionGpu.h rename to unsupported/Eigen/src/Tensor/TensorContractionGpu.h diff --git a/unsupported/Eigen/CXX11/src/Tensor/TensorContractionMapper.h b/unsupported/Eigen/src/Tensor/TensorContractionMapper.h similarity index 100% rename from unsupported/Eigen/CXX11/src/Tensor/TensorContractionMapper.h rename to unsupported/Eigen/src/Tensor/TensorContractionMapper.h diff --git a/unsupported/Eigen/CXX11/src/Tensor/TensorContractionSycl.h b/unsupported/Eigen/src/Tensor/TensorContractionSycl.h similarity index 100% rename from unsupported/Eigen/CXX11/src/Tensor/TensorContractionSycl.h rename to unsupported/Eigen/src/Tensor/TensorContractionSycl.h diff --git a/unsupported/Eigen/CXX11/src/Tensor/TensorContractionThreadPool.h b/unsupported/Eigen/src/Tensor/TensorContractionThreadPool.h similarity index 100% rename from unsupported/Eigen/CXX11/src/Tensor/TensorContractionThreadPool.h rename to unsupported/Eigen/src/Tensor/TensorContractionThreadPool.h diff --git a/unsupported/Eigen/CXX11/src/Tensor/TensorConversion.h b/unsupported/Eigen/src/Tensor/TensorConversion.h similarity index 100% rename from unsupported/Eigen/CXX11/src/Tensor/TensorConversion.h rename to unsupported/Eigen/src/Tensor/TensorConversion.h diff --git a/unsupported/Eigen/CXX11/src/Tensor/TensorConvolution.h b/unsupported/Eigen/src/Tensor/TensorConvolution.h similarity index 100% rename from unsupported/Eigen/CXX11/src/Tensor/TensorConvolution.h rename to unsupported/Eigen/src/Tensor/TensorConvolution.h diff --git a/unsupported/Eigen/CXX11/src/Tensor/TensorConvolutionSycl.h b/unsupported/Eigen/src/Tensor/TensorConvolutionSycl.h similarity index 100% rename from unsupported/Eigen/CXX11/src/Tensor/TensorConvolutionSycl.h rename to unsupported/Eigen/src/Tensor/TensorConvolutionSycl.h diff --git a/unsupported/Eigen/CXX11/src/Tensor/TensorCostModel.h b/unsupported/Eigen/src/Tensor/TensorCostModel.h similarity index 100% rename from unsupported/Eigen/CXX11/src/Tensor/TensorCostModel.h rename to unsupported/Eigen/src/Tensor/TensorCostModel.h diff --git a/unsupported/Eigen/CXX11/src/Tensor/TensorCustomOp.h b/unsupported/Eigen/src/Tensor/TensorCustomOp.h similarity index 100% rename from unsupported/Eigen/CXX11/src/Tensor/TensorCustomOp.h rename to unsupported/Eigen/src/Tensor/TensorCustomOp.h diff --git a/unsupported/Eigen/CXX11/src/Tensor/TensorDevice.h b/unsupported/Eigen/src/Tensor/TensorDevice.h similarity index 100% rename from unsupported/Eigen/CXX11/src/Tensor/TensorDevice.h rename to unsupported/Eigen/src/Tensor/TensorDevice.h diff --git a/unsupported/Eigen/src/Tensor/TensorDeviceCuda.h b/unsupported/Eigen/src/Tensor/TensorDeviceCuda.h new file mode 100644 index 000000000..bad80345f --- /dev/null +++ b/unsupported/Eigen/src/Tensor/TensorDeviceCuda.h @@ -0,0 +1,7 @@ + +#if defined(__clang__) || defined(__GNUC__) +#warning \ + "Deprecated header file, please either include the main unsupported/Eigen/Tensor header or the respective TensorDeviceGpu.h file" +#endif + +#include "TensorDeviceGpu.h" diff --git a/unsupported/Eigen/CXX11/src/Tensor/TensorDeviceDefault.h b/unsupported/Eigen/src/Tensor/TensorDeviceDefault.h similarity index 100% rename from unsupported/Eigen/CXX11/src/Tensor/TensorDeviceDefault.h rename to unsupported/Eigen/src/Tensor/TensorDeviceDefault.h diff --git a/unsupported/Eigen/CXX11/src/Tensor/TensorDeviceGpu.h b/unsupported/Eigen/src/Tensor/TensorDeviceGpu.h similarity index 100% rename from unsupported/Eigen/CXX11/src/Tensor/TensorDeviceGpu.h rename to unsupported/Eigen/src/Tensor/TensorDeviceGpu.h diff --git a/unsupported/Eigen/CXX11/src/Tensor/TensorDeviceSycl.h b/unsupported/Eigen/src/Tensor/TensorDeviceSycl.h similarity index 100% rename from unsupported/Eigen/CXX11/src/Tensor/TensorDeviceSycl.h rename to unsupported/Eigen/src/Tensor/TensorDeviceSycl.h diff --git a/unsupported/Eigen/CXX11/src/Tensor/TensorDeviceThreadPool.h b/unsupported/Eigen/src/Tensor/TensorDeviceThreadPool.h similarity index 100% rename from unsupported/Eigen/CXX11/src/Tensor/TensorDeviceThreadPool.h rename to unsupported/Eigen/src/Tensor/TensorDeviceThreadPool.h diff --git a/unsupported/Eigen/CXX11/src/Tensor/TensorDimensionList.h b/unsupported/Eigen/src/Tensor/TensorDimensionList.h similarity index 100% rename from unsupported/Eigen/CXX11/src/Tensor/TensorDimensionList.h rename to unsupported/Eigen/src/Tensor/TensorDimensionList.h diff --git a/unsupported/Eigen/CXX11/src/Tensor/TensorDimensions.h b/unsupported/Eigen/src/Tensor/TensorDimensions.h similarity index 100% rename from unsupported/Eigen/CXX11/src/Tensor/TensorDimensions.h rename to unsupported/Eigen/src/Tensor/TensorDimensions.h diff --git a/unsupported/Eigen/CXX11/src/Tensor/TensorEvalTo.h b/unsupported/Eigen/src/Tensor/TensorEvalTo.h similarity index 100% rename from unsupported/Eigen/CXX11/src/Tensor/TensorEvalTo.h rename to unsupported/Eigen/src/Tensor/TensorEvalTo.h diff --git a/unsupported/Eigen/CXX11/src/Tensor/TensorEvaluator.h b/unsupported/Eigen/src/Tensor/TensorEvaluator.h similarity index 100% rename from unsupported/Eigen/CXX11/src/Tensor/TensorEvaluator.h rename to unsupported/Eigen/src/Tensor/TensorEvaluator.h diff --git a/unsupported/Eigen/CXX11/src/Tensor/TensorExecutor.h b/unsupported/Eigen/src/Tensor/TensorExecutor.h similarity index 99% rename from unsupported/Eigen/CXX11/src/Tensor/TensorExecutor.h rename to unsupported/Eigen/src/Tensor/TensorExecutor.h index 4a175fdec..8026dec86 100644 --- a/unsupported/Eigen/CXX11/src/Tensor/TensorExecutor.h +++ b/unsupported/Eigen/src/Tensor/TensorExecutor.h @@ -77,7 +77,7 @@ class TensorExecutor { public: typedef typename Expression::Index StorageIndex; - // Including `unsupported/Eigen/CXX11/Tensor` in different translation units + // Including `unsupported/Eigen/Tensor` in different translation units // with/without `EIGEN_USE_THREADS` or `EIGEN_USE_GPU` is a potential ODR // violation. If this template is instantiated with a non-default device, it // means that this header file was included without defining diff --git a/unsupported/Eigen/CXX11/src/Tensor/TensorExpr.h b/unsupported/Eigen/src/Tensor/TensorExpr.h similarity index 100% rename from unsupported/Eigen/CXX11/src/Tensor/TensorExpr.h rename to unsupported/Eigen/src/Tensor/TensorExpr.h diff --git a/unsupported/Eigen/CXX11/src/Tensor/TensorFFT.h b/unsupported/Eigen/src/Tensor/TensorFFT.h similarity index 100% rename from unsupported/Eigen/CXX11/src/Tensor/TensorFFT.h rename to unsupported/Eigen/src/Tensor/TensorFFT.h diff --git a/unsupported/Eigen/CXX11/src/Tensor/TensorFixedSize.h b/unsupported/Eigen/src/Tensor/TensorFixedSize.h similarity index 100% rename from unsupported/Eigen/CXX11/src/Tensor/TensorFixedSize.h rename to unsupported/Eigen/src/Tensor/TensorFixedSize.h diff --git a/unsupported/Eigen/CXX11/src/Tensor/TensorForcedEval.h b/unsupported/Eigen/src/Tensor/TensorForcedEval.h similarity index 100% rename from unsupported/Eigen/CXX11/src/Tensor/TensorForcedEval.h rename to unsupported/Eigen/src/Tensor/TensorForcedEval.h diff --git a/unsupported/Eigen/CXX11/src/Tensor/TensorForwardDeclarations.h b/unsupported/Eigen/src/Tensor/TensorForwardDeclarations.h similarity index 100% rename from unsupported/Eigen/CXX11/src/Tensor/TensorForwardDeclarations.h rename to unsupported/Eigen/src/Tensor/TensorForwardDeclarations.h diff --git a/unsupported/Eigen/CXX11/src/Tensor/TensorFunctors.h b/unsupported/Eigen/src/Tensor/TensorFunctors.h similarity index 100% rename from unsupported/Eigen/CXX11/src/Tensor/TensorFunctors.h rename to unsupported/Eigen/src/Tensor/TensorFunctors.h diff --git a/unsupported/Eigen/CXX11/src/Tensor/TensorGenerator.h b/unsupported/Eigen/src/Tensor/TensorGenerator.h similarity index 100% rename from unsupported/Eigen/CXX11/src/Tensor/TensorGenerator.h rename to unsupported/Eigen/src/Tensor/TensorGenerator.h diff --git a/unsupported/Eigen/CXX11/src/Tensor/TensorGlobalFunctions.h b/unsupported/Eigen/src/Tensor/TensorGlobalFunctions.h similarity index 100% rename from unsupported/Eigen/CXX11/src/Tensor/TensorGlobalFunctions.h rename to unsupported/Eigen/src/Tensor/TensorGlobalFunctions.h diff --git a/unsupported/Eigen/CXX11/src/Tensor/TensorIO.h b/unsupported/Eigen/src/Tensor/TensorIO.h similarity index 100% rename from unsupported/Eigen/CXX11/src/Tensor/TensorIO.h rename to unsupported/Eigen/src/Tensor/TensorIO.h diff --git a/unsupported/Eigen/CXX11/src/Tensor/TensorImagePatch.h b/unsupported/Eigen/src/Tensor/TensorImagePatch.h similarity index 100% rename from unsupported/Eigen/CXX11/src/Tensor/TensorImagePatch.h rename to unsupported/Eigen/src/Tensor/TensorImagePatch.h diff --git a/unsupported/Eigen/CXX11/src/Tensor/TensorIndexList.h b/unsupported/Eigen/src/Tensor/TensorIndexList.h similarity index 99% rename from unsupported/Eigen/CXX11/src/Tensor/TensorIndexList.h rename to unsupported/Eigen/src/Tensor/TensorIndexList.h index 1071cf323..d244b50a5 100644 --- a/unsupported/Eigen/CXX11/src/Tensor/TensorIndexList.h +++ b/unsupported/Eigen/src/Tensor/TensorIndexList.h @@ -19,7 +19,10 @@ template struct type2index { static constexpr Index value = n; EIGEN_DEVICE_FUNC constexpr operator Index() const { return n; } - EIGEN_DEVICE_FUNC void set(Index val) { eigen_assert(val == n); } + EIGEN_DEVICE_FUNC void set(Index val) { + EIGEN_ONLY_USED_FOR_DEBUG(val); + eigen_assert(val == n); + } }; // This can be used with IndexPairList to get compile-time constant pairs, @@ -32,6 +35,7 @@ struct type2indexpair { constexpr EIGEN_DEVICE_FUNC operator IndexPair() const { return IndexPair(f, s); } EIGEN_DEVICE_FUNC void set(const IndexPair& val) { + EIGEN_ONLY_USED_FOR_DEBUG(val); eigen_assert(val.first == f); eigen_assert(val.second == s); } @@ -225,6 +229,7 @@ struct tuple_coeff<0, ValueT> { } template EIGEN_DEVICE_FUNC static void set(const Index i, IndexTuple& t, const ValueT value) { + EIGEN_ONLY_USED_FOR_DEBUG(i); eigen_assert(i == 0); update_value(array_get<0>(t), value); } diff --git a/unsupported/Eigen/CXX11/src/Tensor/TensorInflation.h b/unsupported/Eigen/src/Tensor/TensorInflation.h similarity index 100% rename from unsupported/Eigen/CXX11/src/Tensor/TensorInflation.h rename to unsupported/Eigen/src/Tensor/TensorInflation.h diff --git a/unsupported/Eigen/CXX11/src/Tensor/TensorInitializer.h b/unsupported/Eigen/src/Tensor/TensorInitializer.h similarity index 100% rename from unsupported/Eigen/CXX11/src/Tensor/TensorInitializer.h rename to unsupported/Eigen/src/Tensor/TensorInitializer.h diff --git a/unsupported/Eigen/CXX11/src/Tensor/TensorIntDiv.h b/unsupported/Eigen/src/Tensor/TensorIntDiv.h similarity index 100% rename from unsupported/Eigen/CXX11/src/Tensor/TensorIntDiv.h rename to unsupported/Eigen/src/Tensor/TensorIntDiv.h diff --git a/unsupported/Eigen/CXX11/src/Tensor/TensorLayoutSwap.h b/unsupported/Eigen/src/Tensor/TensorLayoutSwap.h similarity index 100% rename from unsupported/Eigen/CXX11/src/Tensor/TensorLayoutSwap.h rename to unsupported/Eigen/src/Tensor/TensorLayoutSwap.h diff --git a/unsupported/Eigen/CXX11/src/Tensor/TensorMacros.h b/unsupported/Eigen/src/Tensor/TensorMacros.h similarity index 100% rename from unsupported/Eigen/CXX11/src/Tensor/TensorMacros.h rename to unsupported/Eigen/src/Tensor/TensorMacros.h diff --git a/unsupported/Eigen/CXX11/src/Tensor/TensorMap.h b/unsupported/Eigen/src/Tensor/TensorMap.h similarity index 100% rename from unsupported/Eigen/CXX11/src/Tensor/TensorMap.h rename to unsupported/Eigen/src/Tensor/TensorMap.h diff --git a/unsupported/Eigen/CXX11/src/Tensor/TensorMeta.h b/unsupported/Eigen/src/Tensor/TensorMeta.h similarity index 100% rename from unsupported/Eigen/CXX11/src/Tensor/TensorMeta.h rename to unsupported/Eigen/src/Tensor/TensorMeta.h diff --git a/unsupported/Eigen/CXX11/src/Tensor/TensorMorphing.h b/unsupported/Eigen/src/Tensor/TensorMorphing.h similarity index 100% rename from unsupported/Eigen/CXX11/src/Tensor/TensorMorphing.h rename to unsupported/Eigen/src/Tensor/TensorMorphing.h diff --git a/unsupported/Eigen/CXX11/src/Tensor/TensorPadding.h b/unsupported/Eigen/src/Tensor/TensorPadding.h similarity index 100% rename from unsupported/Eigen/CXX11/src/Tensor/TensorPadding.h rename to unsupported/Eigen/src/Tensor/TensorPadding.h diff --git a/unsupported/Eigen/CXX11/src/Tensor/TensorPatch.h b/unsupported/Eigen/src/Tensor/TensorPatch.h similarity index 100% rename from unsupported/Eigen/CXX11/src/Tensor/TensorPatch.h rename to unsupported/Eigen/src/Tensor/TensorPatch.h diff --git a/unsupported/Eigen/CXX11/src/Tensor/TensorRandom.h b/unsupported/Eigen/src/Tensor/TensorRandom.h similarity index 100% rename from unsupported/Eigen/CXX11/src/Tensor/TensorRandom.h rename to unsupported/Eigen/src/Tensor/TensorRandom.h diff --git a/unsupported/Eigen/CXX11/src/Tensor/TensorReduction.h b/unsupported/Eigen/src/Tensor/TensorReduction.h similarity index 100% rename from unsupported/Eigen/CXX11/src/Tensor/TensorReduction.h rename to unsupported/Eigen/src/Tensor/TensorReduction.h diff --git a/unsupported/Eigen/CXX11/src/Tensor/TensorReductionGpu.h b/unsupported/Eigen/src/Tensor/TensorReductionGpu.h similarity index 100% rename from unsupported/Eigen/CXX11/src/Tensor/TensorReductionGpu.h rename to unsupported/Eigen/src/Tensor/TensorReductionGpu.h diff --git a/unsupported/Eigen/CXX11/src/Tensor/TensorReductionSycl.h b/unsupported/Eigen/src/Tensor/TensorReductionSycl.h similarity index 100% rename from unsupported/Eigen/CXX11/src/Tensor/TensorReductionSycl.h rename to unsupported/Eigen/src/Tensor/TensorReductionSycl.h diff --git a/unsupported/Eigen/CXX11/src/Tensor/TensorRef.h b/unsupported/Eigen/src/Tensor/TensorRef.h similarity index 100% rename from unsupported/Eigen/CXX11/src/Tensor/TensorRef.h rename to unsupported/Eigen/src/Tensor/TensorRef.h diff --git a/unsupported/Eigen/CXX11/src/Tensor/TensorReverse.h b/unsupported/Eigen/src/Tensor/TensorReverse.h similarity index 100% rename from unsupported/Eigen/CXX11/src/Tensor/TensorReverse.h rename to unsupported/Eigen/src/Tensor/TensorReverse.h diff --git a/unsupported/Eigen/CXX11/src/Tensor/TensorRoll.h b/unsupported/Eigen/src/Tensor/TensorRoll.h similarity index 100% rename from unsupported/Eigen/CXX11/src/Tensor/TensorRoll.h rename to unsupported/Eigen/src/Tensor/TensorRoll.h diff --git a/unsupported/Eigen/CXX11/src/Tensor/TensorScan.h b/unsupported/Eigen/src/Tensor/TensorScan.h similarity index 100% rename from unsupported/Eigen/CXX11/src/Tensor/TensorScan.h rename to unsupported/Eigen/src/Tensor/TensorScan.h diff --git a/unsupported/Eigen/CXX11/src/Tensor/TensorScanSycl.h b/unsupported/Eigen/src/Tensor/TensorScanSycl.h similarity index 100% rename from unsupported/Eigen/CXX11/src/Tensor/TensorScanSycl.h rename to unsupported/Eigen/src/Tensor/TensorScanSycl.h diff --git a/unsupported/Eigen/CXX11/src/Tensor/TensorShuffling.h b/unsupported/Eigen/src/Tensor/TensorShuffling.h similarity index 100% rename from unsupported/Eigen/CXX11/src/Tensor/TensorShuffling.h rename to unsupported/Eigen/src/Tensor/TensorShuffling.h diff --git a/unsupported/Eigen/CXX11/src/Tensor/TensorStorage.h b/unsupported/Eigen/src/Tensor/TensorStorage.h similarity index 100% rename from unsupported/Eigen/CXX11/src/Tensor/TensorStorage.h rename to unsupported/Eigen/src/Tensor/TensorStorage.h diff --git a/unsupported/Eigen/CXX11/src/Tensor/TensorStriding.h b/unsupported/Eigen/src/Tensor/TensorStriding.h similarity index 100% rename from unsupported/Eigen/CXX11/src/Tensor/TensorStriding.h rename to unsupported/Eigen/src/Tensor/TensorStriding.h diff --git a/unsupported/Eigen/CXX11/src/Tensor/TensorTrace.h b/unsupported/Eigen/src/Tensor/TensorTrace.h similarity index 100% rename from unsupported/Eigen/CXX11/src/Tensor/TensorTrace.h rename to unsupported/Eigen/src/Tensor/TensorTrace.h diff --git a/unsupported/Eigen/CXX11/src/Tensor/TensorTraits.h b/unsupported/Eigen/src/Tensor/TensorTraits.h similarity index 100% rename from unsupported/Eigen/CXX11/src/Tensor/TensorTraits.h rename to unsupported/Eigen/src/Tensor/TensorTraits.h diff --git a/unsupported/Eigen/CXX11/src/Tensor/TensorUInt128.h b/unsupported/Eigen/src/Tensor/TensorUInt128.h similarity index 100% rename from unsupported/Eigen/CXX11/src/Tensor/TensorUInt128.h rename to unsupported/Eigen/src/Tensor/TensorUInt128.h diff --git a/unsupported/Eigen/CXX11/src/Tensor/TensorVolumePatch.h b/unsupported/Eigen/src/Tensor/TensorVolumePatch.h similarity index 100% rename from unsupported/Eigen/CXX11/src/Tensor/TensorVolumePatch.h rename to unsupported/Eigen/src/Tensor/TensorVolumePatch.h diff --git a/unsupported/Eigen/CXX11/src/TensorSymmetry/DynamicSymmetry.h b/unsupported/Eigen/src/TensorSymmetry/DynamicSymmetry.h similarity index 98% rename from unsupported/Eigen/CXX11/src/TensorSymmetry/DynamicSymmetry.h rename to unsupported/Eigen/src/TensorSymmetry/DynamicSymmetry.h index ae5c4f4c4..3d50bc05d 100644 --- a/unsupported/Eigen/CXX11/src/TensorSymmetry/DynamicSymmetry.h +++ b/unsupported/Eigen/src/TensorSymmetry/DynamicSymmetry.h @@ -211,7 +211,7 @@ inline void DynamicSGroup::add(int one, int two, int flags) { std::size_t newNumIndices = (one > two) ? one : two + 1; for (auto& gelem : m_elements) { gelem.representation.reserve(newNumIndices); - for (std::size_t i = m_numIndices; i < newNumIndices; i++) gelem.representation.push_back(i); + for (std::size_t i = m_numIndices; i < newNumIndices; i++) gelem.representation.push_back(static_cast(i)); } m_numIndices = newNumIndices; } @@ -246,8 +246,8 @@ inline void DynamicSGroup::add(int one, int two, int flags) { std::size_t coset_rep = coset_order; do { - for (auto g : m_generators) { - e = mul(m_elements[coset_rep], g); + for (auto gen : m_generators) { + e = mul(m_elements[coset_rep], gen); p = findElement(e); if (p < 0) { // element not yet in group diff --git a/unsupported/Eigen/src/TensorSymmetry/InternalHeaderCheck.h b/unsupported/Eigen/src/TensorSymmetry/InternalHeaderCheck.h new file mode 100644 index 000000000..c7f59923b --- /dev/null +++ b/unsupported/Eigen/src/TensorSymmetry/InternalHeaderCheck.h @@ -0,0 +1,3 @@ +#ifndef EIGEN_CXX11_TENSORSYMMETRY_MODULE_H +#error "Please include unsupported/Eigen/TensorSymmetry instead of including headers inside the src directory directly." +#endif diff --git a/unsupported/Eigen/CXX11/src/TensorSymmetry/StaticSymmetry.h b/unsupported/Eigen/src/TensorSymmetry/StaticSymmetry.h similarity index 100% rename from unsupported/Eigen/CXX11/src/TensorSymmetry/StaticSymmetry.h rename to unsupported/Eigen/src/TensorSymmetry/StaticSymmetry.h diff --git a/unsupported/Eigen/CXX11/src/TensorSymmetry/Symmetry.h b/unsupported/Eigen/src/TensorSymmetry/Symmetry.h similarity index 100% rename from unsupported/Eigen/CXX11/src/TensorSymmetry/Symmetry.h rename to unsupported/Eigen/src/TensorSymmetry/Symmetry.h diff --git a/unsupported/Eigen/CXX11/src/TensorSymmetry/util/TemplateGroupTheory.h b/unsupported/Eigen/src/TensorSymmetry/util/TemplateGroupTheory.h similarity index 100% rename from unsupported/Eigen/CXX11/src/TensorSymmetry/util/TemplateGroupTheory.h rename to unsupported/Eigen/src/TensorSymmetry/util/TemplateGroupTheory.h diff --git a/unsupported/Eigen/CXX11/src/util/CXX11Meta.h b/unsupported/Eigen/src/TensorUtil/CXX11Meta.h similarity index 88% rename from unsupported/Eigen/CXX11/src/util/CXX11Meta.h rename to unsupported/Eigen/src/TensorUtil/CXX11Meta.h index 74b47ce1a..f836cd1c1 100644 --- a/unsupported/Eigen/CXX11/src/util/CXX11Meta.h +++ b/unsupported/Eigen/src/TensorUtil/CXX11Meta.h @@ -11,7 +11,7 @@ #define EIGEN_CXX11META_H #include -#include "../../../../../Eigen/src/Core/util/EmulateArray.h" +#include "../../../../Eigen/src/Core/util/EmulateArray.h" #include "CXX11Workarounds.h" diff --git a/unsupported/Eigen/CXX11/src/util/CXX11Workarounds.h b/unsupported/Eigen/src/TensorUtil/CXX11Workarounds.h similarity index 100% rename from unsupported/Eigen/CXX11/src/util/CXX11Workarounds.h rename to unsupported/Eigen/src/TensorUtil/CXX11Workarounds.h diff --git a/unsupported/doc/examples/SYCL/CwiseMul.cpp b/unsupported/doc/examples/SYCL/CwiseMul.cpp index eac5b4670..0297998ac 100644 --- a/unsupported/doc/examples/SYCL/CwiseMul.cpp +++ b/unsupported/doc/examples/SYCL/CwiseMul.cpp @@ -1,6 +1,6 @@ #include #define EIGEN_USE_SYCL -#include +#include using Eigen::array; using Eigen::SyclDevice; diff --git a/unsupported/test/cxx11_tensor_argmax.cpp b/unsupported/test/cxx11_tensor_argmax.cpp index b86d84cb9..1bf506496 100644 --- a/unsupported/test/cxx11_tensor_argmax.cpp +++ b/unsupported/test/cxx11_tensor_argmax.cpp @@ -10,7 +10,7 @@ #include "main.h" -#include +#include using Eigen::array; using Eigen::Pair; diff --git a/unsupported/test/cxx11_tensor_argmax_gpu.cu b/unsupported/test/cxx11_tensor_argmax_gpu.cu index 90c94c56d..3be20d43c 100644 --- a/unsupported/test/cxx11_tensor_argmax_gpu.cu +++ b/unsupported/test/cxx11_tensor_argmax_gpu.cu @@ -12,7 +12,7 @@ #define EIGEN_USE_GPU #include "main.h" -#include +#include using Eigen::Tensor; diff --git a/unsupported/test/cxx11_tensor_argmax_sycl.cpp b/unsupported/test/cxx11_tensor_argmax_sycl.cpp index 8f4e09573..c49ceac4d 100644 --- a/unsupported/test/cxx11_tensor_argmax_sycl.cpp +++ b/unsupported/test/cxx11_tensor_argmax_sycl.cpp @@ -19,7 +19,7 @@ #include "main.h" -#include +#include using Eigen::array; using Eigen::SyclDevice; diff --git a/unsupported/test/cxx11_tensor_assign.cpp b/unsupported/test/cxx11_tensor_assign.cpp index 993249d9a..47b6361d9 100644 --- a/unsupported/test/cxx11_tensor_assign.cpp +++ b/unsupported/test/cxx11_tensor_assign.cpp @@ -9,7 +9,7 @@ #include "main.h" -#include +#include using Eigen::RowMajor; using Eigen::Tensor; diff --git a/unsupported/test/cxx11_tensor_block_access.cpp b/unsupported/test/cxx11_tensor_block_access.cpp index 7c5203d36..8dbe4fd4e 100644 --- a/unsupported/test/cxx11_tensor_block_access.cpp +++ b/unsupported/test/cxx11_tensor_block_access.cpp @@ -13,7 +13,7 @@ #include #include -#include +#include using Eigen::ColMajor; using Eigen::Index; diff --git a/unsupported/test/cxx11_tensor_block_eval.cpp b/unsupported/test/cxx11_tensor_block_eval.cpp index 75e2b8cbe..0567b3c61 100644 --- a/unsupported/test/cxx11_tensor_block_eval.cpp +++ b/unsupported/test/cxx11_tensor_block_eval.cpp @@ -7,7 +7,7 @@ // clang-format off #include "main.h" -#include +#include // clang-format on using Eigen::internal::TensorBlockDescriptor; diff --git a/unsupported/test/cxx11_tensor_block_io.cpp b/unsupported/test/cxx11_tensor_block_io.cpp index 509c10e50..dbc999f2b 100644 --- a/unsupported/test/cxx11_tensor_block_io.cpp +++ b/unsupported/test/cxx11_tensor_block_io.cpp @@ -7,7 +7,7 @@ // clang-format off #include "main.h" -#include +#include // clang-format on // -------------------------------------------------------------------------- // diff --git a/unsupported/test/cxx11_tensor_broadcast_sycl.cpp b/unsupported/test/cxx11_tensor_broadcast_sycl.cpp index d25556872..a8c6c9729 100644 --- a/unsupported/test/cxx11_tensor_broadcast_sycl.cpp +++ b/unsupported/test/cxx11_tensor_broadcast_sycl.cpp @@ -18,7 +18,7 @@ #define EIGEN_USE_SYCL #include "main.h" -#include +#include using Eigen::array; using Eigen::SyclDevice; diff --git a/unsupported/test/cxx11_tensor_broadcasting.cpp b/unsupported/test/cxx11_tensor_broadcasting.cpp index 6f43d6a0c..0fa29a716 100644 --- a/unsupported/test/cxx11_tensor_broadcasting.cpp +++ b/unsupported/test/cxx11_tensor_broadcasting.cpp @@ -9,7 +9,7 @@ #include "main.h" -#include +#include using Eigen::Tensor; diff --git a/unsupported/test/cxx11_tensor_builtins_sycl.cpp b/unsupported/test/cxx11_tensor_builtins_sycl.cpp index c8e0a6dfc..1449bdc08 100644 --- a/unsupported/test/cxx11_tensor_builtins_sycl.cpp +++ b/unsupported/test/cxx11_tensor_builtins_sycl.cpp @@ -18,7 +18,7 @@ #define EIGEN_USE_SYCL #include "main.h" -#include +#include using Eigen::array; using Eigen::SyclDevice; diff --git a/unsupported/test/cxx11_tensor_cast_float16_gpu.cu b/unsupported/test/cxx11_tensor_cast_float16_gpu.cu index ce5c4c3b8..202875105 100644 --- a/unsupported/test/cxx11_tensor_cast_float16_gpu.cu +++ b/unsupported/test/cxx11_tensor_cast_float16_gpu.cu @@ -14,7 +14,7 @@ #define EIGEN_USE_GPU #include "main.h" -#include +#include using Eigen::Tensor; diff --git a/unsupported/test/cxx11_tensor_casts.cpp b/unsupported/test/cxx11_tensor_casts.cpp index 9cd377c77..4b8e67e49 100644 --- a/unsupported/test/cxx11_tensor_casts.cpp +++ b/unsupported/test/cxx11_tensor_casts.cpp @@ -10,7 +10,7 @@ #include "main.h" #include "random_without_cast_overflow.h" -#include +#include using Eigen::array; using Eigen::Tensor; diff --git a/unsupported/test/cxx11_tensor_chipping.cpp b/unsupported/test/cxx11_tensor_chipping.cpp index dbbd89dd1..b06b29761 100644 --- a/unsupported/test/cxx11_tensor_chipping.cpp +++ b/unsupported/test/cxx11_tensor_chipping.cpp @@ -9,7 +9,7 @@ #include "main.h" -#include +#include using Eigen::Tensor; diff --git a/unsupported/test/cxx11_tensor_chipping_sycl.cpp b/unsupported/test/cxx11_tensor_chipping_sycl.cpp index cab0ae871..eb50e15f8 100644 --- a/unsupported/test/cxx11_tensor_chipping_sycl.cpp +++ b/unsupported/test/cxx11_tensor_chipping_sycl.cpp @@ -20,7 +20,7 @@ #include "main.h" -#include +#include using Eigen::Tensor; diff --git a/unsupported/test/cxx11_tensor_comparisons.cpp b/unsupported/test/cxx11_tensor_comparisons.cpp index 17a177607..1ef117906 100644 --- a/unsupported/test/cxx11_tensor_comparisons.cpp +++ b/unsupported/test/cxx11_tensor_comparisons.cpp @@ -9,7 +9,7 @@ #include "main.h" -#include +#include using Eigen::RowMajor; using Eigen::Tensor; diff --git a/unsupported/test/cxx11_tensor_complex_cwise_ops_gpu.cu b/unsupported/test/cxx11_tensor_complex_cwise_ops_gpu.cu index 6daa0a79f..954bf8dc1 100644 --- a/unsupported/test/cxx11_tensor_complex_cwise_ops_gpu.cu +++ b/unsupported/test/cxx11_tensor_complex_cwise_ops_gpu.cu @@ -12,7 +12,7 @@ #define EIGEN_USE_GPU #include "main.h" -#include +#include using Eigen::Tensor; diff --git a/unsupported/test/cxx11_tensor_complex_gpu.cu b/unsupported/test/cxx11_tensor_complex_gpu.cu index 12f11e099..777814e1d 100644 --- a/unsupported/test/cxx11_tensor_complex_gpu.cu +++ b/unsupported/test/cxx11_tensor_complex_gpu.cu @@ -12,7 +12,7 @@ #define EIGEN_USE_GPU #include "main.h" -#include +#include using Eigen::Tensor; diff --git a/unsupported/test/cxx11_tensor_concatenation.cpp b/unsupported/test/cxx11_tensor_concatenation.cpp index 562ac779b..cc0a1600b 100644 --- a/unsupported/test/cxx11_tensor_concatenation.cpp +++ b/unsupported/test/cxx11_tensor_concatenation.cpp @@ -9,7 +9,7 @@ #include "main.h" -#include +#include using Eigen::Tensor; diff --git a/unsupported/test/cxx11_tensor_concatenation_sycl.cpp b/unsupported/test/cxx11_tensor_concatenation_sycl.cpp index fccf165b4..42fb4facd 100644 --- a/unsupported/test/cxx11_tensor_concatenation_sycl.cpp +++ b/unsupported/test/cxx11_tensor_concatenation_sycl.cpp @@ -18,7 +18,7 @@ #define EIGEN_USE_SYCL #include "main.h" -#include +#include using Eigen::Tensor; diff --git a/unsupported/test/cxx11_tensor_const.cpp b/unsupported/test/cxx11_tensor_const.cpp index 78a6506ca..660641739 100644 --- a/unsupported/test/cxx11_tensor_const.cpp +++ b/unsupported/test/cxx11_tensor_const.cpp @@ -9,7 +9,7 @@ #include "main.h" -#include +#include using Eigen::Tensor; static void test_simple_assign() { diff --git a/unsupported/test/cxx11_tensor_contract_gpu.cu b/unsupported/test/cxx11_tensor_contract_gpu.cu index a41a2df46..25d2fb6d8 100644 --- a/unsupported/test/cxx11_tensor_contract_gpu.cu +++ b/unsupported/test/cxx11_tensor_contract_gpu.cu @@ -15,7 +15,7 @@ #define EIGEN_USE_GPU #include "main.h" -#include +#include using Eigen::Tensor; typedef Tensor::DimensionPair DimPair; diff --git a/unsupported/test/cxx11_tensor_contract_sycl.cpp b/unsupported/test/cxx11_tensor_contract_sycl.cpp index 120681b6a..c8194e126 100644 --- a/unsupported/test/cxx11_tensor_contract_sycl.cpp +++ b/unsupported/test/cxx11_tensor_contract_sycl.cpp @@ -24,7 +24,7 @@ #include "main.h" -#include +#include using Eigen::array; using Eigen::SyclDevice; diff --git a/unsupported/test/cxx11_tensor_contraction.cpp b/unsupported/test/cxx11_tensor_contraction.cpp index 2949c14b0..c9fabce0e 100644 --- a/unsupported/test/cxx11_tensor_contraction.cpp +++ b/unsupported/test/cxx11_tensor_contraction.cpp @@ -9,7 +9,7 @@ #include "main.h" -#include +#include using Eigen::DefaultDevice; using Eigen::Tensor; diff --git a/unsupported/test/cxx11_tensor_convolution.cpp b/unsupported/test/cxx11_tensor_convolution.cpp index c9218655f..c7952c25d 100644 --- a/unsupported/test/cxx11_tensor_convolution.cpp +++ b/unsupported/test/cxx11_tensor_convolution.cpp @@ -9,7 +9,7 @@ #include "main.h" -#include +#include using Eigen::DefaultDevice; using Eigen::Tensor; diff --git a/unsupported/test/cxx11_tensor_convolution_sycl.cpp b/unsupported/test/cxx11_tensor_convolution_sycl.cpp index 350ac336e..0d6358c90 100644 --- a/unsupported/test/cxx11_tensor_convolution_sycl.cpp +++ b/unsupported/test/cxx11_tensor_convolution_sycl.cpp @@ -22,7 +22,7 @@ #include #include "main.h" -#include +#include #include using Eigen::array; diff --git a/unsupported/test/cxx11_tensor_custom_index.cpp b/unsupported/test/cxx11_tensor_custom_index.cpp index f15da36b7..0c446dfa2 100644 --- a/unsupported/test/cxx11_tensor_custom_index.cpp +++ b/unsupported/test/cxx11_tensor_custom_index.cpp @@ -12,7 +12,7 @@ #include #include -#include +#include using Eigen::Tensor; diff --git a/unsupported/test/cxx11_tensor_custom_op.cpp b/unsupported/test/cxx11_tensor_custom_op.cpp index 493da48b7..becdc210b 100644 --- a/unsupported/test/cxx11_tensor_custom_op.cpp +++ b/unsupported/test/cxx11_tensor_custom_op.cpp @@ -9,7 +9,7 @@ #include "main.h" -#include +#include using Eigen::Tensor; diff --git a/unsupported/test/cxx11_tensor_custom_op_sycl.cpp b/unsupported/test/cxx11_tensor_custom_op_sycl.cpp index eb9ef6ecb..a29b54a57 100644 --- a/unsupported/test/cxx11_tensor_custom_op_sycl.cpp +++ b/unsupported/test/cxx11_tensor_custom_op_sycl.cpp @@ -18,7 +18,7 @@ #define EIGEN_USE_SYCL #include "main.h" -#include +#include using Eigen::Tensor; template diff --git a/unsupported/test/cxx11_tensor_device.cu b/unsupported/test/cxx11_tensor_device.cu index b4ba23e10..d40530046 100644 --- a/unsupported/test/cxx11_tensor_device.cu +++ b/unsupported/test/cxx11_tensor_device.cu @@ -15,7 +15,7 @@ #include "main.h" #include "OffByOneScalar.h" -#include +#include using Eigen::RowMajor; using Eigen::Tensor; diff --git a/unsupported/test/cxx11_tensor_device_sycl.cpp b/unsupported/test/cxx11_tensor_device_sycl.cpp index d19081540..9640ed4b9 100644 --- a/unsupported/test/cxx11_tensor_device_sycl.cpp +++ b/unsupported/test/cxx11_tensor_device_sycl.cpp @@ -19,7 +19,7 @@ #include "main.h" #include "OffByOneScalar.h" -#include +#include #include #include diff --git a/unsupported/test/cxx11_tensor_dimension.cpp b/unsupported/test/cxx11_tensor_dimension.cpp index 3423a6695..045837394 100644 --- a/unsupported/test/cxx11_tensor_dimension.cpp +++ b/unsupported/test/cxx11_tensor_dimension.cpp @@ -9,7 +9,7 @@ #include "main.h" -#include +#include using Eigen::Tensor; diff --git a/unsupported/test/cxx11_tensor_empty.cpp b/unsupported/test/cxx11_tensor_empty.cpp index c90cf3689..a688b4d7d 100644 --- a/unsupported/test/cxx11_tensor_empty.cpp +++ b/unsupported/test/cxx11_tensor_empty.cpp @@ -9,7 +9,7 @@ #include "main.h" -#include +#include static void test_empty_tensor() { Tensor source; diff --git a/unsupported/test/cxx11_tensor_executor.cpp b/unsupported/test/cxx11_tensor_executor.cpp index 228fa9e08..33748c666 100644 --- a/unsupported/test/cxx11_tensor_executor.cpp +++ b/unsupported/test/cxx11_tensor_executor.cpp @@ -11,7 +11,7 @@ #include "main.h" -#include +#include using Eigen::ColMajor; using Eigen::RowMajor; diff --git a/unsupported/test/cxx11_tensor_expr.cpp b/unsupported/test/cxx11_tensor_expr.cpp index cf0d8ee0d..d29b1dbe7 100644 --- a/unsupported/test/cxx11_tensor_expr.cpp +++ b/unsupported/test/cxx11_tensor_expr.cpp @@ -11,7 +11,7 @@ #include "main.h" -#include +#include using Eigen::RowMajor; using Eigen::Tensor; diff --git a/unsupported/test/cxx11_tensor_fft.cpp b/unsupported/test/cxx11_tensor_fft.cpp index 70bba2edc..8db1a2410 100644 --- a/unsupported/test/cxx11_tensor_fft.cpp +++ b/unsupported/test/cxx11_tensor_fft.cpp @@ -8,7 +8,7 @@ // with this file, You can obtain one at http://mozilla.org/MPL/2.0/. #include "main.h" -#include +#include using Eigen::Tensor; diff --git a/unsupported/test/cxx11_tensor_fixed_size.cpp b/unsupported/test/cxx11_tensor_fixed_size.cpp index 7cfc18d22..fb2285938 100644 --- a/unsupported/test/cxx11_tensor_fixed_size.cpp +++ b/unsupported/test/cxx11_tensor_fixed_size.cpp @@ -9,7 +9,7 @@ #include "main.h" -#include +#include using Eigen::RowMajor; using Eigen::Tensor; diff --git a/unsupported/test/cxx11_tensor_forced_eval.cpp b/unsupported/test/cxx11_tensor_forced_eval.cpp index 4eb7d912a..5ceac39b6 100644 --- a/unsupported/test/cxx11_tensor_forced_eval.cpp +++ b/unsupported/test/cxx11_tensor_forced_eval.cpp @@ -10,7 +10,7 @@ #include "main.h" #include -#include +#include using Eigen::MatrixXf; using Eigen::Tensor; diff --git a/unsupported/test/cxx11_tensor_forced_eval_sycl.cpp b/unsupported/test/cxx11_tensor_forced_eval_sycl.cpp index 19a3c796c..7c727d434 100644 --- a/unsupported/test/cxx11_tensor_forced_eval_sycl.cpp +++ b/unsupported/test/cxx11_tensor_forced_eval_sycl.cpp @@ -18,7 +18,7 @@ #define EIGEN_USE_SYCL #include "main.h" -#include +#include using Eigen::Tensor; template diff --git a/unsupported/test/cxx11_tensor_generator.cpp b/unsupported/test/cxx11_tensor_generator.cpp index e4aec1b1b..d380985da 100644 --- a/unsupported/test/cxx11_tensor_generator.cpp +++ b/unsupported/test/cxx11_tensor_generator.cpp @@ -9,7 +9,7 @@ #include "main.h" -#include +#include struct Generator1D { Generator1D() {} diff --git a/unsupported/test/cxx11_tensor_generator_sycl.cpp b/unsupported/test/cxx11_tensor_generator_sycl.cpp index 335bf2544..8879b5806 100644 --- a/unsupported/test/cxx11_tensor_generator_sycl.cpp +++ b/unsupported/test/cxx11_tensor_generator_sycl.cpp @@ -19,7 +19,7 @@ static const float error_threshold = 1e-8f; #include "main.h" -#include +#include using Eigen::Tensor; struct Generator1D { diff --git a/unsupported/test/cxx11_tensor_gpu.cu b/unsupported/test/cxx11_tensor_gpu.cu index c4d0be10d..d96e1b234 100644 --- a/unsupported/test/cxx11_tensor_gpu.cu +++ b/unsupported/test/cxx11_tensor_gpu.cu @@ -13,7 +13,7 @@ #define EIGEN_USE_GPU #include "main.h" -#include +#include using Eigen::Tensor; diff --git a/unsupported/test/cxx11_tensor_ifft.cpp b/unsupported/test/cxx11_tensor_ifft.cpp index 3433aeada..04f46ebd5 100644 --- a/unsupported/test/cxx11_tensor_ifft.cpp +++ b/unsupported/test/cxx11_tensor_ifft.cpp @@ -10,7 +10,7 @@ #include "main.h" #include #include -#include +#include using Eigen::Tensor; diff --git a/unsupported/test/cxx11_tensor_image_op_sycl.cpp b/unsupported/test/cxx11_tensor_image_op_sycl.cpp index 2aedaf6ec..4c901a413 100644 --- a/unsupported/test/cxx11_tensor_image_op_sycl.cpp +++ b/unsupported/test/cxx11_tensor_image_op_sycl.cpp @@ -18,7 +18,7 @@ #define EIGEN_USE_SYCL #include "main.h" -#include +#include using Eigen::array; using Eigen::SyclDevice; diff --git a/unsupported/test/cxx11_tensor_image_patch.cpp b/unsupported/test/cxx11_tensor_image_patch.cpp index 55d3c6ebf..2f483940b 100644 --- a/unsupported/test/cxx11_tensor_image_patch.cpp +++ b/unsupported/test/cxx11_tensor_image_patch.cpp @@ -9,7 +9,7 @@ #include "main.h" -#include +#include using Eigen::Tensor; diff --git a/unsupported/test/cxx11_tensor_image_patch_sycl.cpp b/unsupported/test/cxx11_tensor_image_patch_sycl.cpp index 9cbf26c66..a6d3b7a12 100644 --- a/unsupported/test/cxx11_tensor_image_patch_sycl.cpp +++ b/unsupported/test/cxx11_tensor_image_patch_sycl.cpp @@ -18,7 +18,7 @@ #define EIGEN_USE_SYCL #include "main.h" -#include +#include using Eigen::Tensor; static const int DataLayout = ColMajor; diff --git a/unsupported/test/cxx11_tensor_index_list.cpp b/unsupported/test/cxx11_tensor_index_list.cpp index 9e0b7559b..ef7147487 100644 --- a/unsupported/test/cxx11_tensor_index_list.cpp +++ b/unsupported/test/cxx11_tensor_index_list.cpp @@ -9,7 +9,7 @@ #include "main.h" -#include +#include static void test_static_index_list() { Tensor tensor(2, 3, 5, 7); diff --git a/unsupported/test/cxx11_tensor_inflation.cpp b/unsupported/test/cxx11_tensor_inflation.cpp index 32662abc8..1c8edea9f 100644 --- a/unsupported/test/cxx11_tensor_inflation.cpp +++ b/unsupported/test/cxx11_tensor_inflation.cpp @@ -9,7 +9,7 @@ #include "main.h" -#include +#include using Eigen::Tensor; diff --git a/unsupported/test/cxx11_tensor_inflation_sycl.cpp b/unsupported/test/cxx11_tensor_inflation_sycl.cpp index 2475a3568..500110054 100644 --- a/unsupported/test/cxx11_tensor_inflation_sycl.cpp +++ b/unsupported/test/cxx11_tensor_inflation_sycl.cpp @@ -18,7 +18,7 @@ #define EIGEN_USE_SYCL #include "main.h" -#include +#include using Eigen::Tensor; diff --git a/unsupported/test/cxx11_tensor_intdiv.cpp b/unsupported/test/cxx11_tensor_intdiv.cpp index 433ca6e05..3d818e077 100644 --- a/unsupported/test/cxx11_tensor_intdiv.cpp +++ b/unsupported/test/cxx11_tensor_intdiv.cpp @@ -9,7 +9,7 @@ #include "main.h" -#include +#include void test_signed_32bit() { // Divide by one diff --git a/unsupported/test/cxx11_tensor_io.cpp b/unsupported/test/cxx11_tensor_io.cpp index 27b32305b..ace3e7cb7 100644 --- a/unsupported/test/cxx11_tensor_io.cpp +++ b/unsupported/test/cxx11_tensor_io.cpp @@ -9,7 +9,7 @@ #include "main.h" #include -#include +#include template struct test_tensor_ostream_impl {}; diff --git a/unsupported/test/cxx11_tensor_layout_swap.cpp b/unsupported/test/cxx11_tensor_layout_swap.cpp index 50fb3ae80..46a0bb217 100644 --- a/unsupported/test/cxx11_tensor_layout_swap.cpp +++ b/unsupported/test/cxx11_tensor_layout_swap.cpp @@ -9,7 +9,7 @@ #include "main.h" -#include +#include using Eigen::Tensor; diff --git a/unsupported/test/cxx11_tensor_layout_swap_sycl.cpp b/unsupported/test/cxx11_tensor_layout_swap_sycl.cpp index 066221e5d..7d1cbdc1e 100644 --- a/unsupported/test/cxx11_tensor_layout_swap_sycl.cpp +++ b/unsupported/test/cxx11_tensor_layout_swap_sycl.cpp @@ -20,7 +20,7 @@ #include "main.h" -#include +#include using Eigen::Tensor; diff --git a/unsupported/test/cxx11_tensor_lvalue.cpp b/unsupported/test/cxx11_tensor_lvalue.cpp index d70c7e066..8873dc68e 100644 --- a/unsupported/test/cxx11_tensor_lvalue.cpp +++ b/unsupported/test/cxx11_tensor_lvalue.cpp @@ -9,7 +9,7 @@ #include "main.h" -#include +#include using Eigen::RowMajor; using Eigen::Tensor; diff --git a/unsupported/test/cxx11_tensor_map.cpp b/unsupported/test/cxx11_tensor_map.cpp index 25176f4a3..3c896a65f 100644 --- a/unsupported/test/cxx11_tensor_map.cpp +++ b/unsupported/test/cxx11_tensor_map.cpp @@ -9,7 +9,7 @@ #include "main.h" -#include +#include using Eigen::RowMajor; using Eigen::Tensor; diff --git a/unsupported/test/cxx11_tensor_math.cpp b/unsupported/test/cxx11_tensor_math.cpp index 8184b8828..0bcbbb79d 100644 --- a/unsupported/test/cxx11_tensor_math.cpp +++ b/unsupported/test/cxx11_tensor_math.cpp @@ -9,7 +9,7 @@ #include "main.h" -#include +#include using Eigen::RowMajor; using Eigen::Tensor; diff --git a/unsupported/test/cxx11_tensor_math_sycl.cpp b/unsupported/test/cxx11_tensor_math_sycl.cpp index 7152a58c4..69877106f 100644 --- a/unsupported/test/cxx11_tensor_math_sycl.cpp +++ b/unsupported/test/cxx11_tensor_math_sycl.cpp @@ -18,7 +18,7 @@ #define EIGEN_USE_SYCL #include "main.h" -#include +#include using Eigen::array; using Eigen::SyclDevice; diff --git a/unsupported/test/cxx11_tensor_mixed_indices.cpp b/unsupported/test/cxx11_tensor_mixed_indices.cpp index be6c48659..2530fcaf7 100644 --- a/unsupported/test/cxx11_tensor_mixed_indices.cpp +++ b/unsupported/test/cxx11_tensor_mixed_indices.cpp @@ -9,7 +9,7 @@ #include "main.h" -#include +#include static void test_simple() { Tensor vec1(6); diff --git a/unsupported/test/cxx11_tensor_morphing.cpp b/unsupported/test/cxx11_tensor_morphing.cpp index 55d42918b..bbc0de54a 100644 --- a/unsupported/test/cxx11_tensor_morphing.cpp +++ b/unsupported/test/cxx11_tensor_morphing.cpp @@ -9,7 +9,7 @@ #include "main.h" -#include +#include using Eigen::Tensor; diff --git a/unsupported/test/cxx11_tensor_morphing_sycl.cpp b/unsupported/test/cxx11_tensor_morphing_sycl.cpp index 7242b8ec4..f96ffb3e2 100644 --- a/unsupported/test/cxx11_tensor_morphing_sycl.cpp +++ b/unsupported/test/cxx11_tensor_morphing_sycl.cpp @@ -19,7 +19,7 @@ #define EIGEN_USE_SYCL #include "main.h" -#include +#include using Eigen::array; using Eigen::SyclDevice; diff --git a/unsupported/test/cxx11_tensor_move.cpp b/unsupported/test/cxx11_tensor_move.cpp index a21ebb1c3..5b245096a 100644 --- a/unsupported/test/cxx11_tensor_move.cpp +++ b/unsupported/test/cxx11_tensor_move.cpp @@ -9,7 +9,7 @@ #include "main.h" -#include +#include #include using Eigen::RowMajor; diff --git a/unsupported/test/cxx11_tensor_notification.cpp b/unsupported/test/cxx11_tensor_notification.cpp index 21738668b..71c4d0550 100644 --- a/unsupported/test/cxx11_tensor_notification.cpp +++ b/unsupported/test/cxx11_tensor_notification.cpp @@ -13,7 +13,7 @@ #include #include "main.h" -#include +#include static void test_notification_single() { ThreadPool thread_pool(1); diff --git a/unsupported/test/cxx11_tensor_of_bfloat16_gpu.cu b/unsupported/test/cxx11_tensor_of_bfloat16_gpu.cu index 722c92fbd..4f171ff39 100644 --- a/unsupported/test/cxx11_tensor_of_bfloat16_gpu.cu +++ b/unsupported/test/cxx11_tensor_of_bfloat16_gpu.cu @@ -14,7 +14,7 @@ #define EIGEN_USE_GPU #include "main.h" -#include +#include using Eigen::Tensor; diff --git a/unsupported/test/cxx11_tensor_of_complex.cpp b/unsupported/test/cxx11_tensor_of_complex.cpp index d34edbd2b..d02ae273e 100644 --- a/unsupported/test/cxx11_tensor_of_complex.cpp +++ b/unsupported/test/cxx11_tensor_of_complex.cpp @@ -9,7 +9,7 @@ #include "main.h" -#include +#include using Eigen::Tensor; using Eigen::TensorMap; diff --git a/unsupported/test/cxx11_tensor_of_const_values.cpp b/unsupported/test/cxx11_tensor_of_const_values.cpp index 6c76cf342..7a6f0dce8 100644 --- a/unsupported/test/cxx11_tensor_of_const_values.cpp +++ b/unsupported/test/cxx11_tensor_of_const_values.cpp @@ -9,7 +9,7 @@ #include "main.h" -#include +#include using Eigen::RowMajor; using Eigen::Tensor; diff --git a/unsupported/test/cxx11_tensor_of_float16_gpu.cu b/unsupported/test/cxx11_tensor_of_float16_gpu.cu index 88482deb3..d29df4fed 100644 --- a/unsupported/test/cxx11_tensor_of_float16_gpu.cu +++ b/unsupported/test/cxx11_tensor_of_float16_gpu.cu @@ -14,7 +14,7 @@ #define EIGEN_USE_GPU #include "main.h" -#include +#include using Eigen::Tensor; diff --git a/unsupported/test/cxx11_tensor_of_float16_sycl.cpp b/unsupported/test/cxx11_tensor_of_float16_sycl.cpp index 7de39e7cc..811ca1145 100644 --- a/unsupported/test/cxx11_tensor_of_float16_sycl.cpp +++ b/unsupported/test/cxx11_tensor_of_float16_sycl.cpp @@ -18,7 +18,7 @@ #define EIGEN_SYCL_HALF_SUPPORT #include "main.h" -#include +#include using Eigen::SyclDevice; using Eigen::Tensor; diff --git a/unsupported/test/cxx11_tensor_of_strings.cpp b/unsupported/test/cxx11_tensor_of_strings.cpp index f7db25cc3..644750331 100644 --- a/unsupported/test/cxx11_tensor_of_strings.cpp +++ b/unsupported/test/cxx11_tensor_of_strings.cpp @@ -9,7 +9,7 @@ #include "main.h" -#include +#include using Eigen::Tensor; using Eigen::TensorMap; diff --git a/unsupported/test/cxx11_tensor_padding.cpp b/unsupported/test/cxx11_tensor_padding.cpp index 6c5ddf078..a21da4a3b 100644 --- a/unsupported/test/cxx11_tensor_padding.cpp +++ b/unsupported/test/cxx11_tensor_padding.cpp @@ -9,7 +9,7 @@ #include "main.h" -#include +#include using Eigen::Tensor; diff --git a/unsupported/test/cxx11_tensor_padding_sycl.cpp b/unsupported/test/cxx11_tensor_padding_sycl.cpp index ae4d98a20..e311dc607 100644 --- a/unsupported/test/cxx11_tensor_padding_sycl.cpp +++ b/unsupported/test/cxx11_tensor_padding_sycl.cpp @@ -19,7 +19,7 @@ #define EIGEN_USE_SYCL #include "main.h" -#include +#include using Eigen::array; using Eigen::SyclDevice; diff --git a/unsupported/test/cxx11_tensor_patch.cpp b/unsupported/test/cxx11_tensor_patch.cpp index 59b03e7f0..76e75f9e0 100644 --- a/unsupported/test/cxx11_tensor_patch.cpp +++ b/unsupported/test/cxx11_tensor_patch.cpp @@ -9,7 +9,7 @@ #include "main.h" -#include +#include using Eigen::Tensor; diff --git a/unsupported/test/cxx11_tensor_patch_sycl.cpp b/unsupported/test/cxx11_tensor_patch_sycl.cpp index b1be9ff6f..3000cdcc1 100644 --- a/unsupported/test/cxx11_tensor_patch_sycl.cpp +++ b/unsupported/test/cxx11_tensor_patch_sycl.cpp @@ -20,7 +20,7 @@ #include "main.h" -#include +#include using Eigen::Tensor; diff --git a/unsupported/test/cxx11_tensor_random.cpp b/unsupported/test/cxx11_tensor_random.cpp index 585a3f897..b1dc6e4c1 100644 --- a/unsupported/test/cxx11_tensor_random.cpp +++ b/unsupported/test/cxx11_tensor_random.cpp @@ -9,7 +9,7 @@ #include "main.h" -#include +#include template static void test_default() { diff --git a/unsupported/test/cxx11_tensor_random_gpu.cu b/unsupported/test/cxx11_tensor_random_gpu.cu index 6edea1c42..f6f269e90 100644 --- a/unsupported/test/cxx11_tensor_random_gpu.cu +++ b/unsupported/test/cxx11_tensor_random_gpu.cu @@ -14,7 +14,7 @@ #define EIGEN_USE_GPU #include "main.h" -#include +#include void test_gpu_random_uniform() { Tensor out(72, 97); diff --git a/unsupported/test/cxx11_tensor_random_sycl.cpp b/unsupported/test/cxx11_tensor_random_sycl.cpp index 0d29a5d6f..76bfdbffe 100644 --- a/unsupported/test/cxx11_tensor_random_sycl.cpp +++ b/unsupported/test/cxx11_tensor_random_sycl.cpp @@ -17,7 +17,7 @@ #define EIGEN_USE_SYCL #include "main.h" -#include +#include template static void test_sycl_random_uniform(const Eigen::SyclDevice& sycl_device) { diff --git a/unsupported/test/cxx11_tensor_reduction.cpp b/unsupported/test/cxx11_tensor_reduction.cpp index 0fdebe271..81dc0ce53 100644 --- a/unsupported/test/cxx11_tensor_reduction.cpp +++ b/unsupported/test/cxx11_tensor_reduction.cpp @@ -10,7 +10,7 @@ #include "main.h" #include #include -#include +#include using Eigen::Tensor; diff --git a/unsupported/test/cxx11_tensor_reduction_gpu.cu b/unsupported/test/cxx11_tensor_reduction_gpu.cu index 24cc5be55..cedd8293f 100644 --- a/unsupported/test/cxx11_tensor_reduction_gpu.cu +++ b/unsupported/test/cxx11_tensor_reduction_gpu.cu @@ -13,7 +13,7 @@ #define EIGEN_USE_GPU #include "main.h" -#include +#include template static void test_full_reductions() { diff --git a/unsupported/test/cxx11_tensor_reduction_sycl.cpp b/unsupported/test/cxx11_tensor_reduction_sycl.cpp index 927695325..cf2a4b7c1 100644 --- a/unsupported/test/cxx11_tensor_reduction_sycl.cpp +++ b/unsupported/test/cxx11_tensor_reduction_sycl.cpp @@ -19,7 +19,7 @@ #include "main.h" -#include +#include template static void test_full_reductions_sum_sycl(const Eigen::SyclDevice& sycl_device) { diff --git a/unsupported/test/cxx11_tensor_ref.cpp b/unsupported/test/cxx11_tensor_ref.cpp index 8d6821ac5..7696558c8 100644 --- a/unsupported/test/cxx11_tensor_ref.cpp +++ b/unsupported/test/cxx11_tensor_ref.cpp @@ -9,7 +9,7 @@ #include "main.h" -#include +#include using Eigen::RowMajor; using Eigen::Tensor; diff --git a/unsupported/test/cxx11_tensor_reverse.cpp b/unsupported/test/cxx11_tensor_reverse.cpp index 150c71b7c..611cfc8d7 100644 --- a/unsupported/test/cxx11_tensor_reverse.cpp +++ b/unsupported/test/cxx11_tensor_reverse.cpp @@ -10,7 +10,7 @@ #include "main.h" -#include +#include using Eigen::array; using Eigen::Tensor; diff --git a/unsupported/test/cxx11_tensor_reverse_sycl.cpp b/unsupported/test/cxx11_tensor_reverse_sycl.cpp index c9c617231..f2c982483 100644 --- a/unsupported/test/cxx11_tensor_reverse_sycl.cpp +++ b/unsupported/test/cxx11_tensor_reverse_sycl.cpp @@ -18,7 +18,7 @@ #define EIGEN_USE_SYCL #include "main.h" -#include +#include template static void test_simple_reverse(const Eigen::SyclDevice& sycl_device) { diff --git a/unsupported/test/cxx11_tensor_roll.cpp b/unsupported/test/cxx11_tensor_roll.cpp index 59f5efe0a..eaa78866a 100644 --- a/unsupported/test/cxx11_tensor_roll.cpp +++ b/unsupported/test/cxx11_tensor_roll.cpp @@ -9,7 +9,7 @@ #include "main.h" -#include +#include using Eigen::array; using Eigen::Tensor; diff --git a/unsupported/test/cxx11_tensor_roundings.cpp b/unsupported/test/cxx11_tensor_roundings.cpp index 2c1181ae4..33e9cb397 100644 --- a/unsupported/test/cxx11_tensor_roundings.cpp +++ b/unsupported/test/cxx11_tensor_roundings.cpp @@ -9,7 +9,7 @@ #include "main.h" -#include +#include static void test_float_rounding() { Tensor ftensor(20, 30); diff --git a/unsupported/test/cxx11_tensor_scan.cpp b/unsupported/test/cxx11_tensor_scan.cpp index 50ec63d5c..30730f25e 100644 --- a/unsupported/test/cxx11_tensor_scan.cpp +++ b/unsupported/test/cxx11_tensor_scan.cpp @@ -10,7 +10,7 @@ #include "main.h" #include #include -#include +#include using Eigen::Tensor; diff --git a/unsupported/test/cxx11_tensor_scan_gpu.cu b/unsupported/test/cxx11_tensor_scan_gpu.cu index b94ab3104..e3a5c4da3 100644 --- a/unsupported/test/cxx11_tensor_scan_gpu.cu +++ b/unsupported/test/cxx11_tensor_scan_gpu.cu @@ -14,7 +14,7 @@ #define EIGEN_USE_GPU #include "main.h" -#include +#include using Eigen::Tensor; typedef Tensor::DimensionPair DimPair; diff --git a/unsupported/test/cxx11_tensor_scan_sycl.cpp b/unsupported/test/cxx11_tensor_scan_sycl.cpp index 13f7c9e4e..2c303e563 100644 --- a/unsupported/test/cxx11_tensor_scan_sycl.cpp +++ b/unsupported/test/cxx11_tensor_scan_sycl.cpp @@ -17,7 +17,7 @@ #define EIGEN_USE_SYCL #include "main.h" -#include +#include using Eigen::Tensor; typedef Tensor::DimensionPair DimPair; diff --git a/unsupported/test/cxx11_tensor_shuffling.cpp b/unsupported/test/cxx11_tensor_shuffling.cpp index 4e6fb73bf..dd4e398aa 100644 --- a/unsupported/test/cxx11_tensor_shuffling.cpp +++ b/unsupported/test/cxx11_tensor_shuffling.cpp @@ -9,7 +9,7 @@ #include "main.h" -#include +#include using Eigen::array; using Eigen::Tensor; diff --git a/unsupported/test/cxx11_tensor_shuffling_sycl.cpp b/unsupported/test/cxx11_tensor_shuffling_sycl.cpp index 0f88f5227..15e7debcc 100644 --- a/unsupported/test/cxx11_tensor_shuffling_sycl.cpp +++ b/unsupported/test/cxx11_tensor_shuffling_sycl.cpp @@ -19,7 +19,7 @@ #define EIGEN_USE_SYCL #include "main.h" -#include +#include using Eigen::array; using Eigen::SyclDevice; diff --git a/unsupported/test/cxx11_tensor_simple.cpp b/unsupported/test/cxx11_tensor_simple.cpp index 1686af345..c313119eb 100644 --- a/unsupported/test/cxx11_tensor_simple.cpp +++ b/unsupported/test/cxx11_tensor_simple.cpp @@ -9,7 +9,7 @@ #include "main.h" -#include +#include using Eigen::RowMajor; using Eigen::Tensor; diff --git a/unsupported/test/cxx11_tensor_striding.cpp b/unsupported/test/cxx11_tensor_striding.cpp index 4f3cd0d0a..b6910ca75 100644 --- a/unsupported/test/cxx11_tensor_striding.cpp +++ b/unsupported/test/cxx11_tensor_striding.cpp @@ -9,7 +9,7 @@ #include "main.h" -#include +#include using Eigen::Tensor; diff --git a/unsupported/test/cxx11_tensor_striding_sycl.cpp b/unsupported/test/cxx11_tensor_striding_sycl.cpp index e488c0e6b..65c96ac92 100644 --- a/unsupported/test/cxx11_tensor_striding_sycl.cpp +++ b/unsupported/test/cxx11_tensor_striding_sycl.cpp @@ -22,7 +22,7 @@ #include #include "main.h" -#include +#include using Eigen::array; using Eigen::SyclDevice; diff --git a/unsupported/test/cxx11_tensor_sugar.cpp b/unsupported/test/cxx11_tensor_sugar.cpp index 9c4d87809..d1827e8e7 100644 --- a/unsupported/test/cxx11_tensor_sugar.cpp +++ b/unsupported/test/cxx11_tensor_sugar.cpp @@ -1,6 +1,6 @@ #include "main.h" -#include +#include using Eigen::RowMajor; using Eigen::Tensor; diff --git a/unsupported/test/cxx11_tensor_sycl.cpp b/unsupported/test/cxx11_tensor_sycl.cpp index 842a5102b..e772f6d2f 100644 --- a/unsupported/test/cxx11_tensor_sycl.cpp +++ b/unsupported/test/cxx11_tensor_sycl.cpp @@ -19,7 +19,7 @@ #define EIGEN_USE_SYCL #include "main.h" -#include +#include using Eigen::array; using Eigen::SyclDevice; diff --git a/unsupported/test/cxx11_tensor_symmetry.cpp b/unsupported/test/cxx11_tensor_symmetry.cpp index dce303037..e1a1472cd 100644 --- a/unsupported/test/cxx11_tensor_symmetry.cpp +++ b/unsupported/test/cxx11_tensor_symmetry.cpp @@ -9,8 +9,8 @@ #include "main.h" -#include -#include +#include +#include #include #include diff --git a/unsupported/test/cxx11_tensor_thread_pool.cpp b/unsupported/test/cxx11_tensor_thread_pool.cpp index a566d7e73..0072bf0dd 100644 --- a/unsupported/test/cxx11_tensor_thread_pool.cpp +++ b/unsupported/test/cxx11_tensor_thread_pool.cpp @@ -11,7 +11,7 @@ #include "main.h" #include -#include +#include using Eigen::Tensor; diff --git a/unsupported/test/cxx11_tensor_trace.cpp b/unsupported/test/cxx11_tensor_trace.cpp index 5b9583929..bf013d0ad 100644 --- a/unsupported/test/cxx11_tensor_trace.cpp +++ b/unsupported/test/cxx11_tensor_trace.cpp @@ -9,7 +9,7 @@ #include "main.h" -#include +#include using Eigen::array; using Eigen::Tensor; diff --git a/unsupported/test/cxx11_tensor_uint128.cpp b/unsupported/test/cxx11_tensor_uint128.cpp index 4470f2536..739b4596d 100644 --- a/unsupported/test/cxx11_tensor_uint128.cpp +++ b/unsupported/test/cxx11_tensor_uint128.cpp @@ -9,7 +9,7 @@ #include "main.h" -#include +#include #if EIGEN_COMP_MSVC || !defined(__SIZEOF_INT128__) #define EIGEN_NO_INT128 diff --git a/unsupported/test/cxx11_tensor_volume_patch.cpp b/unsupported/test/cxx11_tensor_volume_patch.cpp index 9a048617e..31da4101c 100644 --- a/unsupported/test/cxx11_tensor_volume_patch.cpp +++ b/unsupported/test/cxx11_tensor_volume_patch.cpp @@ -1,6 +1,6 @@ #include "main.h" -#include +#include using Eigen::Tensor; diff --git a/unsupported/test/cxx11_tensor_volume_patch_sycl.cpp b/unsupported/test/cxx11_tensor_volume_patch_sycl.cpp index 6a4248ef3..327ac678e 100644 --- a/unsupported/test/cxx11_tensor_volume_patch_sycl.cpp +++ b/unsupported/test/cxx11_tensor_volume_patch_sycl.cpp @@ -18,7 +18,7 @@ #define EIGEN_USE_SYCL #include "main.h" -#include +#include using Eigen::Tensor; static const int DataLayout = ColMajor;