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

Merge branch-24.12 into main #2672

Closed
wants to merge 172 commits into from
Closed

Merge branch-24.12 into main #2672

wants to merge 172 commits into from

Conversation

nvauto
Copy link
Collaborator

@nvauto nvauto commented Dec 10, 2024

Change version to 24.12.0

Note: merge this PR with Create a merge commit to merge

Change submodule to 24.12.0-SNAPSHOT

Signed-off-by: nvauto <[email protected]>
Signed-off-by: spark-rapids automation <[email protected]>
[auto-merge] bot-auto-merge-branch-24.10 to branch-24.12 [skip ci] [bot]
Signed-off-by: spark-rapids automation <[email protected]>
[auto-merge] bot-auto-merge-branch-24.10 to branch-24.12 [skip ci] [bot]
Signed-off-by: spark-rapids automation <[email protected]>
[auto-merge] bot-auto-merge-branch-24.10 to branch-24.12 [skip ci] [bot]
Signed-off-by: spark-rapids automation <[email protected]>
[auto-merge] bot-auto-merge-branch-24.10 to branch-24.12 [skip ci] [bot]
Signed-off-by: spark-rapids automation <[email protected]>
[auto-merge] bot-auto-merge-branch-24.10 to branch-24.12 [skip ci] [bot]
Signed-off-by: spark-rapids automation <[email protected]>
[auto-merge] bot-auto-merge-branch-24.10 to branch-24.12 [skip ci] [bot]
Signed-off-by: spark-rapids automation <[email protected]>
[auto-merge] bot-auto-merge-branch-24.10 to branch-24.12 [skip ci] [bot]
Signed-off-by: spark-rapids automation <[email protected]>
[auto-merge] bot-auto-merge-branch-24.10 to branch-24.12 [skip ci] [bot]
Signed-off-by: spark-rapids automation <[email protected]>
[auto-merge] bot-auto-merge-branch-24.10 to branch-24.12 [skip ci] [bot]
Signed-off-by: spark-rapids automation <[email protected]>
[auto-merge] bot-auto-merge-branch-24.10 to branch-24.12 [skip ci] [bot]
nvauto and others added 17 commits November 21, 2024 00:26
…p ci] [bot] (#2612)

* Update submodule cudf to 3111aa4723150cb09b88c6968a51afb681b1ab6a

Signed-off-by: spark-rapids automation <[email protected]>

* Update submodule cudf to be9ba6c4d999fca1588f845b825d26e79cece621

Signed-off-by: spark-rapids automation <[email protected]>

---------

Signed-off-by: spark-rapids automation <[email protected]>
* add excludes, skip for special pr

Signed-off-by: YanxuanLiu <[email protected]>

* change depth

Signed-off-by: YanxuanLiu <[email protected]>

* dynamic depth

Signed-off-by: YanxuanLiu <[email protected]>

* depth

Signed-off-by: YanxuanLiu <[email protected]>

* test

Signed-off-by: YanxuanLiu <[email protected]>

* test

Signed-off-by: YanxuanLiu <[email protected]>

* test

Signed-off-by: YanxuanLiu <[email protected]>

* +10 depth

Signed-off-by: YanxuanLiu <[email protected]>

* remove useless changes

* remove space line

Signed-off-by: YanxuanLiu <[email protected]>

* Update license-header-check.yml

* Update license-header-check.yml format

* check title contains bot

Signed-off-by: YanxuanLiu <[email protected]>

* contains issueg

Signed-off-by: YanxuanLiu <[email protected]>

---------

Signed-off-by: YanxuanLiu <[email protected]>
…p ci] [bot] (#2618)

* Update submodule cudf to 0d9e577ccaab0d72f1b216fbe068afd7a0fd887e

Signed-off-by: spark-rapids automation <[email protected]>

* Update pinned versions for cudf 0d9e577ccaab0d72f1b216fbe068afd7a0fd887e

Signed-off-by: spark-rapids automation <[email protected]>

---------

Signed-off-by: spark-rapids automation <[email protected]>
* Implement `castStringsToBooleans`

Signed-off-by: Nghia Truong <[email protected]>

* Implement `removeQuotes`

Signed-off-by: Nghia Truong <[email protected]>

* Rewrite using offsets and chars

Signed-off-by: Nghia Truong <[email protected]>

* Fix empty input

Signed-off-by: Nghia Truong <[email protected]>

* Misc

Signed-off-by: Nghia Truong <[email protected]>

* Add `nullifyIfNotQuoted` option for `removeQuotes`

Signed-off-by: Nghia Truong <[email protected]>

* Implement `castStringsToDecimals`

Signed-off-by: Nghia Truong <[email protected]>

* Implement `removeQuotesForFloats`

Signed-off-by: Nghia Truong <[email protected]>

* Fix `removeQuotesForFloats`

Signed-off-by: Nghia Truong <[email protected]>

* Implement `castStringsToIntegers`

Signed-off-by: Nghia Truong <[email protected]>

* Implement non-legacy `castStringsToDates`

Signed-off-by: Nghia Truong <[email protected]>

* WIP for `cast_strings_to_dates_legacy`

Signed-off-by: Nghia Truong <[email protected]>

* Revert "WIP for `cast_strings_to_dates_legacy`"

This reverts commit dcb463e.

* Fix compile issues

Signed-off-by: Nghia Truong <[email protected]>

* WIP: Implement `from_json_to_structs`

Signed-off-by: Nghia Truong <[email protected]>

* Fix cmake

Signed-off-by: Nghia Truong <[email protected]>

* Fix compile issues

Signed-off-by: Nghia Truong <[email protected]>

* Implement `castStringsToFloats`

Signed-off-by: Nghia Truong <[email protected]>

* WIP

Signed-off-by: Nghia Truong <[email protected]>

* WIP: Implementing `fromJSONToStructs`

Signed-off-by: Nghia Truong <[email protected]>

* Fix compile errors

Signed-off-by: Nghia Truong <[email protected]>

* Cleanup

Signed-off-by: Nghia Truong <[email protected]>

* Revert code as we still need them

* Add error check

Signed-off-by: Nghia Truong <[email protected]>

* Add more comments

Signed-off-by: Nghia Truong <[email protected]>

* Cleanup

Signed-off-by: Nghia Truong <[email protected]>

* Return as-is if the column is date/time

Signed-off-by: Nghia Truong <[email protected]>

* Update test

Signed-off-by: Nghia Truong <[email protected]>

* Update cudf

Signed-off-by: Nghia Truong <[email protected]>

* Revert "Update cudf"

This reverts commit 5d07db1.

* Update cudf

* Update cudf

* Change header

* Rewrite JSONUtils.cpp

* Implement a common function for converting column

Signed-off-by: Nghia Truong <[email protected]>

* Rewrite `convert_data_type`

Signed-off-by: Nghia Truong <[email protected]>

* Remove `cast_strings_to_dates`

Signed-off-by: Nghia Truong <[email protected]>

* Implement `convert_data_type`

Signed-off-by: Nghia Truong <[email protected]>

* Fix compile errors

Signed-off-by: Nghia Truong <[email protected]>

* Add `CUDF_FUNC_RANGE();`

Signed-off-by: Nghia Truong <[email protected]>

* Fix schema

Signed-off-by: Nghia Truong <[email protected]>

* Complete `from_json_to_structs`

Signed-off-by: Nghia Truong <[email protected]>

* Fix null mask

Signed-off-by: Nghia Truong <[email protected]>

* Write Javadoc

Signed-off-by: Nghia Truong <[email protected]>

* Rewrite JNI

Signed-off-by: Nghia Truong <[email protected]>

* Remove deprecated function

Signed-off-by: Nghia Truong <[email protected]>

* Revert test

Signed-off-by: Nghia Truong <[email protected]>

* Remove header

Signed-off-by: Nghia Truong <[email protected]>

* Rewrite Javadoc

Signed-off-by: Nghia Truong <[email protected]>

* Rename variable

Signed-off-by: Nghia Truong <[email protected]>

* Rewrite docs

Signed-off-by: Nghia Truong <[email protected]>

* Revert test

Signed-off-by: Nghia Truong <[email protected]>

* Cleanup headers

Signed-off-by: Nghia Truong <[email protected]>

* Cleanup

Signed-off-by: Nghia Truong <[email protected]>

* Rewrite the conversion functions

Signed-off-by: Nghia Truong <[email protected]>

* Move code

Signed-off-by: Nghia Truong <[email protected]>

* Remove call to `make_structs_column`

Signed-off-by: Nghia Truong <[email protected]>

* Cleanup

Signed-off-by: Nghia Truong <[email protected]>

* Optimize conversion further, avoiding to materialize column if not needed

Signed-off-by: Nghia Truong <[email protected]>

* Rewrite docs and change function name

Signed-off-by: Nghia Truong <[email protected]>

* Reorganize code

Signed-off-by: Nghia Truong <[email protected]>

* Handle schema mismatching

Signed-off-by: Nghia Truong <[email protected]>

* Add test

Signed-off-by: Nghia Truong <[email protected]>

* Add another test

Signed-off-by: Nghia Truong <[email protected]>

* Revert "Add another test"

This reverts commit 8a17651.

* Fix schema mismatch

Signed-off-by: Nghia Truong <[email protected]>

* Cleanup

Signed-off-by: Nghia Truong <[email protected]>

* Add another test

Signed-off-by: Nghia Truong <[email protected]>

* Revert "Add another test"

This reverts commit cf9d6bf.

* Revert "Add test"

This reverts commit 553d7d0.

Signed-off-by: Nghia Truong <[email protected]>

* Add prefix `spark_rapids_jni::`

Signed-off-by: Nghia Truong <[email protected]>

* Remove handling for schema mismatching

Signed-off-by: Nghia Truong <[email protected]>

* Avoid materializing a column when converting strings

Signed-off-by: Nghia Truong <[email protected]>

* Revert "Remove handling for schema mismatching"

This reverts commit d2b6fb5.

* Fix handling for schema mismatching in case of `column_view` input

Signed-off-by: Nghia Truong <[email protected]>

---------

Signed-off-by: Nghia Truong <[email protected]>
* Add HiveHash support for nested types

Signed-off-by: ustcfy <[email protected]>

* Fix minor details

Signed-off-by: ustcfy <[email protected]>

* Rename class member variables

Signed-off-by: ustcfy <[email protected]>

* Update src/main/cpp/src/hive_hash.cu

Co-authored-by: Nghia Truong <[email protected]>

* Fix stack_wrapper alignment

Signed-off-by: Yan Feng <[email protected]>

* Refactor variable names for better understanding

Signed-off-by: Yan Feng <[email protected]>

* Optimize computation for single-level lists

Signed-off-by: Yan Feng <[email protected]>

* Update src/main/cpp/src/hive_hash.cu

Co-authored-by: Nghia Truong <[email protected]>

* Update src/main/cpp/src/hive_hash.cu

Co-authored-by: Nghia Truong <[email protected]>

* Update src/main/cpp/src/hive_hash.cu

Co-authored-by: Nghia Truong <[email protected]>

* Update src/main/cpp/src/hive_hash.cu

Co-authored-by: Nghia Truong <[email protected]>

* Update src/main/cpp/src/hive_hash.cu

Co-authored-by: Nghia Truong <[email protected]>

* Update src/main/cpp/src/hive_hash.cu

Co-authored-by: Nghia Truong <[email protected]>

* Update src/main/cpp/src/hive_hash.cu

Co-authored-by: Nghia Truong <[email protected]>

* Update src/main/cpp/src/hive_hash.cu

Co-authored-by: Nghia Truong <[email protected]>

* Update src/main/cpp/src/hive_hash.cu

Co-authored-by: Nghia Truong <[email protected]>

* Update src/main/cpp/src/hive_hash.cu

Co-authored-by: Nghia Truong <[email protected]>

* Fix minor details

Signed-off-by: Yan Feng <[email protected]>

* Format C++ code

Signed-off-by: Yan Feng <[email protected]>

* Update copyright

Signed-off-by: Yan Feng <[email protected]>

* Update src/main/cpp/src/hive_hash.cu

Co-authored-by: Nghia Truong <[email protected]>

* Update src/main/cpp/src/hive_hash.cu

Co-authored-by: Nghia Truong <[email protected]>

* Update src/main/cpp/src/hive_hash.cu

Co-authored-by: Nghia Truong <[email protected]>

* Update src/main/cpp/src/hive_hash.cu

Co-authored-by: Nghia Truong <[email protected]>

* Primitive types do not enter the stack

Signed-off-by: Yan Feng <[email protected]>

---------

Signed-off-by: ustcfy <[email protected]>
Signed-off-by: Yan Feng <[email protected]>
Co-authored-by: Nghia Truong <[email protected]>
@YanxuanLiu
Copy link
Collaborator

build

@pxLi
Copy link
Collaborator

pxLi commented Dec 10, 2024

please never make header updates directly in merge to main, this should also be merged into 24.12 and 25.02
a0cfbf0

please make a change to branch-24.12 first, and then upmerge this PR thanks

Copy link
Collaborator

@YanxuanLiu YanxuanLiu left a comment

Choose a reason for hiding this comment

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

We added license header check github workflow in branch-24.12. It failed in https://github.com/NVIDIA/spark-rapids-jni/actions/runs/12251093908. Developers modified the files during branch-24.12 but did not update copyright header. Updated the copyright in a0cfbf0

Update: will update in feature branch first and merge into branch-24.12

@YanxuanLiu YanxuanLiu force-pushed the merge-branch-24.12-to-main branch from a0cfbf0 to f0baecb Compare December 10, 2024 07:38
@YanxuanLiu
Copy link
Collaborator

please never make header updates directly in merge to main, this should also be merged into 24.12 and 25.02 a0cfbf0

please make a change to branch-24.12 first, and then upmerge this PR thanks

Sure, I'll make the modification in feature branch first.

@YanxuanLiu
Copy link
Collaborator

Need to update copyright header first, will create another PR then.

@YanxuanLiu YanxuanLiu closed this Dec 10, 2024
@YanxuanLiu YanxuanLiu deleted the merge-branch-24.12-to-main branch December 10, 2024 07:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants