Complete the deprecation of duplicated hpp headers #793
Conversation
|
This is a follow up to #524 I am note sure that I understood the rationale for duplicating some files and not duplicating others. In any case, I think it would be wise to make sure that there is only one header that contains the actual code. The risk of the .cuh and .hpp headers diverging is quite real. I for one did not know we had full code duplication in some (i.e. 83) headers. |
ahendriksen
force-pushed
the
deprecate-hpp
branch
from
c614275 to
d1d71be
Compare
|
@ahendriksen this is definitely a welcome change. Thank you for doing this! When the original headers were duplicated, we weren't expecting for them to stick around as long as they have. @lowener has graciously started reconciling the raft includes in cuml and related libs so that we can remove the additional headers as a next step. |
|
NB: cpp/include/raft/spatial/knn/detail/processing.hpp is one exception where we currently need both |
|
@achirkin : I will roll back the removal of |
Replace #include <path.hpp> with #include <path.cuh> if possible. This should reduce the number of deprecation warnings.
Replace all .hpp headers that have a .cuh header in the same directory with the
same name by a simple include of the cuh header and a pragma warning of
deprecation.
This change hopefully prevents future head scratching when changes in a
file are seemingly not picked up by the compiler..
Care has been taken to copy the right start year for the copyright line.
Copyright lines have been updated to 2022 when necessary.
The following template has been used for the .hpp header replacement
text:
------------------------------------------------------------
* %%COPYRIGHT_LINE%%
*
* [... snip license .. ]
*/
/**
* This file is deprecated and will be removed in release 22.06.
* Please use the cuh version instead.
*/
/**
* DISCLAIMER: this file is deprecated: use %%CUH_FILE%% instead
*/
" is deprecated and will be removed in a future release." \
" Please use the cuh version instead.")
------------------------------------------------------------
|
No, it's not really a part of the external interface, but it's a member of a struct which is currently public but should be deprecated and removed at some point (https://github.com/rapidsai/raft/blob/branch-22.10/cpp/include/raft/spatial/knn/ann_common.h#L40) |
ahendriksen
force-pushed
the
deprecate-hpp
branch
from
db2a0d2 to
972597e
Compare
|
I found the following files to have non-trivial diffs: Repushing. |
ahendriksen
added
3 - Ready for Review
improvement
|
@cjnolet Tamas and Artem have taken a look and I have taken their feedback into account. There are three files where this PR is non-trivial: Could you have a look? (no rush, just an update) |
|
@gpucibot merge |
Replace all .hpp headers that have a .cuh header in the same directory with the
same name by a simple include of the cuh header and a pragma warning of
deprecation.
This change hopefully prevents future head scratching when changes in a
file are seemingly not picked up by the compiler..
Care has been taken to copy the right start year for the copyright line.
Copyright lines have been updated to 2022 when necessary.
The following template has been used for the .hpp header replacement
text: