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-23.10 to main [skip ci] #1488

Merged
merged 149 commits into from
Oct 12, 2023
Merged

Merge branch-23.10 to main [skip ci] #1488

merged 149 commits into from
Oct 12, 2023

Conversation

pxLi
Copy link
Collaborator

@pxLi pxLi commented Oct 11, 2023

Create merge to main for commit history review

NOTE: This change must be merged as create a merge commit

nvauto and others added 30 commits July 25, 2023 15:10
@nvauto
Merge pull request NVIDIA#1282 from NVIDIA/bot-auto-merge-branch-23.08
36a658a 
[auto-merge] bot-auto-merge-branch-23.08 to branch-23.10 [skip ci] [bot]
@NvTimLiu
Init version 23.10.0-SNAPSHOT (NVIDIA#1283)
0b4caaf 
Signed-off-by: Tim Liu <[email protected]>
@nvauto
Update submodule cudf to ee7e39b86fafb8fcdc842fa08ed1d414d7974929 (NV…
73bce81 
…IDIA#1284)

Signed-off-by: spark-rapids automation <[email protected]>
@nvauto
Auto-merge use submodule in BASE ref
d5beeb6 
Signed-off-by: spark-rapids automation <[email protected]>
@nvauto
Merge pull request NVIDIA#1286 from NVIDIA/bot-auto-merge-branch-23.08
46dde4e 
[auto-merge] bot-auto-merge-branch-23.08 to branch-23.10 [skip ci] [bot]
@nvauto
Update submodule cudf to 7dcf0525f8c0f7465256b489f715fd35eab188ad (NV…
54f44f1 
…IDIA#1287)

Signed-off-by: spark-rapids automation <[email protected]>
@nvauto
Update submodule cudf to e55f944124cc6cc2b847325fb448c2d9155ad188 (NV…
e2d49e8 
…IDIA#1288)

Signed-off-by: spark-rapids automation <[email protected]>
@nvauto
Update submodule cudf to 427f8792e04662afeccad3beaae593817c52079f (NV…
66d930b 
…IDIA#1289)

Signed-off-by: spark-rapids automation <[email protected]>
@nvauto
Auto-merge use submodule in BASE ref
75f1c61 
Signed-off-by: spark-rapids automation <[email protected]>
@nvauto
Merge pull request NVIDIA#1291 from NVIDIA/bot-auto-merge-branch-23.08
dfd54b0 
[auto-merge] bot-auto-merge-branch-23.08 to branch-23.10 [skip ci] [bot]
@nvauto
Auto-merge use submodule in BASE ref
eee58e8 
Signed-off-by: spark-rapids automation <[email protected]>
@nvauto
Merge pull request NVIDIA#1293 from NVIDIA/bot-auto-merge-branch-23.08
ac8535e 
[auto-merge] bot-auto-merge-branch-23.08 to branch-23.10 [skip ci] [bot]
@nvauto
Auto-merge use submodule in BASE ref
52a06dd 
Signed-off-by: spark-rapids automation <[email protected]>
@nvauto
Merge pull request NVIDIA#1295 from NVIDIA/bot-auto-merge-branch-23.08
d036bdd 
[auto-merge] bot-auto-merge-branch-23.08 to branch-23.10 [skip ci] [bot]
@nvauto
Update submodule cudf to 9aa2968cb89ff4d9b199ca955b47fa04f0973f8f (NV…
74de7b7 
…IDIA#1296)

Signed-off-by: spark-rapids automation <[email protected]>
@nvauto
Auto-merge use submodule in BASE ref
5955c1f 
Signed-off-by: spark-rapids automation <[email protected]>
@nvauto
Merge pull request NVIDIA#1298 from NVIDIA/bot-auto-merge-branch-23.08
65dcf84 
[auto-merge] bot-auto-merge-branch-23.08 to branch-23.10 [skip ci] [bot]
@nvauto
Auto-merge use submodule in BASE ref
3947c9c 
Signed-off-by: spark-rapids automation <[email protected]>
@nvauto
Merge pull request NVIDIA#1300 from NVIDIA/bot-auto-merge-branch-23.08
cfdc688 
[auto-merge] bot-auto-merge-branch-23.08 to branch-23.10 [skip ci] [bot]
@nvauto
Update submodule cudf to 80641708d7dff778263d738445ddca07d2bce19e (NV…
71fe8f5 
…IDIA#1301)

Signed-off-by: spark-rapids automation <[email protected]>
@nvauto
Update submodule cudf to f00e92220a337ad3af8c01c8c9e96f3c80e4f47e (NV…
4b2c3bb 
…IDIA#1302)

Signed-off-by: spark-rapids automation <[email protected]>
@nvauto
Update submodule cudf to 7746af421c88c59e2261d5edfcfe61b0fc7835fd (NV…
a598a3e 
…IDIA#1304)

Signed-off-by: spark-rapids automation <[email protected]>
@nvauto
Auto-merge use submodule in BASE ref
d6139c9 
Signed-off-by: spark-rapids automation <[email protected]>
@nvauto
Merge pull request NVIDIA#1308 from NVIDIA/bot-auto-merge-branch-23.08
6f68983 
[auto-merge] bot-auto-merge-branch-23.08 to branch-23.10 [skip ci] [bot]
@nvauto
[submodule-sync] bot-submodule-sync-branch-23.10 to branch-23.10 [ski…
ebae3dd 
…p ci] [bot] (NVIDIA#1305)

* Update submodule cudf to 9d465f258ffdfe88e7b661cce8cae59741113ae0

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

* Update submodule cudf to 02357b17ff3b2cc3e8840281e7a9b0ed159cdcf0

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

* Update submodule cudf to 1a75b3c4301107bd874e09dcf33a24cfb288c7f9

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

* Update submodule cudf to 97d60c42baf9f4ba02cc95ecc3f5782030d65757

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

* Update submodule cudf to fe307c13fc7456b0d5edfd23ab28d323a8b7fb43

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

* Update submodule cudf to 5e8fd8e142991b2a9abdd2d11c1a1e957996597d

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

* Update submodule cudf to d5265306afdf8d78f37b223ee2c6d9fbac874484

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

---------

Signed-off-by: spark-rapids automation <[email protected]>
@nvauto
Auto-merge use submodule in BASE ref
305de87 
Signed-off-by: spark-rapids automation <[email protected]>
@nvauto
Merge pull request NVIDIA#1310 from NVIDIA/bot-auto-merge-branch-23.08
9ba9dd2 
[auto-merge] bot-auto-merge-branch-23.08 to branch-23.10 [skip ci] [bot]
@nvauto
Update submodule cudf to 11fd25c25e8d593ddfb4e0d29281aaf63898d9ba (NV…
38ca80a 
…IDIA#1311)

Signed-off-by: spark-rapids automation <[email protected]>
@nvauto
Update submodule cudf to 399efb960f689085bf671f6fa62916b1020e3b30 (NV…
4a589e2 
…IDIA#1312)

Signed-off-by: spark-rapids automation <[email protected]>
@jlowe
Change cudf::offset_type to cudf::size_type (NVIDIA#1315)
512c9c9 
Signed-off-by: Jason Lowe <[email protected]>
nvauto and others added 11 commits September 27, 2023 02:20
@nvauto
Update submodule cudf to daea8c8bc37ec53b7347857a3b6795bcb0ad86ff (NV…
8ef59a0 
…IDIA#1446)

Signed-off-by: spark-rapids automation <[email protected]>
@nvauto
Update submodule cudf to 030c0f4995ec458fcfc00a4ebb3aa8bccb2b27a0 (NV…
7f8fe94 
…IDIA#1449)

Signed-off-by: spark-rapids automation <[email protected]>
@nvauto
Update submodule cudf to b25b292f7f97cbb681f0244e1a20b30a925145a1 (NV…
28d94b9 
…IDIA#1453)

Signed-off-by: spark-rapids automation <[email protected]>
@nvauto
Update submodule cudf to 31e56702fe15f44b3e849207d31d0bb79c307367 (NV…
d843f54 
…IDIA#1458)

Signed-off-by: spark-rapids automation <[email protected]>
@nvauto
Update submodule cudf to b789d4ce3c090a3f25a8657d9a8582a1edb54f12 (NV…
f32fe74 
…IDIA#1461)

Signed-off-by: spark-rapids automation <[email protected]>
@razajafri
Added javadocs to CastStrings.fromIntegersWithBase method [skip ci] (N…
d0d058e 
…VIDIA#1452)

* added javadocs

* Signing off

Signed-off-by: Raza Jafri <[email protected]>

* addressed review comments

* addressed review concern

* fixed the docs with the correct hex value

---------

Signed-off-by: Raza Jafri <[email protected]>
@nvauto
[submodule-sync] bot-submodule-sync-branch-23.10 to branch-23.10 [ski…
54ef999 
…p ci] [bot] (NVIDIA#1464)

* Update submodule cudf to 53f0f74f6c6d66441225278f19a69885fb8b43c6

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

* Update submodule cudf to b2f00809f40e2e81b01214177b412456d40404cc

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

---------

Signed-off-by: spark-rapids automation <[email protected]>
@nvauto
Update submodule cudf to 66a655ce80e8b0accb80ea4e23799d23a82a35a2 (NV…
ea590b3 
…IDIA#1470)

Signed-off-by: spark-rapids automation <[email protected]>
@nvauto
Update submodule cudf to 3964950ba2fecf7f962917276058a6381d396246 (NV…
e8219ce 
…IDIA#1472)

Signed-off-by: spark-rapids automation <[email protected]>
@revans2
handle rmm::out_of_memory instead of std::bad_alloc for retry (NVIDIA…
93f4d22 
…#1477)

Signed-off-by: Robert (Bobby) Evans <[email protected]>
@pxLi
fix docker modified check in premerge (NVIDIA#1485)
299a0f3 
Signed-off-by: Peixin Li <[email protected]>
@pxLi pxLi added the build label Oct 11, 2023
@pxLi
Copy link
Collaborator Author

pxLi commented Oct 11, 2023 •
edited
Loading

FYI this is for in-advance review, thanks
we will update after all 23.10 PRs are merged (or retargeted) https://github.com/NVIDIA/spark-rapids-jni/pulls?q=is%3Aopen+base%3Abranch-23.10
and update cudf submodule ref to released v23.10.0 tag later

NvTimLiu
NvTimLiu approved these changes Oct 11, 2023
View reviewed changes
Copy link
Collaborator

@NvTimLiu NvTimLiu left a comment

Choose a reason for hiding this comment

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

LGTM

@pxLi
Copy link
Collaborator Author

pxLi commented Oct 12, 2023

updated cudf submodule ref to v23.10.00.

Going to merge and trigger the RC build soon. if Any missing stuff, we will follow up in other PRs

@pxLi
Copy link
Collaborator Author

pxLi commented Oct 12, 2023

build

@pxLi pxLi merged commit e5fb14e into NVIDIA:main Oct 12, 2023
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@NvTimLiu NvTimLiu NvTimLiu approved these changes

@jlowe jlowe Awaiting requested review from jlowe

@revans2 revans2 Awaiting requested review from revans2

@tgravescs tgravescs Awaiting requested review from tgravescs

@mattahrens mattahrens Awaiting requested review from mattahrens

@sameerz sameerz Awaiting requested review from sameerz

@GaryShen2008 GaryShen2008 Awaiting requested review from GaryShen2008

Assignees
No one assigned
Labels
build
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
9 participants
@pxLi @NvTimLiu @nvauto @jlowe @firestarman @gerashegalov @ttnghia @razajafri @revans2