aboutsummaryrefslogtreecommitdiffhomepage
path: root/unsupported/Eigen/CXX11/Tensor
diff options
context:
space:
mode:
Diffstat (limited to 'unsupported/Eigen/CXX11/Tensor')
-rw-r--r--unsupported/Eigen/CXX11/Tensor16
1 files changed, 14 insertions, 2 deletions
diff --git a/unsupported/Eigen/CXX11/Tensor b/unsupported/Eigen/CXX11/Tensor
index c681d3c20..16132398d 100644
--- a/unsupported/Eigen/CXX11/Tensor
+++ b/unsupported/Eigen/CXX11/Tensor
@@ -28,14 +28,22 @@
#include <cstddef>
#include <cstring>
+
+#ifdef _WIN32
+typedef __int32 int32_t;
+typedef unsigned __int32 uint32_t;
+typedef __int64 int64_t;
+typedef unsigned __int64 uint64_t;
+#else
#include <stdint.h>
+#endif
-#if __cplusplus > 199711
+#if __cplusplus > 199711 || EIGEN_COMP_MSVC >= 1900
#include <random>
#endif
#ifdef _WIN32
-#include <winbase.h>
+#include <windows.h>
#elif defined(__APPLE__)
#include <mach/mach_time.h>
#else
@@ -43,6 +51,7 @@
#endif
#ifdef EIGEN_USE_THREADS
+#include <atomic>
#include <condition_variable>
#include <deque>
#include <mutex>
@@ -50,6 +59,7 @@
#endif
#ifdef EIGEN_USE_GPU
+#include <iostream>
#include <cuda_runtime.h>
#if defined(__CUDACC__)
#include <curand_kernel.h>
@@ -80,6 +90,8 @@
#include "src/Tensor/TensorReductionCuda.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/TensorContractionCuda.h"