Skip to content

Commit c073c3f

Browse files
joeljonssonjoeljonsson
committed
rename new convolution functions
`isotropic_convolve_xxx` -> `isotropic_convolve_xxx_direct`. Reinstante default arguments for the old function signatures to retain the previous behavior.
1 parent 660825d commit c073c3f

File tree

5 files changed

+30
-27
lines changed

5 files changed

+30
-27
lines changed

‎src/numerics/APRIsoConvGPU333.cu‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1506,8 +1506,9 @@ void isotropic_convolve_333_alt(GPUAccessHelper& access, GPUAccessHelper& tree_a
15061506

15071507

15081508
template<typename inputType, typename outputType, typename stencilType, typename treeType>
1509-
void isotropic_convolve_333(GPUAccessHelper& access, GPUAccessHelper& tree_access, VectorData<inputType>& input, VectorData<outputType>& output,
1510-
VectorData<stencilType>& stencil, VectorData<treeType>& tree_data, bool reflective_bc) {
1509+
void isotropic_convolve_333_direct(GPUAccessHelper& access, GPUAccessHelper& tree_access, VectorData<inputType>& input,
1510+
VectorData<outputType>& output, VectorData<stencilType>& stencil,
1511+
VectorData<treeType>& tree_data, bool reflective_bc) {
15111512

15121513
tree_access.init_gpu();
15131514
access.init_gpu(tree_access);
@@ -1612,11 +1613,11 @@ void isotropic_convolve_333_alt(GPUAccessHelper& access, GPUAccessHelper& tree_a
16121613

16131614

16141615
/// instantiate templates
1615-
template void isotropic_convolve_333(GPUAccessHelper&, GPUAccessHelper&, VectorData<uint8_t>&, VectorData<float>&, VectorData<float>&, VectorData<float>&, bool);
1616-
template void isotropic_convolve_333(GPUAccessHelper&, GPUAccessHelper&, VectorData<uint16_t>&, VectorData<float>&, VectorData<float>&, VectorData<float>&, bool);
1617-
template void isotropic_convolve_333(GPUAccessHelper&, GPUAccessHelper&, VectorData<uint64_t>&, VectorData<float>&, VectorData<float>&, VectorData<float>&, bool);
1618-
template void isotropic_convolve_333(GPUAccessHelper&, GPUAccessHelper&, VectorData<float>&, VectorData<float>&, VectorData<float>&, VectorData<float>&, bool);
1619-
template void isotropic_convolve_333(GPUAccessHelper&, GPUAccessHelper&, VectorData<uint16_t>&, VectorData<double>&, VectorData<double>&, VectorData<double>&, bool);
1616+
template void isotropic_convolve_333_direct(GPUAccessHelper&, GPUAccessHelper&, VectorData<uint8_t>&, VectorData<float>&, VectorData<float>&, VectorData<float>&, bool);
1617+
template void isotropic_convolve_333_direct(GPUAccessHelper&, GPUAccessHelper&, VectorData<uint16_t>&, VectorData<float>&, VectorData<float>&, VectorData<float>&, bool);
1618+
template void isotropic_convolve_333_direct(GPUAccessHelper&, GPUAccessHelper&, VectorData<uint64_t>&, VectorData<float>&, VectorData<float>&, VectorData<float>&, bool);
1619+
template void isotropic_convolve_333_direct(GPUAccessHelper&, GPUAccessHelper&, VectorData<float>&, VectorData<float>&, VectorData<float>&, VectorData<float>&, bool);
1620+
template void isotropic_convolve_333_direct(GPUAccessHelper&, GPUAccessHelper&, VectorData<uint16_t>&, VectorData<double>&, VectorData<double>&, VectorData<double>&, bool);
16201621

16211622
template void isotropic_convolve_333_alt(GPUAccessHelper&, GPUAccessHelper&, VectorData<uint8_t>&, VectorData<float>&, VectorData<float>&, VectorData<float>&, bool, bool);
16221623
template void isotropic_convolve_333_alt(GPUAccessHelper&, GPUAccessHelper&, VectorData<uint16_t>&, VectorData<float>&, VectorData<float>&, VectorData<float>&, bool, bool);

‎src/numerics/APRIsoConvGPU333.hpp‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,34 +14,34 @@
1414
/// high-level functions including data transfer
1515

1616
template<typename inputType, typename outputType, typename stencilType, typename treeType>
17-
void isotropic_convolve_333(GPUAccessHelper& access, GPUAccessHelper& tree_access, VectorData<inputType>& input,
18-
VectorData<outputType>& output, VectorData<stencilType>& stencil,
19-
VectorData<treeType>& tree_data, bool reflective_bc);
17+
void isotropic_convolve_333_direct(GPUAccessHelper& access, GPUAccessHelper& tree_access, VectorData<inputType>& input,
18+
VectorData<outputType>& output, VectorData<stencilType>& stencil,
19+
VectorData<treeType>& tree_data, bool reflective_bc);
2020

2121

2222
template<typename inputType, typename outputType, typename stencilType, typename treeType>
2323
void isotropic_convolve_333(GPUAccessHelper& access, GPUAccessHelper& tree_access, VectorData<inputType>& input,
2424
VectorData<outputType>& output, VectorData<stencilType>& stencil, VectorData<treeType>& tree_data,
25-
bool reflective_bc, bool use_stencil_downsample, bool normalize_stencil) {
25+
bool reflective_bc=false, bool use_stencil_downsample=false, bool normalize_stencil=false) {
2626
assert(stencil.size() == 27);
2727
VectorData<stencilType> stencil_vec;
2828
const int nlevels = use_stencil_downsample ? access.level_max() - access.level_min() : 1;
2929
APRStencil::get_downsampled_stencils(stencil, stencil_vec, nlevels, normalize_stencil);
30-
isotropic_convolve_333(access, tree_access, input, output, stencil_vec, tree_data, reflective_bc);
30+
isotropic_convolve_333_direct(access, tree_access, input, output, stencil_vec, tree_data, reflective_bc);
3131
}
3232

3333

3434
template<typename inputType, typename outputType, typename stencilType, typename treeType>
3535
void isotropic_convolve_333(GPUAccessHelper& access, GPUAccessHelper& tree_access, VectorData<inputType>& input,
3636
VectorData<outputType>& output, PixelData<stencilType>& stencil, VectorData<treeType>& tree_data,
37-
bool reflective_bc, bool use_stencil_downsample, bool normalize_stencil) {
37+
bool reflective_bc=false, bool use_stencil_downsample=false, bool normalize_stencil=false) {
3838
assert(stencil.z_num == 3);
3939
assert(stencil.x_num == 3);
4040
assert(stencil.y_num == 3);
4141
VectorData<stencilType> stencil_vec;
4242
const int nlevels = use_stencil_downsample ? access.level_max() - access.level_min() : 1;
4343
APRStencil::get_downsampled_stencils(stencil, stencil_vec, nlevels, normalize_stencil);
44-
isotropic_convolve_333(access, tree_access, input, output, stencil_vec, tree_data, reflective_bc);
44+
isotropic_convolve_333_direct(access, tree_access, input, output, stencil_vec, tree_data, reflective_bc);
4545
}
4646

4747

‎src/numerics/APRIsoConvGPU555.cu‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1727,8 +1727,9 @@ void isotropic_convolve_555_ds_alt(GPUAccessHelper& access, GPUAccessHelper& tre
17271727

17281728

17291729
template<typename inputType, typename outputType, typename stencilType, typename treeType>
1730-
void isotropic_convolve_555(GPUAccessHelper& access, GPUAccessHelper& tree_access, VectorData<inputType>& input, VectorData<outputType>& output,
1731-
VectorData<stencilType>& stencil, VectorData<treeType>& tree_data, bool reflective_bc) {
1730+
void isotropic_convolve_555_direct(GPUAccessHelper& access, GPUAccessHelper& tree_access, VectorData<inputType>& input,
1731+
VectorData<outputType>& output,VectorData<stencilType>& stencil,
1732+
VectorData<treeType>& tree_data, bool reflective_bc) {
17321733

17331734
tree_access.init_gpu();
17341735
access.init_gpu(tree_access);
@@ -1844,11 +1845,11 @@ void isotropic_convolve_555_alt(GPUAccessHelper& access, GPUAccessHelper& tree_a
18441845
}
18451846

18461847

1847-
template void isotropic_convolve_555(GPUAccessHelper&, GPUAccessHelper&, VectorData<uint8_t>&, VectorData<float>&, VectorData<float>&, VectorData<float>&, bool);
1848-
template void isotropic_convolve_555(GPUAccessHelper&, GPUAccessHelper&, VectorData<uint16_t>&, VectorData<float>&, VectorData<float>&, VectorData<float>&, bool);
1849-
template void isotropic_convolve_555(GPUAccessHelper&, GPUAccessHelper&, VectorData<uint64_t>&, VectorData<float>&, VectorData<float>&, VectorData<float>&, bool);
1850-
template void isotropic_convolve_555(GPUAccessHelper&, GPUAccessHelper&, VectorData<float>&, VectorData<float>&, VectorData<float>&, VectorData<float>&, bool);
1851-
template void isotropic_convolve_555(GPUAccessHelper&, GPUAccessHelper&, VectorData<uint16_t>&, VectorData<double>&, VectorData<double>&, VectorData<double>&, bool);
1848+
template void isotropic_convolve_555_direct(GPUAccessHelper&, GPUAccessHelper&, VectorData<uint8_t>&, VectorData<float>&, VectorData<float>&, VectorData<float>&, bool);
1849+
template void isotropic_convolve_555_direct(GPUAccessHelper&, GPUAccessHelper&, VectorData<uint16_t>&, VectorData<float>&, VectorData<float>&, VectorData<float>&, bool);
1850+
template void isotropic_convolve_555_direct(GPUAccessHelper&, GPUAccessHelper&, VectorData<uint64_t>&, VectorData<float>&, VectorData<float>&, VectorData<float>&, bool);
1851+
template void isotropic_convolve_555_direct(GPUAccessHelper&, GPUAccessHelper&, VectorData<float>&, VectorData<float>&, VectorData<float>&, VectorData<float>&, bool);
1852+
template void isotropic_convolve_555_direct(GPUAccessHelper&, GPUAccessHelper&, VectorData<uint16_t>&, VectorData<double>&, VectorData<double>&, VectorData<double>&, bool);
18521853

18531854
template void isotropic_convolve_555_alt(GPUAccessHelper&, GPUAccessHelper&, VectorData<uint8_t>&, VectorData<float>&, VectorData<float>&, VectorData<float>&, bool, bool);
18541855
template void isotropic_convolve_555_alt(GPUAccessHelper&, GPUAccessHelper&, VectorData<uint16_t>&, VectorData<float>&, VectorData<float>&, VectorData<float>&, bool, bool);

‎src/numerics/APRIsoConvGPU555.hpp‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,9 @@
1515

1616

1717
template<typename inputType, typename outputType, typename stencilType, typename treeType>
18-
void isotropic_convolve_555(GPUAccessHelper& access, GPUAccessHelper& tree_access, VectorData<inputType>& input, VectorData<outputType>& output,
19-
VectorData<stencilType>& stencil, VectorData<treeType>& tree_data, bool reflective_bc);
18+
void isotropic_convolve_555_direct(GPUAccessHelper& access, GPUAccessHelper& tree_access, VectorData<inputType>& input,
19+
VectorData<outputType>& output, VectorData<stencilType>& stencil,
20+
VectorData<treeType>& tree_data, bool reflective_bc);
2021

2122

2223
template<typename inputType, typename outputType, typename stencilType, typename treeType>
@@ -27,7 +28,7 @@ void isotropic_convolve_555(GPUAccessHelper& access, GPUAccessHelper& tree_acces
2728
VectorData<stencilType> stencil_vec;
2829
const int nlevels = use_stencil_downsample ? access.level_max() - access.level_min() : 1;
2930
APRStencil::get_downsampled_stencils(stencil, stencil_vec, nlevels, normalize_stencil);
30-
isotropic_convolve_555(access, tree_access, input, output, stencil_vec, tree_data, reflective_bc);
31+
isotropic_convolve_555_direct(access, tree_access, input, output, stencil_vec, tree_data, reflective_bc);
3132
}
3233

3334

@@ -41,7 +42,7 @@ void isotropic_convolve_555(GPUAccessHelper& access, GPUAccessHelper& tree_acces
4142
VectorData<stencilType> stencil_vec;
4243
const int nlevels = use_stencil_downsample ? access.level_max() - access.level_min() : 1;
4344
APRStencil::get_downsampled_stencils(stencil, stencil_vec, nlevels, normalize_stencil);
44-
isotropic_convolve_555(access, tree_access, input, output, stencil_vec, tree_data, reflective_bc);
45+
isotropic_convolve_555_direct(access, tree_access, input, output, stencil_vec, tree_data, reflective_bc);
4546
}
4647

4748

‎src/numerics/APRNumericsGPU.hpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ void APRNumericsGPU::gradient_cfd(GPUAccessHelper &access, GPUAccessHelper &tree
128128
APRStencil::get_rescaled_stencils(stencil, stencil_vec, access.level_max()-access.level_min());
129129

130130
VectorData<float> tree_data;
131-
isotropic_convolve_333(access, tree_access, inputParticles, outputParticles, stencil_vec, tree_data, true);
131+
isotropic_convolve_333_direct(access, tree_access, inputParticles, outputParticles, stencil_vec, tree_data, true);
132132
}
133133

134134

@@ -143,7 +143,7 @@ void APRNumericsGPU::gradient_sobel(GPUAccessHelper &access, GPUAccessHelper &tr
143143
APRStencil::get_rescaled_stencils(stencil, stencil_vec, access.level_max()-access.level_min());
144144

145145
VectorData<float> tree_data;
146-
isotropic_convolve_333(access, tree_access, inputParticles, outputParticles, stencil_vec, tree_data, true);
146+
isotropic_convolve_333_direct(access, tree_access, inputParticles, outputParticles, stencil_vec, tree_data, true);
147147
}
148148

149149

0 commit comments

Comments
 (0)