master to destructuring-field-binding · Stephan Seitz / pystencils

pystencils/astnodes.py

+4
−4

Original line number
Original line
Diff line number
Diff line

@@ -669,10 +669,10 @@ class DestructuringBindingsForFieldClass(Node):

    """

    """

    CLASS_TO_MEMBER_DICT = {

    CLASS_TO_MEMBER_DICT = {

        FieldPointerSymbol: "data",

        FieldPointerSymbol: "data",

        FieldShapeSymbol: "shape",

        FieldShapeSymbol: "shape[%i]",

        FieldStrideSymbol: "stride"

        FieldStrideSymbol: "stride[%i]"

    }

    }

    CLASS_NAME_TEMPLATE = jinja2.Template("Field<{{ dtype }}, {{ ndim }}>")

    CLASS_NAME_TEMPLATE = jinja2.Template("PyStencilsField<{{ dtype }}, {{ ndim }}>")

    @property

    @property

    def fields_accessed(self) -> Set['ResolvedFieldAccess']:

    def fields_accessed(self) -> Set['ResolvedFieldAccess']:

@@ -681,7 +681,7 @@ class DestructuringBindingsForFieldClass(Node):

    def __init__(self, body):

    def __init__(self, body):

        super(DestructuringBindingsForFieldClass, self).__init__()

        super(DestructuringBindingsForFieldClass, self).__init__()

        self.headers = ['<Field.h>']

        self.headers = ['<PyStencilsField.h>']

        self.body = body

        self.body = body

    @property

    @property

pystencils/backends/cbackend.py

+6
−5

Original line number
Original line
Diff line number
Diff line

@@ -6,7 +6,7 @@ import sympy as sp

from sympy.core import S

from sympy.core import S

from sympy.printing.ccode import C89CodePrinter

from sympy.printing.ccode import C89CodePrinter

from pystencils.astnodes import DestructuringBindingsForFieldClass, KernelFunction, Node

from pystencils.astnodes import KernelFunction, Node

from pystencils.cpu.vectorization import vec_all, vec_any

from pystencils.cpu.vectorization import vec_all, vec_any

from pystencils.data_types import (

from pystencils.data_types import (

    PointerType, VectorType, address_of, cast_func, create_type, get_type_of_expression,

    PointerType, VectorType, address_of, cast_func, create_type, get_type_of_expression,

@@ -261,11 +261,12 @@ class CBackend:

    def _print_DestructuringBindingsForFieldClass(self, node: Node):

    def _print_DestructuringBindingsForFieldClass(self, node: Node):

        # Define all undefined symbols

        # Define all undefined symbols

        undefined_field_symbols = node.symbols_defined

        undefined_field_symbols = node.symbols_defined

        destructuring_bindings = ["%s = %s.%s%s;" %

        destructuring_bindings = ["%s %s = %s.%s;" %

                                  (u.name,

                                  (u.dtype,

                                   u.name,

                                   u.field_name if hasattr(u, 'field_name') else u.field_names[0],

                                   u.field_name if hasattr(u, 'field_name') else u.field_names[0],

                                   DestructuringBindingsForFieldClass.CLASS_TO_MEMBER_DICT[u.__class__],

                                   node.CLASS_TO_MEMBER_DICT[u.__class__] %

                                   "" if type(u) == FieldPointerSymbol else ("[%i]" % u.coordinate))

                                   (() if type(u) == FieldPointerSymbol else (u.coordinate,)))

                                  for u in undefined_field_symbols

                                  for u in undefined_field_symbols

                                  ]

                                  ]

        destructuring_bindings.sort()  # only for code aesthetics

        destructuring_bindings.sort()  # only for code aesthetics

pystencils/include/PyStencilsField.h0 → 100644

+19
−0

Original line number
Original line
Diff line number
Diff line

#pragma once

extern "C++" {

#ifdef __CUDA_ARCH__

template <typename DTYPE_T, std::size_t DIMENSION> struct PyStencilsField {

  DTYPE_T *data;

  DTYPE_T shape[DIMENSION];

  DTYPE_T stride[DIMENSION];

};

#else

#include <array>

template <typename DTYPE_T, std::size_t DIMENSION> struct PyStencilsField {

  DTYPE_T *data;

  std::array<DTYPE_T, DIMENSION> shape;

  std::array<DTYPE_T, DIMENSION> stride;

};

#endif

}

pystencils_tests/test_destructuring_field_class.py

+29
−1

Original line number
Original line
Diff line number
Diff line

@@ -8,9 +8,13 @@

"""

"""

import sympy

import sympy

import jinja2

import pystencils

import pystencils

from pystencils.astnodes import DestructuringBindingsForFieldClass

from pystencils.astnodes import DestructuringBindingsForFieldClass

from pystencils.kernelparameters import  FieldPointerSymbol, FieldShapeSymbol, FieldStrideSymbol

def test_destructuring_field_class():

def test_destructuring_field_class():

@@ -19,15 +23,39 @@ def test_destructuring_field_class():

    normal_assignments = pystencils.AssignmentCollection([pystencils.Assignment(

    normal_assignments = pystencils.AssignmentCollection([pystencils.Assignment(

        z[0, 0], x[0, 0] * sympy.log(x[0, 0] * y[0, 0]))], [])

        z[0, 0], x[0, 0] * sympy.log(x[0, 0] * y[0, 0]))], [])

    ast = pystencils.create_kernel(normal_assignments)

    ast = pystencils.create_kernel(normal_assignments, target='gpu')

    print(pystencils.show_code(ast))

    print(pystencils.show_code(ast))

    ast.body = DestructuringBindingsForFieldClass(ast.body)

    ast.body = DestructuringBindingsForFieldClass(ast.body)

    print(pystencils.show_code(ast))

    print(pystencils.show_code(ast))

    ast.compile()

class DestructuringEmojiClass(DestructuringBindingsForFieldClass):

    CLASS_TO_MEMBER_DICT = {

        FieldPointerSymbol: "🥶",

        FieldShapeSymbol: "😳_%i",

        FieldStrideSymbol: "🥵_%i"

    }

    CLASS_NAME_TEMPLATE = jinja2.Template("🤯<{{ dtype }}, {{ ndim }}>")

    def __init__(self, node):

        super().__init__(node)

        self.headers = []

def test_destructuring_alternative_field_class():

    z, x, y = pystencils.fields("z, y, x: [2d]")

    normal_assignments = pystencils.AssignmentCollection([pystencils.Assignment(

        z[0, 0], x[0, 0] * sympy.log(x[0, 0] * y[0, 0]))], [])

    ast = pystencils.create_kernel(normal_assignments, target='gpu')

    ast.body = DestructuringEmojiClass(ast.body)

    print(pystencils.show_code(ast))

def main():

def main():

    test_destructuring_field_class()

    test_destructuring_field_class()

    test_destructuring_alternative_field_class()

if __name__ == '__main__':

if __name__ == '__main__':

Compare revisions

Source

Target

Commits on Source 2

Files

pystencils/astnodes.py

pystencils/backends/cbackend.py

pystencils/include/PyStencilsField.h

pystencils_tests/test_destructuring_field_class.py