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

Merge branch-24.04 into main #6

Merged
merged 105 commits into from
Mar 8, 2024
Merged

Merge branch-24.04 into main #6

merged 105 commits into from
Mar 8, 2024

Conversation

NvTimLiu
Copy link
Owner

@NvTimLiu NvTimLiu commented Mar 7, 2024 •
edited
Loading

Change version to 24.04.0

nvauto and others added 30 commits January 24, 2024 09:19
@nvauto
Auto-merge use submodule in BASE ref
4c4c113 
Signed-off-by: spark-rapids automation <70000568+nvauto@users.noreply.github.com>
@nvauto
Merge pull request NVIDIA#1726 from NVIDIA/bot-auto-merge-branch-24.02
20219da 
[auto-merge] bot-auto-merge-branch-24.02 to branch-24.04 [skip ci] [bot]
@nvauto
Auto-merge use submodule in BASE ref
c019201 
Signed-off-by: spark-rapids automation <70000568+nvauto@users.noreply.github.com>
@nvauto
Merge pull request NVIDIA#1728 from NVIDIA/bot-auto-merge-branch-24.02
ed2fd45 
[auto-merge] bot-auto-merge-branch-24.02 to branch-24.04 [skip ci] [bot]
@nvauto
Auto-merge use submodule in BASE ref
de7bd34 
Signed-off-by: spark-rapids automation <70000568+nvauto@users.noreply.github.com>
@nvauto
Merge pull request NVIDIA#1730 from NVIDIA/bot-auto-merge-branch-24.02
adbb223 
[auto-merge] bot-auto-merge-branch-24.02 to branch-24.04 [skip ci] [bot]
@nvauto
Auto-merge use submodule in BASE ref
99b8a73 
Signed-off-by: spark-rapids automation <70000568+nvauto@users.noreply.github.com>
@nvauto
Merge pull request NVIDIA#1731 from NVIDIA/bot-auto-merge-branch-24.02
887d9a9 
[auto-merge] bot-auto-merge-branch-24.02 to branch-24.04 [skip ci] [bot]
@nvauto
Auto-merge use submodule in BASE ref
4a388a1 
Signed-off-by: spark-rapids automation <70000568+nvauto@users.noreply.github.com>
@nvauto
Merge pull request NVIDIA#1733 from NVIDIA/bot-auto-merge-branch-24.02
26f7467 
[auto-merge] bot-auto-merge-branch-24.02 to branch-24.04 [skip ci] [bot]
@NvTimLiu
Init version 24.04.0-SNAPSHOT (NVIDIA#1723)
7f1c286 
* Init version 24.04.0-SNAPSHOT

Signed-off-by: Tim Liu <timl@nvidia.com>

* Copyright 2024

Signed-off-by: Tim Liu <timl@nvidia.com>

---------

Signed-off-by: Tim Liu <timl@nvidia.com>
@nvauto
Auto-merge use submodule in BASE ref
e1c0527 
Signed-off-by: spark-rapids automation <70000568+nvauto@users.noreply.github.com>
@nvauto
Merge pull request NVIDIA#1737 from NVIDIA/bot-auto-merge-branch-24.02
ebb9d76 
[auto-merge] bot-auto-merge-branch-24.02 to branch-24.04 [skip ci] [bot]
@nvauto
Auto-merge use submodule in BASE ref
f4f0313 
Signed-off-by: spark-rapids automation <70000568+nvauto@users.noreply.github.com>
@nvauto
Merge pull request NVIDIA#1739 from NVIDIA/bot-auto-merge-branch-24.02
6f04c8c 
[auto-merge] bot-auto-merge-branch-24.02 to branch-24.04 [skip ci] [bot]
@nvauto
Auto-merge use submodule in BASE ref
e966867 
Signed-off-by: spark-rapids automation <70000568+nvauto@users.noreply.github.com>
@nvauto
Merge pull request NVIDIA#1741 from NVIDIA/bot-auto-merge-branch-24.02
31c0e18 
[auto-merge] bot-auto-merge-branch-24.02 to branch-24.04 [skip ci] [bot]
@nvauto
Update submodule cudf to a41238fd009403030b6f172025263633c913f82c (NV…
3ac189c 
…IDIA#1742)

Signed-off-by: spark-rapids automation <70000568+nvauto@users.noreply.github.com>
@nvauto
Auto-merge use submodule in BASE ref
8adcbeb 
Signed-off-by: spark-rapids automation <70000568+nvauto@users.noreply.github.com>
@nvauto
Merge pull request NVIDIA#1747 from NVIDIA/bot-auto-merge-branch-24.02
c550307 
[auto-merge] bot-auto-merge-branch-24.02 to branch-24.04 [skip ci] [bot]
@jlowe
Update spark_resource_adaptor to RMM removing mem_info APIs (NVIDIA#1748
a39c0f2 
)

Signed-off-by: Jason Lowe <jlowe@nvidia.com>
@nvauto
Auto-merge use submodule in BASE ref
59214e4 
Signed-off-by: spark-rapids automation <70000568+nvauto@users.noreply.github.com>
@nvauto
Merge pull request NVIDIA#1749 from NVIDIA/bot-auto-merge-branch-24.02
054d04e 
[auto-merge] bot-auto-merge-branch-24.02 to branch-24.04 [skip ci] [bot]
@nvauto
Update submodule cudf to 1422a4b7f94f66275b3a641ecaf3533815111f8e (NV…
6b7f237 
…IDIA#1750)

Signed-off-by: spark-rapids automation <70000568+nvauto@users.noreply.github.com>
@nvauto
Auto-merge use submodule in BASE ref
109a843 
Signed-off-by: spark-rapids automation <70000568+nvauto@users.noreply.github.com>
@nvauto
Merge pull request NVIDIA#1752 from NVIDIA/bot-auto-merge-branch-24.02
a19ad7b 
[auto-merge] bot-auto-merge-branch-24.02 to branch-24.04 [skip ci] [bot]
@nvauto
Update submodule cudf to 57bbe94e995b9a0365276e4cb26853dce219e22a (NV…
0445d85 
…IDIA#1753)

Signed-off-by: spark-rapids automation <70000568+nvauto@users.noreply.github.com>
@nvauto
Update submodule cudf to 6ed75ffddcd678a5dbcfd5f0e2dccf98531b4282 (NV…
cfefc6c 
…IDIA#1754)

Signed-off-by: spark-rapids automation <70000568+nvauto@users.noreply.github.com>
@nvauto
Update submodule cudf to bb59715162218c0c638f5c368e6871ca15168838 (NV…
f3b8f8d 
…IDIA#1755)

Signed-off-by: spark-rapids automation <70000568+nvauto@users.noreply.github.com>
@nvauto
Update submodule cudf to 767dde16e413f34cac16cb0b96b7eca18d71b7e9 (NV…
2ec8552 
…IDIA#1756)

Signed-off-by: spark-rapids automation <70000568+nvauto@users.noreply.github.com>
nvauto and others added 25 commits February 28, 2024 11:37
@nvauto
Update submodule cudf to 1719cda0b18bf3f15426f827fc49e23f0ec3bd40 (NV…
b1e51c7 
…IDIA#1811)

Signed-off-by: spark-rapids automation <70000568+nvauto@users.noreply.github.com>
@nvauto
Auto-merge use submodule in BASE ref
7c099db 
Signed-off-by: spark-rapids automation <70000568+nvauto@users.noreply.github.com>
@nvauto
Merge pull request NVIDIA#1812 from NVIDIA/bot-auto-merge-branch-24.02
e0311b3 
[auto-merge] bot-auto-merge-branch-24.02 to branch-24.04 [skip ci] [bot]
@nvauto
Update submodule cudf to 896b5bced6597e81f3a9e96e5b6bcc72cb364e68 (NV…
49412dc 
…IDIA#1815)

Signed-off-by: spark-rapids automation <70000568+nvauto@users.noreply.github.com>
@nvauto
Update submodule cudf to 8507b3dfe44794cd549222598320d9cf25c6e34c (NV…
0610553 
…IDIA#1816)

Signed-off-by: spark-rapids automation <70000568+nvauto@users.noreply.github.com>
@nvauto
Update submodule cudf to f7e486043c30810625fe2d13f5b20d60f90b8d2e (NV…
e12012c 
…IDIA#1817)

Signed-off-by: spark-rapids automation <70000568+nvauto@users.noreply.github.com>
@nvauto
Update submodule cudf to 1a3b7890e1f110e93082308546eccbeae8a4784a (NV…
9274bd5 
…IDIA#1818)

Signed-off-by: spark-rapids automation <70000568+nvauto@users.noreply.github.com>
@nvauto @NvTimLiu
[submodule-sync] bot-submodule-sync-branch-24.02 to branch-24.02 [ski…
18745a6 
…p ci] [bot] (NVIDIA#1821)

* checkout to tag

* Update submodule cudf to v24.04.00a

Signed-off-by: spark-rapids automation <70000568+nvauto@users.noreply.github.com>

---------

Signed-off-by: spark-rapids automation <70000568+nvauto@users.noreply.github.com>
Co-authored-by: Tim Liu <timl@nvidia.com>
@nvauto
Auto-merge use submodule in BASE ref
7485bda 
Signed-off-by: spark-rapids automation <70000568+nvauto@users.noreply.github.com>
@nvauto
Merge pull request NVIDIA#1822 from NVIDIA/bot-auto-merge-branch-24.02
9139e03 
[auto-merge] bot-auto-merge-branch-24.02 to branch-24.04 [skip ci] [bot]
@nvauto
[submodule-sync] bot-submodule-sync-branch-24.04 to branch-24.04 [ski…
3f5371a 
…p ci] [bot] (NVIDIA#1819)

* Update submodule cudf to a9e41e73505876b171ca620c52a8638dae9896fd

Signed-off-by: spark-rapids automation <70000568+nvauto@users.noreply.github.com>

* Update submodule cudf to 56a3b8f6516f830d836b50cc0d93ae67c4db9613

Signed-off-by: spark-rapids automation <70000568+nvauto@users.noreply.github.com>

* Update submodule cudf to 3b228e2c6d3ec39fcba553c63d53a56760dc1ca6

Signed-off-by: spark-rapids automation <70000568+nvauto@users.noreply.github.com>

* Update submodule cudf to e60aad110efcd94003ad78d0f46ac94e531bd1c0

Signed-off-by: spark-rapids automation <70000568+nvauto@users.noreply.github.com>

---------

Signed-off-by: spark-rapids automation <70000568+nvauto@users.noreply.github.com>
@nvauto
Update submodule cudf to d158ccdbe651952bd649cb0f17c41467c5209824 (NV…
d5efccb 
…IDIA#1825)

Signed-off-by: spark-rapids automation <70000568+nvauto@users.noreply.github.com>
@nvauto
Update submodule cudf to 3571291c533412f8efa4c5d41caa865564b5391b (NV…
dc8b36d 
…IDIA#1826)

Signed-off-by: spark-rapids automation <70000568+nvauto@users.noreply.github.com>
@NvTimLiu
Revert "[submodule-sync] bot-submodule-sync-branch-24.02 to branch-24…
f1e37af 
….02 [ski…" (NVIDIA#1828)

This reverts commit 18745a6.
@nvauto
Auto-merge use submodule in BASE ref
d9cbab9 
Signed-off-by: spark-rapids automation <70000568+nvauto@users.noreply.github.com>
@nvauto
Merge pull request NVIDIA#1833 from NVIDIA/bot-auto-merge-branch-24.02
5fef87b 
[auto-merge] bot-auto-merge-branch-24.02 to branch-24.04 [skip ci] [bot]
@jlowe
Update to make_strings_column returning uvector (NVIDIA#1837)
536c696 
* Update to make_strings_column returning uvector

Signed-off-by: Jason Lowe <jlowe@nvidia.com>

* Style fix

---------

Signed-off-by: Jason Lowe <jlowe@nvidia.com>
@nvauto
[submodule-sync] bot-submodule-sync-branch-24.04 to branch-24.04 [ski…
99445a7 
…p ci] [bot] (NVIDIA#1834)

* Update submodule cudf to f804aa69ca22124f648aba70096df6f1efe27629

Signed-off-by: spark-rapids automation <70000568+nvauto@users.noreply.github.com>

* Update submodule cudf to 8d073e4ca0a6cb9d9a4d9fe5e4e0147f01d7eb36

Signed-off-by: spark-rapids automation <70000568+nvauto@users.noreply.github.com>

* Update submodule cudf to 176f75b1da0559c024a62a98f13ff15491f18a95

Signed-off-by: spark-rapids automation <70000568+nvauto@users.noreply.github.com>

---------

Signed-off-by: spark-rapids automation <70000568+nvauto@users.noreply.github.com>
@ttnghia
Move row conversion code from cudf (NVIDIA#1838)
5a09147 
* Revert "Use cuda::proclaim_return_type on device lambdas (NVIDIA#1662)"

This reverts commit 763406c.

# Conflicts:
#	src/main/cpp/benchmarks/row_conversion.cpp
#	src/main/cpp/src/bloom_filter.cu
#	src/main/cpp/src/map_utils.cu
#	src/main/cpp/src/xxhash64.cu
#	thirdparty/cudf

Signed-off-by: Nghia Truong <nghiat@nvidia.com>

* Remove redundant header

Signed-off-by: Nghia Truong <nghiat@nvidia.com>

* Update copyright year

Signed-off-by: Nghia Truong <nghiat@nvidia.com>

---------

Signed-off-by: Nghia Truong <nghiat@nvidia.com>
@nvauto
[submodule-sync] bot-submodule-sync-branch-24.04 to branch-24.04 [ski…
b201eaf 
…p ci] [bot] (NVIDIA#1839)

* Update submodule cudf to e612a8aee5ba54f397b8d5be14201776bac9dd2d

Signed-off-by: spark-rapids automation <70000568+nvauto@users.noreply.github.com>

* Update submodule cudf to dbf7236c4b30ee6f87223b728688cddf39453d14

Signed-off-by: spark-rapids automation <70000568+nvauto@users.noreply.github.com>

* Update submodule cudf to bb0e4fdd6f4960d1d5125256dc147f28d83db560

Signed-off-by: spark-rapids automation <70000568+nvauto@users.noreply.github.com>

---------

Signed-off-by: spark-rapids automation <70000568+nvauto@users.noreply.github.com>
@nvauto
Update submodule cudf to eb8de186720a7edda90760cb189566df18146911 (NV…
bfff22d 
…IDIA#1841)

Signed-off-by: spark-rapids automation <70000568+nvauto@users.noreply.github.com>
@nvauto
Update submodule cudf to 9678c900a484818b489b723e2568e7b7c0d0b090 (NV…
f5a8943 
…IDIA#1842)

Signed-off-by: spark-rapids automation <70000568+nvauto@users.noreply.github.com>
@nvauto
Update submodule cudf to efae666bac226dc50c1c7b5d7f1145ee9a31fc66 (NV…
48befbf 
…IDIA#1844)

Signed-off-by: spark-rapids automation <70000568+nvauto@users.noreply.github.com>
@NvTimLiu
Merge remote-tracking branch 'origin/branch-24.04' into main
892b9bd
@NvTimLiu
Change version to 24.04.0
ae7c3bb 
Signed-off-by: Tim Liu <timl@nvidia.com>
@NvTimLiu NvTimLiu merged commit f470863 into main Mar 8, 2024
2 of 3 checks passed
@NvTimLiu NvTimLiu deleted the merge-branch-24.02-to-main branch March 8, 2024 02:26
@NvTimLiu NvTimLiu restored the merge-branch-24.02-to-main branch March 8, 2024 02:35
@NvTimLiu NvTimLiu deleted the merge-branch-24.02-to-main branch March 8, 2024 02:36
@NvTimLiu
Copy link
Owner Author

NvTimLiu commented Mar 8, 2024

Great stuff!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@NvTimLiu @nvauto @jlowe @ttnghia