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

Fix a bunch of minor build and test issues.

Browse Source
This commit is contained in:
Antonio Sánchez 2023-01-06 16:37:26 +00:00 committed by Rasmus Munk Larsen
parent 3564668908
commit 262194f12c
12 changed files with 6 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Eigen/SPQRSupport
View File

@ -28,7 +28,7 @@
* *
*/ */
#include "Eigen/CholmodSupport" #include "CholmodSupport"
#include "src/SPQRSupport/SuiteSparseQRSupport.h" #include "src/SPQRSupport/SuiteSparseQRSupport.h"
#endif #endif

4
Eigen/src/Core/Visitor.h
View File

@ -294,7 +294,7 @@ struct minmax_coeff_visitor<Derived, is_min, PropagateNumbers> : coeff_visitor<D
Packet mask = pcmp_eq(pset1<Packet>(value), p); Packet mask = pcmp_eq(pset1<Packet>(value), p);
Index max_idx = PacketSize - static_cast<Index>(predux_max(pand(range, mask))); Index max_idx = PacketSize - static_cast<Index>(predux_max(pand(range, mask)));
this->res = value; this->res = value;
this->row = Derived::IsRowMajor ? i : i + max_idx;; this->row = Derived::IsRowMajor ? i : i + max_idx;
this->col = Derived::IsRowMajor ? j + max_idx : j; this->col = Derived::IsRowMajor ? j + max_idx : j;
} }
} }
@ -342,7 +342,7 @@ template<typename Scalar, bool is_min, int NaNPropagation>
struct functor_traits<minmax_coeff_visitor<Scalar, is_min, NaNPropagation> > { struct functor_traits<minmax_coeff_visitor<Scalar, is_min, NaNPropagation> > {
enum { enum {
Cost = NumTraits<Scalar>::AddCost, Cost = NumTraits<Scalar>::AddCost,
PacketAccess = true PacketAccess = packet_traits<Scalar>::HasCmp
}; };
}; };

2
test/bfloat16_float.cpp
View File

@ -11,8 +11,6 @@
#include "main.h" #include "main.h"
#include <Eigen/src/Core/arch/Default/BFloat16.h>
#define VERIFY_BFLOAT16_BITS_EQUAL(h, bits) \ #define VERIFY_BFLOAT16_BITS_EQUAL(h, bits) \
VERIFY_IS_EQUAL((numext::bit_cast<numext::uint16_t>(h)), (static_cast<numext::uint16_t>(bits))) VERIFY_IS_EQUAL((numext::bit_cast<numext::uint16_t>(h)), (static_cast<numext::uint16_t>(bits)))

1
test/gpu_basic.cu
View File

@ -16,6 +16,7 @@
#define EIGEN_TEST_NO_LONGDOUBLE #define EIGEN_TEST_NO_LONGDOUBLE
#define EIGEN_DEFAULT_DENSE_INDEX_TYPE int #define EIGEN_DEFAULT_DENSE_INDEX_TYPE int
#define EIGEN_USE_GPU
#include "main.h" #include "main.h"
#include "gpu_common.h" #include "gpu_common.h"

3
test/gpu_common.h
View File

@ -12,9 +12,6 @@
#include <iostream> #include <iostream>
#define EIGEN_USE_GPU
#include <unsupported/Eigen/CXX11/src/Tensor/TensorGpuHipCudaDefines.h>
#if !defined(__CUDACC__) && !defined(__HIPCC__) #if !defined(__CUDACC__) && !defined(__HIPCC__)
dim3 threadIdx, blockDim, blockIdx; dim3 threadIdx, blockDim, blockIdx;
#endif #endif

1
test/gpu_example.cu
View File

@ -9,6 +9,7 @@
// The following is an example GPU test. // The following is an example GPU test.
#define EIGEN_USE_GPU
#include "main.h" // Include the main test utilities. #include "main.h" // Include the main test utilities.
// Define a kernel functor. // Define a kernel functor.

5
test/gpu_test_helper.h
View File

@ -3,11 +3,6 @@
#include <Eigen/Core> #include <Eigen/Core>
#ifdef EIGEN_GPUCC
#define EIGEN_USE_GPU
#include "../unsupported/Eigen/CXX11/src/Tensor/TensorGpuHipCudaDefines.h"
#endif // EIGEN_GPUCC
// std::tuple cannot be used on device, and there is a bug in cuda < 9.2 that // std::tuple cannot be used on device, and there is a bug in cuda < 9.2 that
// doesn't allow std::tuple to compile for host code either. In these cases, // doesn't allow std::tuple to compile for host code either. In these cases,
// use our custom implementation. // use our custom implementation.

2
test/half_float.cpp
View File

@ -9,8 +9,6 @@
#include "main.h" #include "main.h"
#include <Eigen/src/Core/arch/Default/Half.h>
#define VERIFY_HALF_BITS_EQUAL(h, bits) \ #define VERIFY_HALF_BITS_EQUAL(h, bits) \
VERIFY_IS_EQUAL((numext::bit_cast<numext::uint16_t>(h)), (static_cast<numext::uint16_t>(bits))) VERIFY_IS_EQUAL((numext::bit_cast<numext::uint16_t>(h)), (static_cast<numext::uint16_t>(bits)))

1
test/incomplete_cholesky.cpp
View File

@ -10,7 +10,6 @@
// #define EIGEN_MAX_ALIGN_BYTES 0 // #define EIGEN_MAX_ALIGN_BYTES 0
#include "sparse_solver.h" #include "sparse_solver.h"
#include <Eigen/IterativeLinearSolvers> #include <Eigen/IterativeLinearSolvers>
#include <unsupported/Eigen/IterativeSolvers>
template<typename T, typename I_> void test_incomplete_cholesky_T() template<typename T, typename I_> void test_incomplete_cholesky_T()
{ {

2
test/sparse.h
View File

@ -152,6 +152,4 @@ initSparse(double density,
} }
} }
#include <unsupported/Eigen/SparseExtra>
#endif // EIGEN_TESTSPARSE_H #endif // EIGEN_TESTSPARSE_H

1
test/sparselu.cpp
View File

@ -17,7 +17,6 @@
#include "sparse_solver.h" #include "sparse_solver.h"
#include <Eigen/SparseLU> #include <Eigen/SparseLU>
#include <unsupported/Eigen/SparseExtra>
template<typename T> void test_sparselu_T() template<typename T> void test_sparselu_T()
{ {

2
unsupported/test/sparse_extra.cpp
View File

@ -7,7 +7,7 @@
// Public License v. 2.0. If a copy of the MPL was not distributed // 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/. // with this file, You can obtain one at http://mozilla.org/MPL/2.0/.
#include "sparse_product.cpp" #include "sparse.h"
#ifdef min #ifdef min
#undef min #undef min