Skip to content

Commit 94d9d16

Browse files
rename to private fields/method
Co-authored-by: Andreas Klöckner <inform@tiker.net>
1 parent 03dfa33 commit 94d9d16

3 files changed

Lines changed: 29 additions & 29 deletions

File tree

arraycontext/impl/pytato/__init__.py

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -304,10 +304,10 @@ def __init__(
304304

305305
# List of ProfileEvents that haven't been transferred to profiled
306306
# results yet
307-
self.profile_events: list[ProfileEvent] = []
307+
self._profile_events: list[ProfileEvent] = []
308308

309309
# Dict of kernel name -> list of kernel execution times
310-
self.profile_results: dict[str, list[int]] = {}
310+
self._profile_results: dict[str, list[int]] = {}
311311

312312
self.using_svm = None
313313

@@ -362,25 +362,25 @@ def __init__(
362362
def _wait_and_transfer_profile_events(self) -> None:
363363
import pyopencl as cl
364364
# First, wait for completion of all events
365-
if self.profile_events:
365+
if self._profile_events:
366366
cl.wait_for_events([p_event.stop_cl_event
367-
for p_event in self.profile_events])
367+
for p_event in self._profile_events])
368368

369369
# Then, collect all events and store them
370-
for t in self.profile_events:
370+
for t in self._profile_events:
371371
name = t.t_unit_name
372372

373373
time = t.stop_cl_event.profile.end - t.start_cl_event.profile.end
374374

375-
self.profile_results.setdefault(name, []).append(time)
375+
self._profile_results.setdefault(name, []).append(time)
376376

377-
self.profile_events = []
377+
self._profile_events = []
378378

379-
def add_profiling_events(self, start: cl._cl.Event, stop: cl._cl.Event,
379+
def _add_profiling_events(self, start: cl._cl.Event, stop: cl._cl.Event,
380380
t_unit_name: str) -> None:
381381
"""Add profiling events to the list of profiling events."""
382382
if self.profile_kernels:
383-
self.profile_events.append(ProfileEvent(start, stop, t_unit_name))
383+
self._profile_events.append(ProfileEvent(start, stop, t_unit_name))
384384

385385
def get_profiling_data_for_kernel(self, kernel_name: str) \
386386
-> MultiCallKernelProfile:
@@ -410,10 +410,10 @@ def get_and_reset_profiling_data(self) -> dict[str, MultiCallKernelProfile]:
410410

411411
result = {
412412
kernel_name: MultiCallKernelProfile(len(times), sum(times))
413-
for kernel_name, times in self.profile_results.items()
413+
for kernel_name, times in self._profile_results.items()
414414
}
415415

416-
self.profile_results = {}
416+
self._profile_results = {}
417417

418418
return result
419419

@@ -653,7 +653,7 @@ def _to_frozen(key: tuple[Any, ...], ary) -> TaggableCLArray:
653653
**bound_arguments)
654654

655655
if self.profile_kernels:
656-
self.add_profiling_events(start_evt, evt, pt_prg.program.entrypoint)
656+
self._add_profiling_events(start_evt, evt, pt_prg.program.entrypoint)
657657

658658
assert len(set(out_dict) & set(key_to_frozen_subary)) == 0
659659

arraycontext/impl/pytato/compile.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -645,7 +645,7 @@ def __call__(self, arg_id_to_arg) -> ArrayContainer:
645645
**input_kwargs_for_loopy)
646646

647647
if self.actx.profile_kernels:
648-
self.actx.add_profiling_events(start_evt, evt, fn_name)
648+
self.actx._add_profiling_events(start_evt, evt, fn_name)
649649

650650
def to_output_template(keys, _):
651651
name_in_program = self.output_id_to_name_in_program[keys]
@@ -691,7 +691,7 @@ def __call__(self, arg_id_to_arg) -> ArrayContainer:
691691
**input_kwargs_for_loopy)
692692

693693
if self.actx.profile_kernels:
694-
self.actx.add_profiling_events(start_evt, evt, fn_name)
694+
self.actx._add_profiling_events(start_evt, evt, fn_name)
695695

696696
return self.actx.thaw(to_tagged_cl_array(out_dict[self.output_name],
697697
axes=get_cl_axes_from_pt_axes(

test/test_pytato_arraycontext.py

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -290,54 +290,54 @@ def twice(x):
290290

291291
f = actx.compile(twice)
292292

293-
assert len(actx.profile_events) == 0
293+
assert len(actx._profile_events) == 0
294294

295295
for _ in range(10):
296296
assert actx.to_numpy(f(99)) == 198
297297

298-
assert len(actx.profile_events) == 10
298+
assert len(actx._profile_events) == 10
299299
actx._wait_and_transfer_profile_events()
300-
assert len(actx.profile_events) == 0
301-
assert len(actx.profile_results) == 1
302-
assert len(actx.profile_results["twice"]) == 10
300+
assert len(actx._profile_events) == 0
301+
assert len(actx._profile_results) == 1
302+
assert len(actx._profile_results["twice"]) == 10
303303

304304
from arraycontext.impl.pytato.utils import tabulate_profiling_data
305305

306306
print(tabulate_profiling_data(actx.get_and_reset_profiling_data()))
307-
assert len(actx.profile_results) == 0
307+
assert len(actx._profile_results) == 0
308308

309309
# }}}
310310

311311
# {{{ Uncompiled/frozen test
312312

313-
assert len(actx.profile_events) == 0
313+
assert len(actx._profile_events) == 0
314314

315315
for _ in range(10):
316316
assert np.all(actx.to_numpy(twice(actx.from_numpy(np.array([99, 99])))) == 198)
317317

318-
assert len(actx.profile_events) == 10
318+
assert len(actx._profile_events) == 10
319319
actx._wait_and_transfer_profile_events()
320-
assert len(actx.profile_events) == 0
321-
assert len(actx.profile_results) == 1
322-
assert len(actx.profile_results["frozen_result"]) == 10
320+
assert len(actx._profile_events) == 0
321+
assert len(actx._profile_results) == 1
322+
assert len(actx._profile_results["frozen_result"]) == 10
323323

324324
print(tabulate_profiling_data(actx.get_and_reset_profiling_data()))
325325

326-
assert len(actx.profile_results) == 0
326+
assert len(actx._profile_results) == 0
327327

328328
# }}}
329329

330330
# {{{ test disabling profiling
331331

332332
actx.profile_kernels = False
333333

334-
assert len(actx.profile_events) == 0
334+
assert len(actx._profile_events) == 0
335335

336336
for _ in range(10):
337337
assert actx.to_numpy(f(99)) == 198
338338

339-
assert len(actx.profile_events) == 0
340-
assert len(actx.profile_results) == 0
339+
assert len(actx._profile_events) == 0
340+
assert len(actx._profile_results) == 0
341341

342342
# }}}
343343

0 commit comments

Comments
 (0)