Skip to content
Snippets Groups Projects
Commit 0d12b053 authored by Markus Holzer's avatar Markus Holzer
Browse files

Merge branch 'cuda_codegen_bugfix' into 'master'

Adapted paramater references in Split template

See merge request walberla/walberla!268
parents 54d2f3e6 8d11e032
Branches
Tags
No related merge requests found
...@@ -48,6 +48,7 @@ namespace {{namespace}} { ...@@ -48,6 +48,7 @@ namespace {{namespace}} {
void {{class_name}}::operator() ( IBlock * block{%if target is equalto 'gpu'%} , cudaStream_t stream{% endif %} ) void {{class_name}}::operator() ( IBlock * block{%if target is equalto 'gpu'%} , cudaStream_t stream{% endif %} )
{ {
{{kernel|generate_block_data_to_field_extraction|indent(4)}} {{kernel|generate_block_data_to_field_extraction|indent(4)}}
{{kernel|generate_refs_for_kernel_parameters(prefix='this->', ignore_fields=True)|indent(4) }}
{{kernel|generate_call(stream='stream')|indent(4)}} {{kernel|generate_call(stream='stream')|indent(4)}}
{{kernel|generate_swaps|indent(4)}} {{kernel|generate_swaps|indent(4)}}
} }
...@@ -67,6 +68,7 @@ void {{class_name}}::runOnCellInterval( const shared_ptr<StructuredBlockStorage> ...@@ -67,6 +68,7 @@ void {{class_name}}::runOnCellInterval( const shared_ptr<StructuredBlockStorage>
return; return;
{{kernel|generate_block_data_to_field_extraction|indent(4)}} {{kernel|generate_block_data_to_field_extraction|indent(4)}}
{{kernel|generate_refs_for_kernel_parameters(prefix='this->', ignore_fields=True)|indent(4) }}
{{kernel|generate_call(stream='stream', cell_interval='ci')|indent(4)}} {{kernel|generate_call(stream='stream', cell_interval='ci')|indent(4)}}
{{kernel|generate_swaps|indent(4)}} {{kernel|generate_swaps|indent(4)}}
} }
...@@ -79,6 +81,7 @@ void {{class_name}}::inner( IBlock * block{%if target is equalto 'gpu'%} , cudaS ...@@ -79,6 +81,7 @@ void {{class_name}}::inner( IBlock * block{%if target is equalto 'gpu'%} , cudaS
CellInterval inner = {{field}}->xyzSize(); CellInterval inner = {{field}}->xyzSize();
inner.expand(Cell(-outerWidth_[0], -outerWidth_[1], -outerWidth_[2])); inner.expand(Cell(-outerWidth_[0], -outerWidth_[1], -outerWidth_[2]));
{{kernel|generate_refs_for_kernel_parameters(prefix='this->', ignore_fields=True)|indent(4) }}
{{kernel|generate_call(stream='stream', cell_interval='inner')|indent(4)}} {{kernel|generate_call(stream='stream', cell_interval='inner')|indent(4)}}
} }
...@@ -117,6 +120,7 @@ void {{class_name}}::outer( IBlock * block{%if target is equalto 'gpu'%} , cudaS ...@@ -117,6 +120,7 @@ void {{class_name}}::outer( IBlock * block{%if target is equalto 'gpu'%} , cudaS
for( auto & ci: layers_ ) for( auto & ci: layers_ )
{ {
parallelSection_.run([&]( auto s ) { parallelSection_.run([&]( auto s ) {
{{kernel|generate_refs_for_kernel_parameters(prefix='this->', ignore_fields=True)|indent(4) }}
{{kernel|generate_call(stream='s', cell_interval='ci')|indent(16)}} {{kernel|generate_call(stream='s', cell_interval='ci')|indent(16)}}
}); });
} }
......
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