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.

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

Use same .clang-format in cuDF JNI #15557

Merged
merged 4 commits into from
Apr 18, 2024

Conversation

bdice
Copy link
Contributor

@bdice bdice commented Apr 17, 2024

Description

Closes #15546.

Currently cuDF JNI uses its own .clang-format settings. These settings organize includes differently than the rest of the cuDF C++ codebase, so we would like to align them.

This PR removes the JNI's custom .clang-format and instead uses the same settings as the rest of cuDF.

Checklist

  • I am familiar with the Contributing Guidelines.
  • New or existing tests cover these changes.
  • The documentation is up to date with these changes.

@bdice bdice requested a review from a team as a code owner April 17, 2024 21:01
@github-actions github-actions bot added the Java Affects Java cuDF API. label Apr 17, 2024
@bdice bdice self-assigned this Apr 17, 2024
@bdice bdice added improvement Improvement / enhancement to an existing function non-breaking Non-breaking change labels Apr 17, 2024
Copy link
Contributor

@ttnghia ttnghia left a comment

Choose a reason for hiding this comment

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

Do we have CI style check for the java folder?

@bdice
Copy link
Contributor Author

bdice commented Apr 18, 2024

Do we have CI style check for the java folder?

The changes in this PR were enforced by pre-commit, so I’d say yes.

Copy link
Member

@harrism harrism left a comment

Choose a reason for hiding this comment

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

Thank you @bdice!

@harrism
Copy link
Member

harrism commented Apr 18, 2024

JNI compilation errors are due to the reordering exposing cases where files did not IWYU. e.g.

In file included from /__w/cudf/cudf/java/src/main/native/src/CompiledExpression.cpp:18:
     [exec] /__w/cudf/cudf/java/src/main/native/src/jni_compiled_expr.hpp:36:37: error: 'ast' is not a member of 'cudf'; did you mean 'cudf::jni::ast'?

This file uses libcudf AST types without a corresponding include.

@bdice
Copy link
Contributor Author

bdice commented Apr 18, 2024

/merge

@rapids-bot rapids-bot bot merged commit ae9e552 into rapidsai:branch-24.06 Apr 18, 2024
79 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
improvement Improvement / enhancement to an existing function Java Affects Java cuDF API. non-breaking Non-breaking change
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[BUG] cuDF JNI should use the same .clang-format as the rest of cuDF
3 participants