Skip to content

Commit 96f9271

Browse files
committed
Remove wildcard from debugging/test_info and expect new dpnp device model
1 parent 5e5824a commit 96f9271

File tree

1 file changed

+22
-22
lines changed

1 file changed

+22
-22
lines changed

numba_dpex/tests/debugging/test_info.py

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ def side_by_side_info_case(api):
2525
f"side-by-side.py --api={api}",
2626
None,
2727
(
28-
r"param_a = .*",
29-
r"param_b = .*",
28+
r"param_a = [0-9]+",
29+
r"param_b = [0-9]+",
3030
),
3131
)
3232

@@ -38,7 +38,7 @@ def side_by_side_print_case(api):
3838
None,
3939
(
4040
"param_a",
41-
r"\$1 = .*",
41+
r"\$1 = [0-9]+",
4242
r"type = float32",
4343
r"type = float32",
4444
),
@@ -53,9 +53,9 @@ def side_by_side_print_case(api):
5353
"simple_dpex_func.py",
5454
r".*18.*i = ndpx.get_global_id\(0\)",
5555
(
56-
r"a_in_kernel = {meminfo = ",
57-
r"b_in_kernel = {meminfo = ",
58-
r"c_in_kernel = {meminfo = ",
56+
r"a_in_kernel = {nitems = ",
57+
r"b_in_kernel = {nitems = ",
58+
r"c_in_kernel = {nitems = ",
5959
),
6060
),
6161
side_by_side_info_case("numba"),
@@ -79,7 +79,7 @@ def test_info_args(app, breakpoint, script, expected_line, expected_args):
7979
r".*18.*i = ndpx.get_global_id\(0\)",
8080
(
8181
"a_in_kernel",
82-
r"\$1 = {meminfo = ",
82+
r"\$1 = {nitems = ",
8383
r"type = struct DpnpNdArray\(dtype=float32, ndim=1, layout=C.*\) \({.*}\)",
8484
r"type = DpnpNdArray\(dtype=float32, ndim=1, layout=C.*\) \({.*}\)",
8585
),
@@ -120,7 +120,7 @@ def side_by_side_info_locals_case(api):
120120
None,
121121
(
122122
r"param_c = 15",
123-
r"param_d = 0",
123+
r"param_d = 2.5",
124124
r"result = 0",
125125
),
126126
(),
@@ -145,11 +145,11 @@ def side_by_side_2_info_locals_case(api):
145145
(
146146
r"param_a = 5",
147147
r"param_b = 5",
148-
r"param_c = .*",
149-
r"param_d = .*",
148+
r"param_c = [0-9]+",
149+
r"param_d = [0-9]+",
150150
r"result = 0",
151151
),
152-
((r"a", r"\$1 = {meminfo = ", ptype, whatis),),
152+
((r"a", r"\$1 = {(meminfo|nitems) = ", ptype, whatis),),
153153
)
154154

155155

@@ -162,26 +162,26 @@ def side_by_side_2_info_locals_case(api):
162162
"sum_local_vars.py",
163163
r"16\s+c\[i\] = l1 \+ l2",
164164
(
165-
r"i = .*",
166-
r"l1 = [0-9]\.[0-9]*.*",
167-
r"l2 = [0-9]\.[0-9]*.*",
165+
r"i = [0-9]+",
166+
r"l1 = [0-9]\.[0-9]{3}",
167+
r"l2 = [0-9]\.[0-9]{3}",
168168
),
169169
(
170170
(
171171
"a",
172-
r"\$1 = {meminfo = ",
172+
r"\$1 = {nitems = ",
173173
r"type = struct DpnpNdArray\(dtype=float32, ndim=1, layout=C.*\) \({.*}\)",
174174
r"type = DpnpNdArray\(dtype=float32, ndim=1, layout=C.*\) \({.*}\)",
175175
),
176176
(
177177
"l1",
178-
r"\$2 = [0-9]\.[0-9]*",
178+
r"\$2 = [0-9]\.[0-9]{3}",
179179
r"type = float64",
180180
r"type = float64",
181181
),
182182
(
183183
"l2",
184-
r"\$3 = [0-9]\.[0-9]*",
184+
r"\$3 = [0-9]\.[0-9]{3}",
185185
r"type = float64",
186186
r"type = float64",
187187
),
@@ -194,8 +194,8 @@ def side_by_side_2_info_locals_case(api):
194194
r"16\s+c\[i\] = l1 \+ l2",
195195
(
196196
r".*i = [0-9]",
197-
r"l1 = [0-9]\.[0-9]*",
198-
r"l2 = [0-9]\.[0-9]*",
197+
r"l1 = [0-9]\.[0-9]{3}",
198+
r"l2 = [0-9]\.[0-9]{3}",
199199
),
200200
(
201201
(
@@ -206,13 +206,13 @@ def side_by_side_2_info_locals_case(api):
206206
),
207207
(
208208
"l1",
209-
r"\$2 = [0-9]\.[0-9]*",
209+
r"\$2 = [0-9]\.[0-9]{3}",
210210
r"type = float64",
211211
r"type = float64",
212212
),
213213
(
214214
"l1",
215-
r"\$3 = [0-9]\.[0-9]*",
215+
r"\$3 = [0-9]\.[0-9]{3}",
216216
r"type = float64",
217217
r"type = float64",
218218
),
@@ -318,7 +318,7 @@ def side_by_side_2_assignment_to_variable_case(api):
318318
(r"param_c", r"\$1 = 15"),
319319
(r"param_c=150", r"\$2 = 150"),
320320
(r"param_c", r"\$3 = 150"),
321-
(r"i", r"\$4 = .*"),
321+
(r"i", r"\$4 = [0-9]+"),
322322
(r"i=50", r"\$5 = 50"),
323323
(r"i", r"\$6 = 50"),
324324
],

0 commit comments

Comments
 (0)