Skip to content

Commit

Permalink
Merge pull request #110 from krasznaa/EigenCudaWindowsWarnings-main-2…
Browse files Browse the repository at this point in the history
…0231009

Silence Eigen Warnings From CUDA on Windows, main branch (2023.10.09.)
  • Loading branch information
beomki-yeo authored Oct 9, 2023
2 parents b1cf07b + 9bdbdc8 commit 61c2cd2
Show file tree
Hide file tree
Showing 5 changed files with 40 additions and 3 deletions.
7 changes: 7 additions & 0 deletions math/eigen/include/algebra/math/impl/eigen_getter.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,17 @@
#ifdef _MSC_VER
#pragma warning(push, 0)
#endif // MSVC
#ifdef __NVCC_DIAG_PRAGMA_SUPPORT__
#pragma nv_diagnostic push
#pragma nv_diag_suppress 20012
#endif // __NVCC_DIAG_PRAGMA_SUPPORT__
#include <Eigen/Core>
#ifdef _MSC_VER
#pragma warning(pop)
#endif // MSVC
#ifdef __NVCC_DIAG_PRAGMA_SUPPORT__
#pragma nv_diagnostic pop
#endif // __NVCC_DIAG_PRAGMA_SUPPORT__

// System include(s).
#include <type_traits>
Expand Down
7 changes: 7 additions & 0 deletions math/eigen/include/algebra/math/impl/eigen_matrix.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,17 @@
#ifdef _MSC_VER
#pragma warning(push, 0)
#endif // MSVC
#ifdef __NVCC_DIAG_PRAGMA_SUPPORT__
#pragma nv_diagnostic push
#pragma nv_diag_suppress 20012
#endif // __NVCC_DIAG_PRAGMA_SUPPORT__
#include <Eigen/Core>
#ifdef _MSC_VER
#pragma warning(pop)
#endif // MSVC
#ifdef __NVCC_DIAG_PRAGMA_SUPPORT__
#pragma nv_diagnostic pop
#endif // __NVCC_DIAG_PRAGMA_SUPPORT__

namespace algebra::eigen::matrix {

Expand Down
11 changes: 10 additions & 1 deletion math/eigen/include/algebra/math/impl/eigen_transform3.hpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/** Algebra plugins library, part of the ACTS project
*
* (c) 2020-2022 CERN for the benefit of the ACTS project
* (c) 2020-2023 CERN for the benefit of the ACTS project
*
* Mozilla Public License Version 2.0
*/
Expand All @@ -14,11 +14,20 @@
#ifdef _MSC_VER
#pragma warning(push, 0)
#endif // MSVC
#ifdef __NVCC_DIAG_PRAGMA_SUPPORT__
#pragma nv_diagnostic push
#pragma nv_diag_suppress 20011
#pragma nv_diag_suppress 20012
#pragma nv_diag_suppress 20014
#endif // __NVCC_DIAG_PRAGMA_SUPPORT__
#include <Eigen/Core>
#include <Eigen/Geometry>
#ifdef _MSC_VER
#pragma warning(pop)
#endif // MSVC
#ifdef __NVCC_DIAG_PRAGMA_SUPPORT__
#pragma nv_diagnostic pop
#endif // __NVCC_DIAG_PRAGMA_SUPPORT__

// System include(s).
#include <type_traits>
Expand Down
9 changes: 8 additions & 1 deletion math/eigen/include/algebra/math/impl/eigen_vector.hpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/** Algebra plugins library, part of the ACTS project
*
* (c) 2020-2022 CERN for the benefit of the ACTS project
* (c) 2020-2023 CERN for the benefit of the ACTS project
*
* Mozilla Public License Version 2.0
*/
Expand All @@ -14,10 +14,17 @@
#ifdef _MSC_VER
#pragma warning(push, 0)
#endif // MSVC
#ifdef __NVCC_DIAG_PRAGMA_SUPPORT__
#pragma nv_diagnostic push
#pragma nv_diag_suppress 20012
#endif // __NVCC_DIAG_PRAGMA_SUPPORT__
#include <Eigen/Core>
#ifdef _MSC_VER
#pragma warning(pop)
#endif // MSVC
#ifdef __NVCC_DIAG_PRAGMA_SUPPORT__
#pragma nv_diagnostic pop
#endif // __NVCC_DIAG_PRAGMA_SUPPORT__

namespace algebra::eigen::math {

Expand Down
9 changes: 8 additions & 1 deletion storage/eigen/include/algebra/storage/impl/eigen_array.hpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/** Algebra plugins library, part of the ACTS project
*
* (c) 2020-2022 CERN for the benefit of the ACTS project
* (c) 2020-2023 CERN for the benefit of the ACTS project
*
* Mozilla Public License Version 2.0
*/
Expand All @@ -11,10 +11,17 @@
#ifdef _MSC_VER
#pragma warning(push, 0)
#endif // MSVC
#ifdef __NVCC_DIAG_PRAGMA_SUPPORT__
#pragma nv_diagnostic push
#pragma nv_diag_suppress 20012
#endif // __NVCC_DIAG_PRAGMA_SUPPORT__
#include <Eigen/Core>
#ifdef _MSC_VER
#pragma warning(pop)
#endif // MSVC
#ifdef __NVCC_DIAG_PRAGMA_SUPPORT__
#pragma nv_diagnostic pop
#endif // __NVCC_DIAG_PRAGMA_SUPPORT__

// System include(s).
#include <cstddef>
Expand Down

0 comments on commit 61c2cd2

Please sign in to comment.