-
-
Notifications
You must be signed in to change notification settings - Fork 4.7k
Split point_types.hpp part into field_traits.(h|hpp)
#6375
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.
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
Split point_types.hpp part into field_traits.(h|hpp)
#6375
Conversation
* Move `(H|h)as_` traits from `point_types.hpp` into `field_traits.(h|hpp)` * Add `field_traits.h` include where field traits are used * Change a MSVC compiler warning reset via `#pragma warning((push|pop))` * Add `field_traits.h` include in `point_types.h` for backward compatibility Signed-off-by: Ramir Sultanov <sumir0@proton.me>
point_types.hpp part into field_traits.(h|hpp)point_types.hpp part into field_traits.(h|hpp)
|
Also may fix #5040 |
|
Based on #6367 |
Signed-off-by: Ramir Sultanov <sumir0@proton.me>
Signed-off-by: Ramir Sultanov <sumir0@proton.me>
|
I will try to build manually with Edit: Compilation finished successfully. |
point_types.hpp part into field_traits.(h|hpp)point_types.hpp part into field_traits.(h|hpp)
* Remove unnecessary `pcl/point_types.h` includes in some files * Add missing `pcl/point_types.h` includes in some files Signed-off-by: Ramir Sultanov <sumir0@proton.me>
* Change license description in `pcl/field_traits.(h|hpp)` Signed-off-by: Ramir Sultanov <sumir0@proton.me>
* Add missing `pcl/point_types.h` includes in `examples` Signed-off-by: Ramir Sultanov <sumir0@proton.me>
point_types.hpp part into field_traits.(h|hpp)point_types.hpp part into field_traits.(h|hpp)
* Add missing `pcl/point_types.h` includes in some files Signed-off-by: Ramir Sultanov <sumir0@proton.me>
Add missing `cstring` include in `common/include/pcl/common/impl/copy_point.hpp` Signed-off-by: Ramir Sultanov <sumir0@proton.me>
|
For a moment I thought I was going under some water here... Phew, it was close! Excuse me for informality. As the pipelines are passing it seems that we are good to go (or maybe not, because there are still some files for which it would be nice to add missing includes, but they can be added in other PRs, possibly) |
point_types.hpp part into field_traits.(h|hpp)point_types.hpp part into field_traits.(h|hpp)
|
I tried it on windows yesterday and noticed a lot of: no suitable definition provided for explicit template instantiation request. I haven't quite figured out why its not provided, but we should look into it before merging. |
|
Oh, nice catch! @larshg As far as I understand these warnings were disabled by
But Therefore, in the translation units where |
|
Ahh, yes. And it doesn't seem to be worth looking into fixing that warning, so we just need to include pcl_macros.h accordingly? |
|
Hmm. Disabling warnings in a header file (without returning to the state before the disabling) will affect warnings in user code which includes (directly or transitively) that header. Would it not be better to disable project scope warnings using a build system (in our case CMake)? |
I suppose we could try disabling that warning here: https://github.com/PointCloudLibrary/pcl/blob/master/CMakeLists.txt#L190 |
Looks like a good place, if you ask me! Though, there is still a room for improvement. For example,
I assume |
|
You are right, there is definitely CMake code within PCL that could be modernized or improved. @larshg has already improved a lot of CMake code, and is still working on that topic, I believe. However, that is often a bit risky because after a change it can be difficult to verify that everything still works as expected (on all OS, compilers, user projects, etc). Anyway, in this pull request, I would prefer to minimize changes to the CMake code to what is strictly necessary, and perhaps discuss switching to I also did a test: I changed pcl_macros.h so warning 4661 is not disabled, and when building a project that uses PCL, I did not see any warning of that kind coming from PCL headers. So that might not be a problem after all. If we find out later that it is a problem, we might look here and consider replacing So, my suggestions to get this pull request ready for merging soon:
Sounds good? |
|
No worries! I am genuinely grateful that PCL exists in the state it is now. ...Thanks to the maintainers, contributors, and others (whose work many of us might not really see). And well done with the test, @mvieth! I am planning on working on the changes you suggested at the end of this week. But let me know if you need the changes sooner, I will see what I can do. |
That is perfectly fine, we are not in a hurry 😄 |
* Add 4661 MSVC warning configuration in CMake * Remove 4661 MSVC warning configuration from `pcl_macros.h` * Remove unused `type_traits` include from `point_types.hpp` * Use `Eigen::Map` in `boundary.h` Signed-off-by: Ramir Sultanov <sumir0@proton.me>
I don't see |
I still see 4267 and 4244 warnings, for these we should probably do the same thing (not disable in pcl_macros.h, instead disable in CMakeLists.txt). |
* Add 4244 and 4267 MSVC warnings configuration in CMake * Remove 4244 and 4267 MSVC warnings configuration from `pcl_macros.h` Signed-off-by: Ramir Sultanov <sumir0@proton.me>
|
I also did see other warnings in the pipelines of 61492b6; please, note:
I can see these warnings in a recent build in another pull request, therefore I assume we can leave them as they were in this pull request |
mvieth
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good to me, thank you!
|
|
||
| #pragma once | ||
|
|
||
| // For backward-compatibility field traits should be imported in this header |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should we add a note when this should be removed and be default?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I am not sure we can remove the include in the future? I certainly would not remove it before having a compiler warning (like a deprecation warning) for several PCL versions. The warning would have to be displayed if code uses something from pcl/field_traits.h but does not include pcl/field_traits.h directly, only via pcl/point_types.h. No warning should be displayed if nothing from pcl/field_traits.h is used, or if pcl/field_traits.h is included directly. I think that is very difficult to implement, so I am fine with keeping the pcl/field_traits.h include here forever (unless we find a solution for a compiler warning in the future).
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I guess its not that easy no.
Could we add a general deprecation warning/info that says some functions/defines will move to field_traits and make it possible to silence it with a #define in user code?
Else this optimization would hardly be used by anyone?
How do you "enable" it now - set a #define before including the header?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You mean adding a preprocessor warning just before #include <pcl/field_traits.h>, telling users they can silence the warning by adding #define PCL_OPTIMIZE_IMPORTS_FIELD_TRAITS at the top of their code? Might be an option, but feels too invasive in my opinion because everyone would see that warning, not only people who use something from field_traits.h. If we just want people to be aware that this optimization exists, we can advertise PCL_OPTIMIZE_IMPORTS_FIELD_TRAITS e.g. in the release notes. But if we plan to remove #include <pcl/field_traits.h> from point_types.h in the long term, I would rather try to find a way to show a compiler warning only to those who use something from field_traits.h.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Okay, here is another idea:
- define some special preprocessor symbol in point_types.h, just before including field_traits.h, let's say
PCL_POINT_TYPES_INCLUDES_FIELD_TRAITS - Add something like this in field_traits.h:
#ifdef PCL_POINT_TYPES_INCLUDES_FIELD_TRAITS
#define PCL_MAYBE_DEPRECATED [[deprecated("Include <pcl/field_traits.h> before including <pcl/point_types.h>")]] // Alternatively PCL_DEPRECATED(...) macro here?
#else
#define PCL_MAYBE_DEPRECATED
#endif
- Mark all structs etc. is field_traits.h and field_traits.hpp with
PCL_MAYBE_DEPRECATED. The message should make it clear that the struct/whatever is actually not deprecated, but that the user must include field_traits.h directly.
This should work right? We have done something roughly similar here: #5796
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think we can do that. But the constraint that pcl/field_traits.h has to be included before pcl/point_types.h bothers me a little bit, to be honest. And I don't have a solution for it. Maybe we can do the deprecation in another PR later?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think we can do that. But the constraint that
pcl/field_traits.hhas to be included beforepcl/point_types.hbothers me a little bit, to be honest. And I don't have a solution for it.
True, that is not optimal. At least it would be in alphabetical order 😄 Also, users could #define PCL_OPTIMIZE_IMPORTS_FIELD_TRAITS at the top of their code and then be free to include field_traits.h and point_types.h in any order they like.
Maybe we can do the deprecation in another PR later?
I would be fine with that.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I would be fine with that.
Thank you, I am simply hoping that some idea will strike me (or maybe you). But I don't want to keep you waiting, feel free to do it by yourself or to ask me to do it.
After all the alphabetical requirement is not intended to be permanent
* Use `Eigen::Map` in `rift.hpp` * Add missing `pcl/point_types.h` includes in tests where `rift.h` is used Signed-off-by: Ramir Sultanov <sumir0@proton.me>
a0fb9ab to
f8337dd
Compare
(H|h)as_traits frompoint_types.hppintofield_traits.(h|hpp)field_traits.hinclude where field traits are used#pragma warning((push|pop))field_traits.hinclude inpoint_types.hfor backward compatibilitycstringinclude inpcl/common/impl/copy_point.hpppcl_macros.htype_traitsinclude frompoint_types.hppEigen::Mapinboundary.handrift.hpppcl/point_types.hincludes in some filespcl/point_types.hincludes in some files