From 01e070a1396e233c45a26d20f22058bf7c2074e7 Mon Sep 17 00:00:00 2001 From: Kaushik Kulkarni Date: Wed, 21 Apr 2021 15:15:27 -0500 Subject: [PATCH] prg -> t_unit --- loopy/cli.py | 14 +++++++------- loopy/target/c/__init__.py | 4 ++-- test/test_callables.py | 14 +++++++------- test/test_fortran.py | 32 ++++++++++++++++---------------- test/test_loopy.py | 16 ++++++++-------- test/test_transform.py | 6 +++--- 6 files changed, 43 insertions(+), 43 deletions(-) diff --git a/loopy/cli.py b/loopy/cli.py index 787c3ee32..4544df166 100644 --- a/loopy/cli.py +++ b/loopy/cli.py @@ -159,7 +159,7 @@ def main(): raise RuntimeError("loopy-lang requires 'lp_knl' " "to be defined on exit") - prg = [kernel] + t_unit = [kernel] elif lang in ["fortran", "floopy", "fpp"]: pre_transform_code = None @@ -176,7 +176,7 @@ def main(): defines_to_python_code(defines_fd.read()) + pre_transform_code) - prg = lp.parse_transformed_fortran( + t_unit = lp.parse_transformed_fortran( infile_content, pre_transform_code=pre_transform_code, filename=args.infile) @@ -184,16 +184,16 @@ def main(): raise RuntimeError("unknown language: '%s'" % args.lang) - if not isinstance(prg, lp.TranslationUnit): + if not isinstance(t_unit, lp.TranslationUnit): # FIXME - assert isinstance(prg, list) # of kernels + assert isinstance(t_unit, list) # of kernels raise NotImplementedError("convert list of kernels to TranslationUnit") if args.print_ir: - print(prg, file=sys.stderr) + print(t_unit, file=sys.stderr) - prg = lp.preprocess_kernel(prg) - cgr = lp.generate_code_v2(prg) + t_unit = lp.preprocess_kernel(t_unit) + cgr = lp.generate_code_v2(t_unit) if args.outfile is not None: outfile = args.outfile diff --git a/loopy/target/c/__init__.py b/loopy/target/c/__init__.py index 128e085e3..4548d8487 100644 --- a/loopy/target/c/__init__.py +++ b/loopy/target/c/__init__.py @@ -1257,9 +1257,9 @@ class ExecutableCTarget(CTarget): # thing that CPU JIT is specific to. return None - def get_kernel_executor(self, prg, *args, **kwargs): + def get_kernel_executor(self, t_unit, *args, **kwargs): from loopy.target.c.c_execution import CKernelExecutor - return CKernelExecutor(prg, entrypoint=kwargs.pop("entrypoint"), + return CKernelExecutor(t_unit, entrypoint=kwargs.pop("entrypoint"), compiler=self.compiler) def get_host_ast_builder(self): diff --git a/test/test_callables.py b/test/test_callables.py index 3d3e3f427..3cf39c2bf 100644 --- a/test/test_callables.py +++ b/test/test_callables.py @@ -647,14 +647,14 @@ def test_callees_with_gbarriers_are_inlined(ctx_factory): seq_dependencies=True, name="ones_and_zeros") - prg = lp.make_kernel( + t_unit = lp.make_kernel( "{ : }", """ y[:] = ones_and_zeros() """, [lp.GlobalArg("y", shape=6, dtype=lp.auto)]) - prg = lp.merge([prg, ones_and_zeros]) - evt, (out,) = prg(queue) + t_unit = lp.merge([t_unit, ones_and_zeros]) + evt, (out,) = t_unit(queue) expected_out = np.array([1, 1, 1, 0, 0, 0]).astype(np.float32) @@ -675,19 +675,19 @@ def test_inlining_with_indirections(ctx_factory): seq_dependencies=True, name="ones_and_zeros") - prg = lp.make_kernel( + t_unit = lp.make_kernel( "{ : }", """ y[:] = ones_and_zeros(map[:]) """, [lp.GlobalArg("y", shape=6, dtype=lp.auto), lp.GlobalArg("map", dtype=np.int32, shape=3)]) - prg = lp.merge([prg, ones_and_zeros]) - prg = lp.inline_callable_kernel(prg, "ones_and_zeros") + t_unit = lp.merge([t_unit, ones_and_zeros]) + t_unit = lp.inline_callable_kernel(t_unit, "ones_and_zeros") map_in = np.arange(3).astype(np.int32) - evt, (out, ) = prg(queue, map=map_in) + evt, (out, ) = t_unit(queue, map=map_in) expected_out = np.array([1, 1, 1, 0, 0, 0]).astype(np.float32) assert (expected_out == out).all() diff --git a/test/test_fortran.py b/test/test_fortran.py index 65126cdf3..72f7b7e01 100644 --- a/test/test_fortran.py +++ b/test/test_fortran.py @@ -84,12 +84,12 @@ def test_assign_double_precision_scalar(ctx_factory): end """ - prg = lp.parse_fortran(fortran_src) - print(lp.generate_code_v2(prg).device_code()) - assert "1.1;" in lp.generate_code_v2(prg).device_code() + t_unit = lp.parse_fortran(fortran_src) + print(lp.generate_code_v2(t_unit).device_code()) + assert "1.1;" in lp.generate_code_v2(t_unit).device_code() a_dev = cl.array.empty(queue, 1, dtype=np.float64, order="F") - prg(queue, a=a_dev) + t_unit(queue, a=a_dev) abs_err = abs(a_dev.get()[0] - 1.1) assert abs_err < 1e-15 @@ -108,10 +108,10 @@ def test_assign_double_precision_scalar_as_rational(ctx_factory): end """ - prg = lp.parse_fortran(fortran_src) + t_unit = lp.parse_fortran(fortran_src) a_dev = cl.array.empty(queue, 1, dtype=np.float64, order="F") - prg(queue, a=a_dev) + t_unit(queue, a=a_dev) abs_err = abs(a_dev.get()[0] - 1.1) assert abs_err < 1e-15 @@ -129,11 +129,11 @@ def test_assign_single_precision_scalar(ctx_factory): end """ - prg = lp.parse_fortran(fortran_src) - assert "1.1f" in lp.generate_code_v2(prg).device_code() + t_unit = lp.parse_fortran(fortran_src) + assert "1.1f" in lp.generate_code_v2(t_unit).device_code() a_dev = cl.array.empty(queue, 1, dtype=np.float64, order="F") - prg(queue, a=a_dev) + t_unit(queue, a=a_dev) abs_err = abs(a_dev.get()[0] - 1.1) assert abs_err > 1e-15 @@ -547,9 +547,9 @@ def test_parse_and_fuse_two_kernels(): !$loopy begin ! - ! prg = lp.parse_fortran(SOURCE) - ! fill = prg["fill"] - ! twice = prg["twice"] + ! t_unit = lp.parse_fortran(SOURCE) + ! fill = t_unit["fill"] + ! twice = t_unit["twice"] ! knl = lp.fuse_kernels((fill, twice)) ! print(knl) ! RESULT = knl @@ -628,8 +628,8 @@ def test_fortran_subroutines(): call twice(n, a(i, 1:n)) end subroutine """ - prg = lp.parse_fortran(fortran_src).with_entrypoints("twice_cross") - print(lp.generate_code_v2(prg).device_code()) + t_unit = lp.parse_fortran(fortran_src).with_entrypoints("twice_cross") + print(lp.generate_code_v2(t_unit).device_code()) def test_domain_fusion_imperfectly_nested(): @@ -648,10 +648,10 @@ def test_domain_fusion_imperfectly_nested(): end subroutine """ - prg = lp.parse_fortran(fortran_src) + t_unit = lp.parse_fortran(fortran_src) # If n > 0 and m == 0, a single domain would be empty, # leading (incorrectly) to no assignments to 'a'. - assert len(prg["imperfect"].domains) > 1 + assert len(t_unit["imperfect"].domains) > 1 if __name__ == "__main__": diff --git a/test/test_loopy.py b/test/test_loopy.py index 1be7ba732..e1e803a77 100644 --- a/test/test_loopy.py +++ b/test/test_loopy.py @@ -2758,7 +2758,7 @@ def test_shape_mismatch_check(ctx_factory): ctx = ctx_factory() queue = cl.CommandQueue(ctx) - prg = lp.make_kernel( + t_unit = lp.make_kernel( "{[i,j]: 0 <= i < n and 0 <= j < m}", "c[i] = sum(j, a[i,j]*b[j])", default_order="F") @@ -2766,11 +2766,11 @@ def test_shape_mismatch_check(ctx_factory): a = np.random.rand(10, 10).astype(np.float32) b = np.random.rand(10).astype(np.float32) - if prg["loopy_kernel"].options.skip_arg_checks: + if t_unit["loopy_kernel"].options.skip_arg_checks: pytest.skip("args checks disabled, cannot check") with pytest.raises(TypeError, match="strides mismatch"): - prg(queue, a=a, b=b) + t_unit(queue, a=a, b=b) def test_array_arg_extra_kwargs_persis_hash(): @@ -2846,7 +2846,7 @@ def test_empty_domain(ctx_factory, tag): ctx = ctx_factory() queue = cl.CommandQueue(ctx) - prg = lp.make_kernel( + t_unit = lp.make_kernel( "{[i,j]: 0 <= i < n}", """ for i @@ -2855,15 +2855,15 @@ def test_empty_domain(ctx_factory, tag): """) if tag == "fixed": - prg = lp.fix_parameters(prg, n=0) + t_unit = lp.fix_parameters(t_unit, n=0) kwargs = {} else: - prg = lp.tag_inames(prg, {"i": tag}) + t_unit = lp.tag_inames(t_unit, {"i": tag}) kwargs = {"n": 0} - prg = lp.set_options(prg, write_code=True) + t_unit = lp.set_options(t_unit, write_code=True) c = cl.array.zeros(queue, (), dtype=np.int32) - prg(queue, c=c, **kwargs) + t_unit(queue, c=c, **kwargs) assert (c.get() == 0).all() diff --git a/test/test_transform.py b/test/test_transform.py index 9ac29766b..1e75aa0bc 100644 --- a/test/test_transform.py +++ b/test/test_transform.py @@ -572,12 +572,12 @@ def test_nested_substs_in_insns(ctx_factory): """ ) - prg = lp.expand_subst(ref_prg) + t_unit = lp.expand_subst(ref_prg) assert not any( cknl.subkernel.substitutions - for cknl in prg.callables_table.values()) + for cknl in t_unit.callables_table.values()) - lp.auto_test_vs_ref(ref_prg, ctx, prg) + lp.auto_test_vs_ref(ref_prg, ctx, t_unit) def test_extract_subst_with_iname_deps_in_templ(ctx_factory): -- GitLab