Commit 26cac6b4 authored by Martin Bauer's avatar Martin Bauer
Browse files

Renamed types.py to data_types.py

- renaming because of clashes with types.py from other packages
parent 2e015cf5
from pystencils.field import Field, extractCommonSubexpressions
from pystencils.types import TypedSymbol
from pystencils.data_types import TypedSymbol
from pystencils.slicing import makeSlice
import sympy as sp
from sympy.tensor import IndexedBase
from pystencils.field import Field
from pystencils.types import TypedSymbol, createType, get_type_from_sympy, createTypeFromString, castFunc
from pystencils.data_types import TypedSymbol, createType, get_type_from_sympy, createTypeFromString, castFunc
class ResolvedFieldAccess(sp.Indexed):
......
......@@ -9,7 +9,7 @@ from sympy.core.mul import _keep_coeff
from sympy.core import S
from pystencils.astnodes import Node, ResolvedFieldAccess, SympyAssignment
from pystencils.types import createType, PointerType, getTypeOfExpression, VectorType, castFunc
from pystencils.data_types import createType, PointerType, getTypeOfExpression, VectorType, castFunc
from pystencils.backends.simd_instruction_sets import selectedInstructionSet
......
......@@ -6,7 +6,7 @@ from sympy import S
# S is numbers?
from pystencils.llvm.control_flow import Loop
from ..types import createType
from ..data_types import createType
from ..astnodes import Indexed
......
......@@ -73,7 +73,7 @@ from ctypes import cdll
from pystencils.backends.cbackend import generateC, getHeaders
from collections import OrderedDict, Mapping
from pystencils.transformations import symbolNameToVariableName
from pystencils.types import toCtypes, getBaseType, StructType
from pystencils.data_types import toCtypes, getBaseType, StructType
def makePythonFunction(kernelFunctionNode, argumentDict={}):
......
......@@ -4,7 +4,7 @@ from pystencils.astnodes import SympyAssignment, Block, LoopOverCoordinate, Kern
from pystencils.transformations import resolveFieldAccesses, makeLoopOverDomain, \
typeAllEquations, getOptimalLoopOrdering, parseBasePointerInfo, moveConstantsBeforeLoop, splitInnerLoop, \
substituteArrayAccessesWithConstants
from pystencils.types import TypedSymbol, BasicType, StructType, createType
from pystencils.data_types import TypedSymbol, BasicType, StructType, createType
from pystencils.field import Field
import pystencils.astnodes as ast
......
......@@ -3,7 +3,7 @@ import numpy as np
import sympy as sp
from sympy.core.cache import cacheit
from sympy.tensor import IndexedBase
from pystencils.types import TypedSymbol, createType
from pystencils.data_types import TypedSymbol, createType
class Field(object):
......
......@@ -4,7 +4,7 @@ import pycuda.autoinit
from pycuda.compiler import SourceModule
from pystencils.backends.cbackend import generateC
from pystencils.transformations import symbolNameToVariableName
from pystencils.types import StructType, getBaseType
from pystencils.data_types import StructType, getBaseType
def makePythonFunction(kernelFunctionNode, argumentDict={}):
......
......@@ -6,7 +6,7 @@ import pycuda.autoinit
from pystencils.astnodes import Conditional, Block
from pystencils.slicing import normalizeSlice
from pystencils.types import TypedSymbol, createTypeFromString
from pystencils.data_types import TypedSymbol, createTypeFromString
BLOCK_IDX = [TypedSymbol("blockIdx." + coord, createTypeFromString("int")) for coord in ('x', 'y', 'z')]
THREAD_IDX = [TypedSymbol("threadIdx." + coord, createTypeFromString("int")) for coord in ('x', 'y', 'z')]
......
......@@ -2,7 +2,7 @@ from pystencils.gpucuda.indexing import BlockIndexing
from pystencils.transformations import resolveFieldAccesses, typeAllEquations, parseBasePointerInfo, getCommonShape, \
substituteArrayAccessesWithConstants
from pystencils.astnodes import Block, KernelFunction, SympyAssignment, LoopOverCoordinate
from pystencils.types import TypedSymbol, BasicType, StructType
from pystencils.data_types import TypedSymbol, BasicType, StructType
from pystencils import Field
......
from jinja2 import Template
from pystencils.cpu import generateC
from pystencils.sympyextensions import prod
from pystencils.types import getBaseType
from pystencils.data_types import getBaseType
benchmarkTemplate = Template("""
#include "kerncraft.h"
......
import llvmlite.ir as ir
import llvmlite.binding as llvm
from ..types import toCtypes, createType
from ..data_types import toCtypes, createType
import ctypes as ct
......
......@@ -2,7 +2,7 @@ import sympy as sp
from pystencils.transformations import resolveFieldAccesses, makeLoopOverDomain, typingFromSympyInspection, \
typeAllEquations, getOptimalLoopOrdering, parseBasePointerInfo, moveConstantsBeforeLoop, splitInnerLoop, \
desympy_ast, insert_casts
from pystencils.types import TypedSymbol
from pystencils.data_types import TypedSymbol
from pystencils.field import Field
import pystencils.astnodes as ast
......
......@@ -7,7 +7,7 @@ from sympy.logic.boolalg import Boolean
from sympy.tensor import IndexedBase
from pystencils.field import Field, offsetComponentToDirectionString
from pystencils.types import TypedSymbol, createType, PointerType, StructType, getBaseType, castFunc
from pystencils.data_types import TypedSymbol, createType, PointerType, StructType, getBaseType, castFunc
from pystencils.slicing import normalizeSlice
import pystencils.astnodes as ast
......
......@@ -2,7 +2,7 @@ import sympy as sp
import warnings
from pystencils.transformations import filteredTreeIteration
from pystencils.types import TypedSymbol, VectorType, BasicType, getTypeOfExpression, castFunc, collateTypes
from pystencils.data_types import TypedSymbol, VectorType, BasicType, getTypeOfExpression, castFunc, collateTypes
import pystencils.astnodes as ast
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment