summaryrefslogtreecommitdiffhomepage
path: root/eigen/unsupported/test
diff options
context:
space:
mode:
Diffstat (limited to 'eigen/unsupported/test')
-rw-r--r--eigen/unsupported/test/CMakeLists.txt7
-rw-r--r--eigen/unsupported/test/autodiff.cpp22
-rw-r--r--eigen/unsupported/test/autodiff_scalar.cpp3
-rw-r--r--eigen/unsupported/test/cxx11_tensor_argmax_cuda.cu3
-rw-r--r--eigen/unsupported/test/cxx11_tensor_cast_float16_cuda.cu3
-rw-r--r--eigen/unsupported/test/cxx11_tensor_complex_cuda.cu3
-rw-r--r--eigen/unsupported/test/cxx11_tensor_complex_cwise_ops_cuda.cu3
-rw-r--r--eigen/unsupported/test/cxx11_tensor_contract_cuda.cu3
-rw-r--r--eigen/unsupported/test/cxx11_tensor_cuda.cu3
-rw-r--r--eigen/unsupported/test/cxx11_tensor_device.cu3
-rw-r--r--eigen/unsupported/test/cxx11_tensor_of_float16_cuda.cu3
-rw-r--r--eigen/unsupported/test/cxx11_tensor_random_cuda.cu3
-rw-r--r--eigen/unsupported/test/cxx11_tensor_reduction_cuda.cu3
-rw-r--r--eigen/unsupported/test/cxx11_tensor_scan_cuda.cu3
14 files changed, 22 insertions, 43 deletions
diff --git a/eigen/unsupported/test/CMakeLists.txt b/eigen/unsupported/test/CMakeLists.txt
index b5fa1c8..80cccd8 100644
--- a/eigen/unsupported/test/CMakeLists.txt
+++ b/eigen/unsupported/test/CMakeLists.txt
@@ -30,11 +30,16 @@ else(GOOGLEHASH_FOUND)
ei_add_property(EIGEN_MISSING_BACKENDS "GoogleHash, ")
endif(GOOGLEHASH_FOUND)
+
find_package(Adolc)
if(ADOLC_FOUND)
include_directories(${ADOLC_INCLUDES})
ei_add_property(EIGEN_TESTED_BACKENDS "Adolc, ")
- ei_add_test(forward_adolc "" ${ADOLC_LIBRARIES})
+ if(EIGEN_TEST_CXX11)
+ ei_add_test(forward_adolc "" ${ADOLC_LIBRARIES})
+ else()
+ message(STATUS "Adolc found, but tests require C++11 mode")
+ endif()
else(ADOLC_FOUND)
ei_add_property(EIGEN_MISSING_BACKENDS "Adolc, ")
endif(ADOLC_FOUND)
diff --git a/eigen/unsupported/test/autodiff.cpp b/eigen/unsupported/test/autodiff.cpp
index 8574313..1c5e0dc 100644
--- a/eigen/unsupported/test/autodiff.cpp
+++ b/eigen/unsupported/test/autodiff.cpp
@@ -306,6 +306,8 @@ double bug_1222() {
return denom.value();
}
+#ifdef EIGEN_TEST_PART_5
+
double bug_1223() {
using std::min;
typedef Eigen::AutoDiffScalar<Eigen::Vector3d> AD;
@@ -326,8 +328,8 @@ double bug_1223() {
// regression test for some compilation issues with specializations of ScalarBinaryOpTraits
void bug_1260() {
- Matrix4d A;
- Vector4d v;
+ Matrix4d A = Matrix4d::Ones();
+ Vector4d v = Vector4d::Ones();
A*v;
}
@@ -336,7 +338,7 @@ double bug_1261() {
typedef AutoDiffScalar<Matrix2d> AD;
typedef Matrix<AD,2,1> VectorAD;
- VectorAD v;
+ VectorAD v(0.,0.);
const AD maxVal = v.maxCoeff();
const AD minVal = v.minCoeff();
return maxVal.value() + minVal.value();
@@ -344,12 +346,14 @@ double bug_1261() {
double bug_1264() {
typedef AutoDiffScalar<Vector2d> AD;
- const AD s;
- const Matrix<AD, 3, 1> v1;
+ const AD s = 0.;
+ const Matrix<AD, 3, 1> v1(0.,0.,0.);
const Matrix<AD, 3, 1> v2 = (s + 3.0) * v1;
return v2(0).value();
}
+#endif
+
void test_autodiff()
{
for(int i = 0; i < g_repeat; i++) {
@@ -359,9 +363,9 @@ void test_autodiff()
CALL_SUBTEST_4( test_autodiff_hessian<1>() );
}
- bug_1222();
- bug_1223();
- bug_1260();
- bug_1261();
+ CALL_SUBTEST_5( bug_1222() );
+ CALL_SUBTEST_5( bug_1223() );
+ CALL_SUBTEST_5( bug_1260() );
+ CALL_SUBTEST_5( bug_1261() );
}
diff --git a/eigen/unsupported/test/autodiff_scalar.cpp b/eigen/unsupported/test/autodiff_scalar.cpp
index 9cf1128..a917ec3 100644
--- a/eigen/unsupported/test/autodiff_scalar.cpp
+++ b/eigen/unsupported/test/autodiff_scalar.cpp
@@ -81,6 +81,9 @@ void check_limits_specialization()
typedef std::numeric_limits<AD> A;
typedef std::numeric_limits<Scalar> B;
+ // workaround "unsed typedef" warning:
+ VERIFY(!bool(internal::is_same<B, A>::value));
+
#if EIGEN_HAS_CXX11
VERIFY(bool(std::is_base_of<B, A>::value));
#endif
diff --git a/eigen/unsupported/test/cxx11_tensor_argmax_cuda.cu b/eigen/unsupported/test/cxx11_tensor_argmax_cuda.cu
index 653443d..3d73d49 100644
--- a/eigen/unsupported/test/cxx11_tensor_argmax_cuda.cu
+++ b/eigen/unsupported/test/cxx11_tensor_argmax_cuda.cu
@@ -12,9 +12,6 @@
#define EIGEN_TEST_FUNC cxx11_tensor_cuda
#define EIGEN_USE_GPU
-#if defined __CUDACC_VER__ && __CUDACC_VER__ >= 70500
-#include <cuda_fp16.h>
-#endif
#include "main.h"
#include <unsupported/Eigen/CXX11/Tensor>
diff --git a/eigen/unsupported/test/cxx11_tensor_cast_float16_cuda.cu b/eigen/unsupported/test/cxx11_tensor_cast_float16_cuda.cu
index 88c2339..816e032 100644
--- a/eigen/unsupported/test/cxx11_tensor_cast_float16_cuda.cu
+++ b/eigen/unsupported/test/cxx11_tensor_cast_float16_cuda.cu
@@ -13,9 +13,6 @@
#define EIGEN_DEFAULT_DENSE_INDEX_TYPE int
#define EIGEN_USE_GPU
-#if defined __CUDACC_VER__ && __CUDACC_VER__ >= 70500
-#include <cuda_fp16.h>
-#endif
#include "main.h"
#include <unsupported/Eigen/CXX11/Tensor>
diff --git a/eigen/unsupported/test/cxx11_tensor_complex_cuda.cu b/eigen/unsupported/test/cxx11_tensor_complex_cuda.cu
index d4e111f..916f12a 100644
--- a/eigen/unsupported/test/cxx11_tensor_complex_cuda.cu
+++ b/eigen/unsupported/test/cxx11_tensor_complex_cuda.cu
@@ -11,9 +11,6 @@
#define EIGEN_TEST_FUNC cxx11_tensor_complex
#define EIGEN_USE_GPU
-#if defined __CUDACC_VER__ && __CUDACC_VER__ >= 70500
-#include <cuda_fp16.h>
-#endif
#include "main.h"
#include <unsupported/Eigen/CXX11/Tensor>
diff --git a/eigen/unsupported/test/cxx11_tensor_complex_cwise_ops_cuda.cu b/eigen/unsupported/test/cxx11_tensor_complex_cwise_ops_cuda.cu
index 2baf5ea..aac7809 100644
--- a/eigen/unsupported/test/cxx11_tensor_complex_cwise_ops_cuda.cu
+++ b/eigen/unsupported/test/cxx11_tensor_complex_cwise_ops_cuda.cu
@@ -11,9 +11,6 @@
#define EIGEN_TEST_FUNC cxx11_tensor_complex_cwise_ops
#define EIGEN_USE_GPU
-#if defined __CUDACC_VER__ && __CUDACC_VER__ >= 70500
-#include <cuda_fp16.h>
-#endif
#include "main.h"
#include <unsupported/Eigen/CXX11/Tensor>
diff --git a/eigen/unsupported/test/cxx11_tensor_contract_cuda.cu b/eigen/unsupported/test/cxx11_tensor_contract_cuda.cu
index dd68430..e821ccf 100644
--- a/eigen/unsupported/test/cxx11_tensor_contract_cuda.cu
+++ b/eigen/unsupported/test/cxx11_tensor_contract_cuda.cu
@@ -14,9 +14,6 @@
#define EIGEN_DEFAULT_DENSE_INDEX_TYPE int
#define EIGEN_USE_GPU
-#if defined __CUDACC_VER__ && __CUDACC_VER__ >= 70500
-#include <cuda_fp16.h>
-#endif
#include "main.h"
#include <unsupported/Eigen/CXX11/Tensor>
diff --git a/eigen/unsupported/test/cxx11_tensor_cuda.cu b/eigen/unsupported/test/cxx11_tensor_cuda.cu
index 0ba9d52..9584a53 100644
--- a/eigen/unsupported/test/cxx11_tensor_cuda.cu
+++ b/eigen/unsupported/test/cxx11_tensor_cuda.cu
@@ -12,9 +12,6 @@
#define EIGEN_TEST_FUNC cxx11_tensor_cuda
#define EIGEN_USE_GPU
-#if defined __CUDACC_VER__ && __CUDACC_VER__ >= 70500
-#include <cuda_fp16.h>
-#endif
#include "main.h"
#include <unsupported/Eigen/CXX11/Tensor>
diff --git a/eigen/unsupported/test/cxx11_tensor_device.cu b/eigen/unsupported/test/cxx11_tensor_device.cu
index fde20dd..cbb43e2 100644
--- a/eigen/unsupported/test/cxx11_tensor_device.cu
+++ b/eigen/unsupported/test/cxx11_tensor_device.cu
@@ -13,9 +13,6 @@
#define EIGEN_DEFAULT_DENSE_INDEX_TYPE int
#define EIGEN_USE_GPU
-#if defined __CUDACC_VER__ && __CUDACC_VER__ >= 70500
-#include <cuda_fp16.h>
-#endif
#include "main.h"
#include <unsupported/Eigen/CXX11/Tensor>
diff --git a/eigen/unsupported/test/cxx11_tensor_of_float16_cuda.cu b/eigen/unsupported/test/cxx11_tensor_of_float16_cuda.cu
index 2f86980..e296bf9 100644
--- a/eigen/unsupported/test/cxx11_tensor_of_float16_cuda.cu
+++ b/eigen/unsupported/test/cxx11_tensor_of_float16_cuda.cu
@@ -13,9 +13,6 @@
#define EIGEN_DEFAULT_DENSE_INDEX_TYPE int
#define EIGEN_USE_GPU
-#if defined __CUDACC_VER__ && __CUDACC_VER__ >= 70500
-#include <cuda_fp16.h>
-#endif
#include "main.h"
#include <unsupported/Eigen/CXX11/Tensor>
diff --git a/eigen/unsupported/test/cxx11_tensor_random_cuda.cu b/eigen/unsupported/test/cxx11_tensor_random_cuda.cu
index b3be199..fa1a467 100644
--- a/eigen/unsupported/test/cxx11_tensor_random_cuda.cu
+++ b/eigen/unsupported/test/cxx11_tensor_random_cuda.cu
@@ -13,9 +13,6 @@
#define EIGEN_DEFAULT_DENSE_INDEX_TYPE int
#define EIGEN_USE_GPU
-#if defined __CUDACC_VER__ && __CUDACC_VER__ >= 70500
-#include <cuda_fp16.h>
-#endif
#include "main.h"
#include <Eigen/CXX11/Tensor>
diff --git a/eigen/unsupported/test/cxx11_tensor_reduction_cuda.cu b/eigen/unsupported/test/cxx11_tensor_reduction_cuda.cu
index 6858b43..ec06697 100644
--- a/eigen/unsupported/test/cxx11_tensor_reduction_cuda.cu
+++ b/eigen/unsupported/test/cxx11_tensor_reduction_cuda.cu
@@ -12,9 +12,6 @@
#define EIGEN_TEST_FUNC cxx11_tensor_reduction_cuda
#define EIGEN_USE_GPU
-#if defined __CUDACC_VER__ && __CUDACC_VER__ >= 70500
-#include <cuda_fp16.h>
-#endif
#include "main.h"
#include <unsupported/Eigen/CXX11/Tensor>
diff --git a/eigen/unsupported/test/cxx11_tensor_scan_cuda.cu b/eigen/unsupported/test/cxx11_tensor_scan_cuda.cu
index 5f146f3..de1c0ac 100644
--- a/eigen/unsupported/test/cxx11_tensor_scan_cuda.cu
+++ b/eigen/unsupported/test/cxx11_tensor_scan_cuda.cu
@@ -13,9 +13,6 @@
#define EIGEN_DEFAULT_DENSE_INDEX_TYPE int
#define EIGEN_USE_GPU
-#if defined __CUDACC_VER__ && __CUDACC_VER__ >= 70500
-#include <cuda_fp16.h>
-#endif
#include "main.h"
#include <unsupported/Eigen/CXX11/Tensor>