Skip to content

Commit ad95c60

Browse files
GPUtesterGPUtester
authored
Merge pull request rapidsai#20032 from rapidsai/branch-25.10
Forward-merge branch-25.10 into branch-25.12
2 parents d1a0860 + 12238d7 commit ad95c60

File tree

9 files changed

+163
-69
lines changed

9 files changed

+163
-69
lines changed

‎python/pylibcudf/pylibcudf/join.pxd‎

Lines changed: 34 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
from pylibcudf.libcudf.types cimport null_equality
44
from rmm.pylibrmm.stream cimport Stream
5+
from rmm.pylibrmm.memory_resource cimport DeviceMemoryResource
56

67
from .column cimport Column
78
from .expressions cimport Expression
@@ -12,72 +13,84 @@ cpdef tuple inner_join(
1213
Table left_keys,
1314
Table right_keys,
1415
null_equality nulls_equal,
15-
Stream stream=*
16+
Stream stream=*,
17+
DeviceMemoryResource mr=*,
1618
)
1719

1820
cpdef tuple left_join(
1921
Table left_keys,
2022
Table right_keys,
2123
null_equality nulls_equal,
22-
Stream stream=*
24+
Stream stream=*,
25+
DeviceMemoryResource mr=*,
2326
)
2427

2528
cpdef tuple full_join(
2629
Table left_keys,
2730
Table right_keys,
2831
null_equality nulls_equal,
29-
Stream stream=*
32+
Stream stream=*,
33+
DeviceMemoryResource mr=*,
3034
)
3135

3236
cpdef Column left_semi_join(
3337
Table left_keys,
3438
Table right_keys,
3539
null_equality nulls_equal,
36-
Stream stream=*
40+
Stream stream=*,
41+
DeviceMemoryResource mr=*,
3742
)
3843

3944
cpdef Column left_anti_join(
4045
Table left_keys,
4146
Table right_keys,
4247
null_equality nulls_equal,
43-
Stream stream=*
48+
Stream stream=*,
49+
DeviceMemoryResource mr=*,
4450
)
4551

46-
cpdef Table cross_join(Table left, Table right, Stream stream=*)
52+
cpdef Table cross_join(
53+
Table left, Table right, Stream stream=*, DeviceMemoryResource mr=*
54+
)
4755

4856
cpdef tuple conditional_inner_join(
4957
Table left,
5058
Table right,
5159
Expression binary_predicate,
52-
Stream stream=*
60+
Stream stream=*,
61+
DeviceMemoryResource mr=*,
5362
)
5463

5564
cpdef tuple conditional_left_join(
5665
Table left,
5766
Table right,
5867
Expression binary_predicate,
59-
Stream stream=*
68+
Stream stream=*,
69+
DeviceMemoryResource mr=*,
6070
)
6171

6272
cpdef tuple conditional_full_join(
6373
Table left,
6474
Table right,
6575
Expression binary_predicate,
66-
Stream stream=*
76+
Stream stream=*,
77+
DeviceMemoryResource mr=*,
6778
)
6879

6980
cpdef Column conditional_left_semi_join(
7081
Table left,
7182
Table right,
7283
Expression binary_predicate,
73-
Stream stream=*
84+
Stream stream=*,
85+
DeviceMemoryResource mr=*,
7486
)
7587

7688
cpdef Column conditional_left_anti_join(
7789
Table left,
7890
Table right,
7991
Expression binary_predicate,
80-
Stream stream=*
92+
Stream stream=*,
93+
DeviceMemoryResource mr=*,
8194
)
8295

8396
cpdef tuple mixed_inner_join(
@@ -87,7 +100,8 @@ cpdef tuple mixed_inner_join(
87100
Table right_conditional,
88101
Expression binary_predicate,
89102
null_equality nulls_equal,
90-
Stream stream=*
103+
Stream stream=*,
104+
DeviceMemoryResource mr=*,
91105
)
92106

93107
cpdef tuple mixed_left_join(
@@ -97,7 +111,8 @@ cpdef tuple mixed_left_join(
97111
Table right_conditional,
98112
Expression binary_predicate,
99113
null_equality nulls_equal,
100-
Stream stream=*
114+
Stream stream=*,
115+
DeviceMemoryResource mr=*,
101116
)
102117

103118
cpdef tuple mixed_full_join(
@@ -107,7 +122,8 @@ cpdef tuple mixed_full_join(
107122
Table right_conditional,
108123
Expression binary_predicate,
109124
null_equality nulls_equal,
110-
Stream stream=*
125+
Stream stream=*,
126+
DeviceMemoryResource mr=*,
111127
)
112128

113129
cpdef Column mixed_left_semi_join(
@@ -117,7 +133,8 @@ cpdef Column mixed_left_semi_join(
117133
Table right_conditional,
118134
Expression binary_predicate,
119135
null_equality nulls_equal,
120-
Stream stream=*
136+
Stream stream=*,
137+
DeviceMemoryResource mr=*,
121138
)
122139

123140
cpdef Column mixed_left_anti_join(
@@ -127,5 +144,6 @@ cpdef Column mixed_left_anti_join(
127144
Table right_conditional,
128145
Expression binary_predicate,
129146
null_equality nulls_equal,
130-
Stream stream=*
147+
Stream stream=*,
148+
DeviceMemoryResource mr=*,
131149
)

‎python/pylibcudf/pylibcudf/join.pyi‎

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# Copyright (c) 2024, NVIDIA CORPORATION.
22

33
from rmm.pylibrmm import Stream
4+
from rmm.pylibrmm.memory_resource import DeviceMemoryResource
45

56
from pylibcudf.column import Column
67
from pylibcudf.expressions import Expression
@@ -12,63 +13,76 @@ def inner_join(
1213
right_keys: Table,
1314
nulls_equal: NullEquality,
1415
stream: Stream | None = None,
16+
mr: DeviceMemoryResource | None = None,
1517
) -> tuple[Column, Column]: ...
1618
def left_join(
1719
left_keys: Table,
1820
right_keys: Table,
1921
nulls_equal: NullEquality,
2022
stream: Stream | None = None,
23+
mr: DeviceMemoryResource | None = None,
2124
) -> tuple[Column, Column]: ...
2225
def full_join(
2326
left_keys: Table,
2427
right_keys: Table,
2528
nulls_equal: NullEquality,
2629
stream: Stream | None = None,
30+
mr: DeviceMemoryResource | None = None,
2731
) -> tuple[Column, Column]: ...
2832
def left_semi_join(
2933
left_keys: Table,
3034
right_keys: Table,
3135
nulls_equal: NullEquality,
3236
stream: Stream | None = None,
37+
mr: DeviceMemoryResource | None = None,
3338
) -> Column: ...
3439
def left_anti_join(
3540
left_keys: Table,
3641
right_keys: Table,
3742
nulls_equal: NullEquality,
3843
stream: Stream | None = None,
44+
mr: DeviceMemoryResource | None = None,
3945
) -> Column: ...
4046
def cross_join(
41-
left: Table, right: Table, stream: Stream | None = None
47+
left: Table,
48+
right: Table,
49+
stream: Stream | None = None,
50+
mr: DeviceMemoryResource | None = None,
4251
) -> Table: ...
4352
def conditional_inner_join(
4453
left: Table,
4554
right: Table,
4655
binary_predicate: Expression,
4756
stream: Stream | None = None,
57+
mr: DeviceMemoryResource | None = None,
4858
) -> tuple[Column, Column]: ...
4959
def conditional_left_join(
5060
left: Table,
5161
right: Table,
5262
binary_predicate: Expression,
5363
stream: Stream | None = None,
64+
mr: DeviceMemoryResource | None = None,
5465
) -> tuple[Column, Column]: ...
5566
def conditional_full_join(
5667
left: Table,
5768
right: Table,
5869
binary_predicate: Expression,
5970
stream: Stream | None = None,
71+
mr: DeviceMemoryResource | None = None,
6072
) -> tuple[Column, Column]: ...
6173
def conditional_left_semi_join(
6274
left: Table,
6375
right: Table,
6476
binary_predicate: Expression,
6577
stream: Stream | None = None,
78+
mr: DeviceMemoryResource | None = None,
6679
) -> Column: ...
6780
def conditional_left_anti_join(
6881
left: Table,
6982
right: Table,
7083
binary_predicate: Expression,
7184
stream: Stream | None = None,
85+
mr: DeviceMemoryResource | None = None,
7286
) -> Column: ...
7387
def mixed_inner_join(
7488
left_keys: Table,
@@ -78,6 +92,7 @@ def mixed_inner_join(
7892
binary_predicate: Expression,
7993
nulls_equal: NullEquality,
8094
stream: Stream | None = None,
95+
mr: DeviceMemoryResource | None = None,
8196
) -> tuple[Column, Column]: ...
8297
def mixed_left_join(
8398
left_keys: Table,
@@ -87,6 +102,7 @@ def mixed_left_join(
87102
binary_predicate: Expression,
88103
nulls_equal: NullEquality,
89104
stream: Stream | None = None,
105+
mr: DeviceMemoryResource | None = None,
90106
) -> tuple[Column, Column]: ...
91107
def mixed_full_join(
92108
left_keys: Table,
@@ -96,6 +112,7 @@ def mixed_full_join(
96112
binary_predicate: Expression,
97113
nulls_equal: NullEquality,
98114
stream: Stream | None = None,
115+
mr: DeviceMemoryResource | None = None,
99116
) -> tuple[Column, Column]: ...
100117
def mixed_left_semi_join(
101118
left_keys: Table,
@@ -105,6 +122,7 @@ def mixed_left_semi_join(
105122
binary_predicate: Expression,
106123
nulls_equal: NullEquality,
107124
stream: Stream | None = None,
125+
mr: DeviceMemoryResource | None = None,
108126
) -> Column: ...
109127
def mixed_left_anti_join(
110128
left_keys: Table,
@@ -114,4 +132,5 @@ def mixed_left_anti_join(
114132
binary_predicate: Expression,
115133
nulls_equal: NullEquality,
116134
stream: Stream | None = None,
135+
mr: DeviceMemoryResource | None = None,
117136
) -> Column: ...

0 commit comments

Comments
 (0)