Skip to content
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

Jump to bottom

Clean up C++ includes to use <> instead of "". #10658

Merged
merged 5 commits into from
Apr 14, 2022
Merged

Clean up C++ includes to use <> instead of "". #10658

merged 5 commits into from
Apr 14, 2022

Conversation

bdice
Copy link
Contributor

@bdice bdice commented Apr 14, 2022

This PR cleans up some C++ includes to use #include <...> instead of #include "..." where appropriate.

@bdice bdice self-assigned this Apr 14, 2022
@bdice bdice added code quality non-breaking Non-breaking change labels Apr 14, 2022
@github-actions github-actions bot added the libcudf Affects libcudf (C++/CUDA) code. label Apr 14, 2022
@bdice bdice added the improvement Improvement / enhancement to an existing function label Apr 14, 2022
@codecov
Copy link

codecov bot commented Apr 14, 2022 •
edited
Loading

Codecov Report

Merging #10658 (be6d008) into branch-22.06 (3c13ef1) will increase coverage by 0.03%.
The diff coverage is 89.52%.

@@               Coverage Diff                @@
##           branch-22.06   #10658      +/-   ##
================================================
+ Coverage         86.33%   86.37%   +0.03%     
================================================
  Files               140      142       +2     
  Lines             22289    22356      +67     
================================================
+ Hits              19244    19310      +66     
- Misses             3045     3046       +1
Impacted Files Coverage Δ
python/cudf/cudf/core/algorithms.py 90.47% <ø> (ø)
python/cudf/cudf/core/groupby/groupby.py 91.72% <ø> (+0.22%) ⬆️
python/cudf/cudf/core/multiindex.py 92.14% <ø> (ø)
python/cudf/cudf/core/series.py 95.28% <ø> (ø)
python/cudf/cudf/utils/cudautils.py 59.83% <ø> (ø)
python/cudf/cudf/utils/ioutils.py 79.60% <ø> (ø)
python/cudf/cudf/utils/utils.py 90.28% <ø> (ø)
python/cudf/cudf/core/frame.py 93.67% <56.52%> (-1.09%) ⬇️
python/dask_cudf/dask_cudf/tests/utils.py 90.90% <90.90%> (ø)
python/cudf/cudf/core/column/lists.py 92.79% <100.00%> (+1.38%) ⬆️
... and 12 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update ac27757...be6d008. Read the comment docs.

@bdice bdice marked this pull request as ready for review April 14, 2022 16:14
@bdice bdice requested a review from a team as a code owner April 14, 2022 16:14
@bdice bdice requested review from devavret and karthikeyann April 14, 2022 16:14
karthikeyann
karthikeyann reviewed Apr 14, 2022
View reviewed changes
Copy link
Contributor

@karthikeyann karthikeyann left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for doing this.
Is there any VS code settings available to default to <> instead of "" ?

cpp/tests/partitioning/partition_test.cpp Show resolved Hide resolved
@bdice
Copy link
Contributor Author

bdice commented Apr 14, 2022

Is there any VS code settings available to default to <> instead of "" ?

I'm not aware of a setting for that. I believe it is added by the clangd server and controlled by --header-inclusion, but there is no option listed here except to entirely disable automatic header inclusion: https://manpages.debian.org/experimental/clangd/clangd.1.en.html I typically catch these and fix them manually while preparing a git commit.

PointKernel
PointKernel reviewed Apr 14, 2022
View reviewed changes
cpp/tests/iterator/value_iterator_test_strings.cu Outdated Show resolved Hide resolved
cpp/benchmarks/string/convert_durations.cpp
Comment on lines +26 to +29
#include <benchmark/benchmark.h>

#include <benchmarks/fixture/benchmark_fixture.hpp>
#include <benchmarks/synchronization/synchronization.hpp>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
#include <benchmark/benchmark.h>
#include <benchmarks/fixture/benchmark_fixture.hpp>
#include <benchmarks/synchronization/synchronization.hpp>
#include <benchmarks/fixture/benchmark_fixture.hpp>
#include <benchmarks/synchronization/synchronization.hpp>
#include <benchmark/benchmark.h>

gbench header is "further" than local headers.

Copy link
Contributor

@karthikeyann karthikeyann Apr 14, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

gbench headers are not really needed when benchmarks/fixture/benchmark_fixture.hpp is included.
some files include it, some don't.
I am creating a cleanup PR for this. (#10661)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@karthikeyann How do you want to do the merge order? Should this PR go first? If so, can you approve?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this one should go first

@bdice bdice requested a review from PointKernel April 14, 2022 19:52
PointKernel
PointKernel approved these changes Apr 14, 2022
View reviewed changes
Copy link
Member

@PointKernel PointKernel left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@bdice
Copy link
Contributor Author

bdice commented Apr 14, 2022

@gpucibot merge

@rapids-bot rapids-bot bot merged commit 77fa49e into rapidsai:branch-22.06 Apr 14, 2022
@bdice bdice deleted the improve-includes branch April 14, 2022 21:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@PointKernel PointKernel PointKernel approved these changes

@karthikeyann karthikeyann karthikeyann approved these changes

@devavret devavret Awaiting requested review from devavret devavret is a code owner automatically assigned from rapidsai/cudf-cpp-codeowners

Assignees

@bdice bdice

Labels
improvement Improvement / enhancement to an existing function libcudf Affects libcudf (C++/CUDA) code. non-breaking Non-breaking change
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@bdice @karthikeyann @PointKernel