Merge pull request #2011 from IntelPython/clean-up-accumulator-common-code

Technical debt clean-up in `_accumulation.py`

Author: ndgrigorian

Diff for: dpctl/tensor/_accumulation.py

@@ -125,7 +125,6 @@ def _accumulate_common(
         if a1 != nd:
             out = dpt.permute_dims(out, perm)
 
-    final_ev = dpctl.SyclEvent()
     _manager = SequentialOrderManager[q]
     depends = _manager.submitted_events
     if implemented_types:
@@ -144,12 +143,11 @@ def _accumulate_common(
         _manager.add_event_pair(ht_e, acc_ev)
         if not (orig_out is None or out is orig_out):
             # Copy the out data from temporary buffer to original memory
-            ht_e_cpy, acc_ev = ti._copy_usm_ndarray_into_usm_ndarray(
+            ht_e_cpy, cpy_e = ti._copy_usm_ndarray_into_usm_ndarray(
                 src=out, dst=orig_out, sycl_queue=q, depends=[acc_ev]
             )
-            _manager.add_event_pair(ht_e_cpy, acc_ev)
+            _manager.add_event_pair(ht_e_cpy, cpy_e)
             out = orig_out
-        final_ev = acc_ev
     else:
         if _dtype_supported(res_dt, res_dt):
             tmp = dpt.empty(
@@ -160,21 +158,21 @@ def _accumulate_common(
             )
             _manager.add_event_pair(ht_e_cpy, cpy_e)
             if not include_initial:
-                ht_e, final_ev = _accumulate_fn(
+                ht_e, acc_ev = _accumulate_fn(
                     src=tmp,
                     trailing_dims_to_accumulate=1,
                     dst=out,
                     sycl_queue=q,
                     depends=[cpy_e],
                 )
             else:
-                ht_e, final_ev = _accumulate_include_initial_fn(
+                ht_e, acc_ev = _accumulate_include_initial_fn(
                     src=tmp,
                     dst=out,
                     sycl_queue=q,
                     depends=[cpy_e],
                 )
-            _manager.add_event_pair(ht_e, final_ev)
+            _manager.add_event_pair(ht_e, acc_ev)
         else:
             buf_dt = _default_accumulation_type_fn(inp_dt, q)
             tmp = dpt.empty(
@@ -190,25 +188,25 @@ def _accumulate_common(
             if a1 != nd:
                 tmp_res = dpt.permute_dims(tmp_res, perm)
             if not include_initial:
-                ht_e, a_e = _accumulate_fn(
+                ht_e, acc_ev = _accumulate_fn(
                     src=tmp,
                     trailing_dims_to_accumulate=1,
                     dst=tmp_res,
                     sycl_queue=q,
                     depends=[cpy_e],
                 )
             else:
-                ht_e, a_e = _accumulate_include_initial_fn(
+                ht_e, acc_ev = _accumulate_include_initial_fn(
                     src=tmp,
                     dst=tmp_res,
                     sycl_queue=q,
                     depends=[cpy_e],
                 )
-            _manager.add_event_pair(ht_e, a_e)
-            ht_e_cpy2, final_ev = ti._copy_usm_ndarray_into_usm_ndarray(
-                src=tmp_res, dst=out, sycl_queue=q, depends=[a_e]
+            _manager.add_event_pair(ht_e, acc_ev)
+            ht_e_cpy2, cpy_e2 = ti._copy_usm_ndarray_into_usm_ndarray(
+                src=tmp_res, dst=out, sycl_queue=q, depends=[acc_ev]
             )
-            _manager.add_event_pair(ht_e_cpy2, final_ev)
+            _manager.add_event_pair(ht_e_cpy2, cpy_e2)
 
     if appended_axis:
         out = dpt.squeeze(out)