move addressOf and RNG to sympyextensions

src/pystencils/functions.py → src/pystencils/sympyextensions/pointers.py

 import sympy as sp
-from .types import PsPointerType
+from ..types import PsPointerType
 
 
 class AddressOf(sp.Function):

src/pystencils/rng.py → src/pystencils/sympyextensions/rng.py

@@ -7,6 +7,7 @@ from pystencils.sympyextensions import TypedSymbol, CastFunc
 # from pystencils.backends.cbackend import CustomCodeNode # TODO nbackend: replace
 from pystencils.sympyextensions import fast_subs
 
+
 # class RNGBase(CustomCodeNode): TODO nbackend: replace
 class RNGBase:
 

src/pystencils/sympyextensions/typed_sympy.py

@@ -142,8 +142,7 @@ class FieldShapeSymbol(TypedSymbol):
     def __new_stage2__(cls, field_name: str, coordinate: int):
         from ..defaults import DEFAULTS
 
-        names = "_".join([field_name for field_name in field_names])
-        name = f"_size_{names}_{coordinate}"
+        name = f"_size_{field_name}_{coordinate}"
         obj = super(FieldShapeSymbol, cls).__xnew__(
             cls, name, DEFAULTS.index_dtype, positive=True
         )

tests/test_address_of.py

@@ -4,7 +4,7 @@ Test of pystencils.data_types.address_of
 import pytest
 import pystencils
 from pystencils.typing import PointerType, CastFunc, BasicType
-from pystencils.functions import AddressOf
+from pystencils.sympyextensions.pointers import AddressOf
 from pystencils.simp.simplifications import sympy_cse
 
 import sympy as sp

tests/test_fvm.py

@@ -3,7 +3,7 @@ import pystencils as ps
 import numpy as np
 import pytest
 from itertools import product
-from pystencils.rng import random_symbol
+from pystencils.sympyextensions.rng import random_symbol
 from pystencils.sympyextensions.astnodes import SympyAssignment
 from pystencils.node_collection import NodeCollection
 

tests/test_random.py

@@ -5,7 +5,7 @@ import pytest
 import pystencils as ps
 from pystencils.sympyextensions.astnodes import SympyAssignment
 from pystencils.node_collection import NodeCollection
-from pystencils.rng import PhiloxFourFloats, PhiloxTwoDoubles, AESNIFourFloats, AESNITwoDoubles, random_symbol
+from pystencils.sympyextensions.rng import PhiloxFourFloats, PhiloxTwoDoubles, AESNIFourFloats, AESNITwoDoubles, random_symbol
 from pystencils.backends.simd_instruction_sets import get_supported_instruction_sets
 from pystencils.cpu.cpujit import get_compiler_config
 from pystencils.typing import TypedSymbol