From bec36bb292aad7e1e2e2daf78765719d5454db12 Mon Sep 17 00:00:00 2001
From: Stephan Seitz <stephan.seitz@fau.de>
Date: Mon, 20 Jan 2020 10:00:41 +0100
Subject: [PATCH] Rename: get_code -> get_code_obj
---
pystencils/__init__.py | 4 ++--
pystencils/display_utils.py | 6 +++---
pystencils_tests/test_jacobi_cbackend.py | 4 ++--
pystencils_tests/test_sum_prod.py | 8 ++++----
pystencils_tests/test_sympy_optimizations.py | 6 +++---
5 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/pystencils/__init__.py b/pystencils/__init__.py
index b9002ddbb..18679382f 100644
--- a/pystencils/__init__.py
+++ b/pystencils/__init__.py
@@ -5,7 +5,7 @@ from . import stencil as stencil
from .assignment import Assignment, assignment_from_stencil
from .data_types import TypedSymbol
from .datahandling import create_data_handling
-from .display_utils import show_code, get_code, get_code_str, to_dot
+from .display_utils import show_code, get_code_obj, get_code_str, to_dot
from .field import Field, FieldType, fields
from .kernel_decorator import kernel
from .kernelcreation import create_indexed_kernel, create_kernel, create_staggered_kernel
@@ -25,7 +25,7 @@ __all__ = ['Field', 'FieldType', 'fields',
'TypedSymbol',
'make_slice',
'create_kernel', 'create_indexed_kernel', 'create_staggered_kernel',
- 'show_code', 'to_dot', 'get_code', 'get_code_str',
+ 'show_code', 'to_dot', 'get_code_obj', 'get_code_str',
'AssignmentCollection',
'Assignment',
'assignment_from_stencil',
diff --git a/pystencils/display_utils.py b/pystencils/display_utils.py
index 6d817e301..0bdad7ac1 100644
--- a/pystencils/display_utils.py
+++ b/pystencils/display_utils.py
@@ -35,7 +35,7 @@ def highlight_cpp(code: str):
return HTML(highlight(code, CppLexer(), HtmlFormatter()))
-def get_code(ast: Union[KernelFunction, KernelWrapper], custom_backend=None):
+def get_code_obj(ast: Union[KernelFunction, KernelWrapper], custom_backend=None):
"""Returns an object to display generated code (C/C++ or CUDA)
Can either be displayed as HTML in Jupyter notebooks or printed as normal string.
@@ -68,11 +68,11 @@ def get_code(ast: Union[KernelFunction, KernelWrapper], custom_backend=None):
def get_code_str(ast, custom_backend=None):
- return str(get_code(ast, custom_backend))
+ return str(get_code_obj(ast, custom_backend))
def show_code(ast: Union[KernelFunction, KernelWrapper], custom_backend=None):
- code = get_code(ast, custom_backend)
+ code = get_code_obj(ast, custom_backend)
try:
from IPython.display import display
diff --git a/pystencils_tests/test_jacobi_cbackend.py b/pystencils_tests/test_jacobi_cbackend.py
index 9a2fb18f6..6d86ecb05 100644
--- a/pystencils_tests/test_jacobi_cbackend.py
+++ b/pystencils_tests/test_jacobi_cbackend.py
@@ -1,6 +1,6 @@
import numpy as np
-from pystencils import get_code
+from pystencils import get_code_obj
from pystencils.astnodes import Block, KernelFunction, SympyAssignment
from pystencils.cpu import make_python_function
from pystencils.field import Field
@@ -36,7 +36,7 @@ def test_jacobi_fixed_field_size():
error = np.sum(np.abs(dst_field_py - dst_field_c))
np.testing.assert_allclose(error, 0.0, atol=1e-13)
- code_display = get_code(ast_node)
+ code_display = get_code_obj(ast_node)
assert 'for' in str(code_display)
assert 'for' in code_display._repr_html_()
diff --git a/pystencils_tests/test_sum_prod.py b/pystencils_tests/test_sum_prod.py
index 356966918..4b4cd7131 100644
--- a/pystencils_tests/test_sum_prod.py
+++ b/pystencils_tests/test_sum_prod.py
@@ -30,7 +30,7 @@ def test_sum():
})
ast = pystencils.create_kernel(assignments)
- code = str(pystencils.show_code(ast))
+ code = str(pystencils.get_code_obj(ast))
kernel = ast.compile()
print(code)
@@ -58,11 +58,11 @@ def test_sum_use_float():
})
ast = pystencils.create_kernel(assignments, data_type=create_type('float32'))
- code = str(pystencils.show_code(ast))
+ code = str(pystencils.get_code_obj(ast))
kernel = ast.compile()
print(code)
- print(pystencils.show_code(ast))
+ print(pystencils.get_code_obj(ast))
assert 'float sum' in code
array = np.zeros((10,), np.float32)
@@ -89,7 +89,7 @@ def test_product():
})
ast = pystencils.create_kernel(assignments)
- code = str(pystencils.show_code(ast))
+ code = pystencils.get_code_str(ast)
kernel = ast.compile()
print(code)
diff --git a/pystencils_tests/test_sympy_optimizations.py b/pystencils_tests/test_sympy_optimizations.py
index 745b936ea..0899d5b10 100644
--- a/pystencils_tests/test_sympy_optimizations.py
+++ b/pystencils_tests/test_sympy_optimizations.py
@@ -18,7 +18,7 @@ def test_sympy_optimizations():
assignments = optimize_assignments(assignments, optims_pystencils_cpu)
ast = pystencils.create_kernel(assignments, target=target)
- code = str(pystencils.show_code(ast))
+ code = pystencils.get_code_str(ast)
assert 'expm1(' in code
@@ -35,7 +35,7 @@ def test_evaluate_constant_terms():
assignments = optimize_assignments(assignments, optims_pystencils_cpu)
ast = pystencils.create_kernel(assignments, target=target)
- code = str(pystencils.show_code(ast))
+ code = pystencils.get_code_str(ast)
assert 'cos(' not in code
print(code)
@@ -55,6 +55,6 @@ def test_do_not_evaluate_constant_terms():
optimize_assignments(assignments, optimizations)
ast = pystencils.create_kernel(assignments, target=target)
- code = str(pystencils.show_code(ast))
+ code = pystencils.get_code_str(ast)
assert 'cos(' in code
print(code)
--
GitLab