-
Notifications
You must be signed in to change notification settings - Fork 6
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* ci: upgrade image to ubuntu-22.04 * ci: temporary disable windows/osx jobs * ci: provide ANDROID_NDK_HOME * run debug mode to detect compiler * [eigen3] sync port with microsoft/vcpkg * disable fortran in android * Revert "ci: temporary disable windows/osx jobs" This reverts commit 6e45c10. * ci: remove log report
- Loading branch information
Showing
7 changed files
with
103 additions
and
15 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,26 @@ | ||
diff --git a/Eigen/src/Core/PartialReduxEvaluator.h b/Eigen/src/Core/PartialReduxEvaluator.h | ||
index 29abf35..4051fcf 100644 | ||
--- a/Eigen/src/Core/PartialReduxEvaluator.h | ||
+++ b/Eigen/src/Core/PartialReduxEvaluator.h | ||
@@ -54,12 +54,19 @@ struct packetwise_redux_traits | ||
/* Value to be returned when size==0 , by default let's return 0 */ | ||
template<typename PacketType,typename Func> | ||
EIGEN_DEVICE_FUNC | ||
-PacketType packetwise_redux_empty_value(const Func& ) { return pset1<PacketType>(0); } | ||
+PacketType packetwise_redux_empty_value(const Func& ) { | ||
+ const typename unpacket_traits<PacketType>::type zero(0); | ||
+ return pset1<PacketType>(zero); | ||
+} | ||
+ | ||
|
||
/* For products the default is 1 */ | ||
template<typename PacketType,typename Scalar> | ||
EIGEN_DEVICE_FUNC | ||
-PacketType packetwise_redux_empty_value(const scalar_product_op<Scalar,Scalar>& ) { return pset1<PacketType>(1); } | ||
+PacketType packetwise_redux_empty_value(const scalar_product_op<Scalar,Scalar>& ) { | ||
+ return pset1<PacketType>(Scalar(1)); | ||
+} | ||
+ | ||
|
||
/* Perform the actual reduction */ | ||
template<typename Func, typename Evaluator, |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,37 @@ | ||
diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
index f3e69b845..12fb2188d 100644 | ||
--- a/CMakeLists.txt | ||
+++ b/CMakeLists.txt | ||
@@ -66,12 +66,14 @@ option(EIGEN_TEST_CXX11 "Enable testing with C++11 and C++11 features (e.g. Tens | ||
|
||
|
||
macro(ei_add_cxx_compiler_flag FLAG) | ||
+ if(FALSE) # Since eigen3 is header only and vcpkg does not build tests this can be disabled by default. | ||
string(REGEX REPLACE "-" "" SFLAG1 ${FLAG}) | ||
string(REGEX REPLACE "\\+" "p" SFLAG ${SFLAG1}) | ||
check_cxx_compiler_flag(${FLAG} COMPILER_SUPPORT_${SFLAG}) | ||
if(COMPILER_SUPPORT_${SFLAG}) | ||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${FLAG}") | ||
endif() | ||
+ endif() | ||
endmacro() | ||
|
||
check_cxx_compiler_flag("-std=c++11" EIGEN_COMPILER_SUPPORT_CPP11) | ||
@@ -142,7 +144,7 @@ endif() | ||
|
||
set(EIGEN_TEST_MAX_SIZE "320" CACHE STRING "Maximal matrix/vector size, default is 320") | ||
|
||
-if(NOT MSVC) | ||
+if(NOT MSVC AND FALSE) | ||
# We assume that other compilers are partly compatible with GNUCC | ||
|
||
# clang outputs some warnings for unknown flags that are not caught by check_cxx_compiler_flag | ||
@@ -330,7 +332,7 @@ if(NOT MSVC) | ||
endif() | ||
endif() | ||
|
||
-else() | ||
+elseif(FALSE) | ||
|
||
# C4127 - conditional expression is constant | ||
# C4714 - marked as __forceinline not inlined (I failed to deactivate it selectively) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters