Skip to content

Removing __INTEL_COMPILER section from pragma block at the top of pybind11.h #3135

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
Jul 27, 2021
Merged

Removing __INTEL_COMPILER section from pragma block at the top of pybind11.h #3135

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
87b3181
Fixing `pragma warning pop` for `__INTEL_COMPILER`.
rwgk Jul 20, 2021
d7967a8
Adding push/pop to 3 tests. Removing #878 from top of pybind11.h (it …
rwgk Jul 20, 2021
894f6bf
Trying again after CI failure, moving the push to the top of 2 tests.
rwgk Jul 20, 2021
b978588
Trying more after CI failure, adding push/pop to pybind11_tests.h, co…
rwgk Jul 21, 2021
9415e38
Moving ICC #2196 suppression to CMakeLists.txt
rwgk Jul 22, 2021
ac0f078
Fixing condition for `pragma GCC diagnostic push` in pybind11.h
rwgk Jul 25, 2021
e3719a9
Moving `pragma warning disable 2196` to common.h
rwgk Jul 27, 2021
1f418c0
Revising #ifdef to be more conservative.
rwgk Jul 27, 2021
1e785bb
Undoing insertion of notes that will hopefully soon be completely obs…
rwgk Jul 27, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions include/pybind11/detail/common.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,9 @@
# elif __INTEL_COMPILER < 1900 && defined(PYBIND11_CPP14)
# error pybind11 supports only C++11 with Intel C++ compiler v18. Use v19 or newer for C++14.
# endif
/* The following pragma cannot be pop'ed:
https://community.intel.com/t5/Intel-C-Compiler/Inline-and-no-inline-warning/td-p/1216764 */
# pragma warning disable 2196 // warning #2196: routine is both "inline" and "noinline"
#elif defined(__clang__) && !defined(__apple_build_version__)
# if __clang_major__ < 3 || (__clang_major__ == 3 && __clang_minor__ < 3)
# error pybind11 requires clang 3.3 or newer
Expand Down
8 changes: 2 additions & 6 deletions include/pybind11/pybind11.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,12 @@

#pragma once

#if defined(__INTEL_COMPILER)
# pragma warning push
# pragma warning disable 878 // incompatible exception specifications
# pragma warning disable 2196 // warning #2196: routine is both "inline" and "noinline"
#elif defined(_MSC_VER)
#if defined(_MSC_VER) && !defined(__INTEL_COMPILER)
# pragma warning(push)
# pragma warning(disable: 4100) // warning C4100: Unreferenced formal parameter
# pragma warning(disable: 4127) // warning C4127: Conditional expression is constant
# pragma warning(disable: 4505) // warning C4505: 'PySlice_GetIndicesEx': unreferenced local function has been removed (PyPy only)
#elif defined(__GNUG__) && !defined(__clang__)
#elif defined(__GNUG__) && !defined(__clang__) && !defined(__INTEL_COMPILER)
# pragma GCC diagnostic push
# pragma GCC diagnostic ignored "-Wunused-but-set-parameter"
# pragma GCC diagnostic ignored "-Wattributes"
Expand Down
7 changes: 7 additions & 0 deletions tests/test_constants_and_functions.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,14 @@ TEST_SUBMODULE(constants_and_functions, m) {
;
m.def("f1", f1);
m.def("f2", f2);
#if defined(__INTEL_COMPILER)
# pragma warning push
# pragma warning disable 878 // incompatible exception specifications
#endif
m.def("f3", f3);
#if defined(__INTEL_COMPILER)
# pragma warning pop
#endif
m.def("f4", f4);

// test_function_record_leaks
Expand Down