Skip to content
Snippets Groups Projects
Commit 2b6ae723 authored by Stephan Seitz's avatar Stephan Seitz
Browse files

Merge branch 'mr_parallel_datahandling_fix' into 'master'

Added guard around import to avoid failing when walberla is there but no python module is built

See merge request pycodegen/pystencils!147
parents 593613c5 9b4a480b
No related merge requests found
...@@ -8,11 +8,18 @@ from pystencils.boundaries.createindexlist import ( ...@@ -8,11 +8,18 @@ from pystencils.boundaries.createindexlist import (
create_boundary_index_array, numpy_data_type_for_boundary_object) create_boundary_index_array, numpy_data_type_for_boundary_object)
from pystencils.cache import memorycache from pystencils.cache import memorycache
from pystencils.data_types import TypedSymbol, create_type from pystencils.data_types import TypedSymbol, create_type
from pystencils.datahandling import ParallelDataHandling
from pystencils.datahandling.pycuda import PyCudaArrayHandler from pystencils.datahandling.pycuda import PyCudaArrayHandler
from pystencils.field import Field from pystencils.field import Field
from pystencils.kernelparameters import FieldPointerSymbol from pystencils.kernelparameters import FieldPointerSymbol
try:
# noinspection PyPep8Naming
import waLBerla as wlb
if wlb.cpp_available:
from pystencils.datahandling.parallel_datahandling import ParallelDataHandling
except ImportError:
ParallelDataHandling = None
DEFAULT_FLAG_TYPE = np.uint32 DEFAULT_FLAG_TYPE = np.uint32
......
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