Skip to content

Cleanup fftconvolve related code #2861

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
9prady9 merged 3 commits into from
Apr 27, 2020
Merged

Cleanup fftconvolve related code #2861

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a4661ba
Add OpenCL show build log info to debugging docs page
9prady9 Apr 27, 2020
e4f6ff6
Clean packed dims calculation in cpu fftconvolve
9prady9 Apr 27, 2020
eeb9638
Remove unnecessary template instantiations for fftconvolve
9prady9 Apr 27, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docs/pages/debugging.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Using Environment Variables
* [`AF_PRINT_ERRORS=1`](configuring_environment.htm#af_print_errors) : Makes exception's messages more helpful
* [`AF_TRACE=all`](configuring_environment.htm#af_trace): Print ArrayFire message stream to console
* [`AF_JIT_KERNEL_TRACE=stdout`](configuring_environment.htm#af_jit_kernel_trace): Writes out source code generated by ArrayFire's JIT to the specified target

* [`AF_OPENCL_SHOW_BUILD_INFO=1`](configuring_environment.htm#af_opencl_show_build_info): Print OpenCL kernel build log to console


Tips in Language Bindings
Expand Down
78 changes: 43 additions & 35 deletions src/api/c/fftconvolve.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
* The complete license agreement can be obtained at:
* http://arrayfire.com/licenses/BSD-3-Clause
********************************************************/

#include <arith.hpp>
#include <backend.hpp>
#include <common/dispatch.hpp>
Expand All @@ -18,6 +19,10 @@
#include <af/dim4.hpp>
#include <af/signal.h>

#include <algorithm>
#include <type_traits>
#include <vector>

using af::dim4;
using detail::arithOp;
using detail::Array;
Expand All @@ -32,14 +37,23 @@ using detail::uchar;
using detail::uint;
using detail::uintl;
using detail::ushort;
using std::conditional;
using std::is_integral;
using std::is_same;
using std::max;
using std::swap;
using std::vector;

template<typename T, typename convT, typename cT, int baseDim>
template<typename T, int baseDim>
static inline af_array fftconvolve_fallback(const af_array signal,
const af_array filter,
bool expand) {
using convT =
typename conditional<is_integral<T>::value || is_same<T, float>::value,
float, double>::type;
using cT = typename conditional<is_same<convT, float>::value, cfloat,
cdouble>::type;

const Array<cT> S = castArray<cT>(signal);
const Array<cT> F = castArray<cT>(filter);
const dim4 &sdims = S.dims();
Expand Down Expand Up @@ -103,14 +117,13 @@ static inline af_array fftconvolve_fallback(const af_array signal,
}
}

template<typename T, typename convT, typename cT, bool isDouble, bool roundOut,
dim_t baseDim>
template<typename T, dim_t baseDim>
inline static af_array fftconvolve(const af_array &s, const af_array &f,
const bool expand, AF_BATCH_KIND kind) {
if (kind == AF_BATCH_DIFF) {
return fftconvolve_fallback<T, convT, cT, baseDim>(s, f, expand);
return fftconvolve_fallback<T, baseDim>(s, f, expand);
} else {
return getHandle(fftconvolve<T, convT, cT, isDouble, roundOut, baseDim>(
return getHandle(fftconvolve<T, baseDim>(
getArray<T>(s), castArray<T>(f), expand, kind));
}
}
Expand Down Expand Up @@ -149,73 +162,68 @@ af_err fft_convolve(af_array *out, const af_array signal, const af_array filter,
const ArrayInfo &sInfo = getInfo(signal);
const ArrayInfo &fInfo = getInfo(filter);

af_dtype stype = sInfo.getType();
af_dtype signalType = sInfo.getType();
af_dtype filterType = fInfo.getType();

const dim4 &sdims = sInfo.dims();
const dim4 &fdims = fInfo.dims();

AF_BATCH_KIND convBT = identifyBatchKind<baseDim>(sdims, fdims);

ARG_ASSERT(1, (signalType == filterType));
ARG_ASSERT(1, (convBT != AF_BATCH_UNSUPPORTED));

af_array output;
switch (stype) {
switch (signalType) {
case f64:
output =
fftconvolve<double, double, cdouble, true, false, baseDim>(
signal, filter, expand, convBT);
output = fftconvolve<double, baseDim>(signal, filter, expand,
convBT);
break;
case f32:
output =
fftconvolve<float, float, cfloat, false, false, baseDim>(
signal, filter, expand, convBT);
fftconvolve<float, baseDim>(signal, filter, expand, convBT);
break;
case u32:
output = fftconvolve<uint, float, cfloat, false, true, baseDim>(
signal, filter, expand, convBT);
output =
fftconvolve<uint, baseDim>(signal, filter, expand, convBT);
break;
case s32:
output = fftconvolve<int, float, cfloat, false, true, baseDim>(
signal, filter, expand, convBT);
output =
fftconvolve<int, baseDim>(signal, filter, expand, convBT);
break;
case u64:
output =
fftconvolve<uintl, float, cfloat, false, true, baseDim>(
signal, filter, expand, convBT);
fftconvolve<uintl, baseDim>(signal, filter, expand, convBT);
break;
case s64:
output = fftconvolve<intl, float, cfloat, false, true, baseDim>(
signal, filter, expand, convBT);
output =
fftconvolve<intl, baseDim>(signal, filter, expand, convBT);
break;
case u16:
output =
fftconvolve<ushort, float, cfloat, false, true, baseDim>(
signal, filter, expand, convBT);
output = fftconvolve<ushort, baseDim>(signal, filter, expand,
convBT);
break;
case s16:
output =
fftconvolve<short, float, cfloat, false, true, baseDim>(
signal, filter, expand, convBT);
fftconvolve<short, baseDim>(signal, filter, expand, convBT);
break;
case u8:
output =
fftconvolve<uchar, float, cfloat, false, true, baseDim>(
signal, filter, expand, convBT);
fftconvolve<uchar, baseDim>(signal, filter, expand, convBT);
break;
case b8:
output = fftconvolve<char, float, cfloat, false, true, baseDim>(
signal, filter, expand, convBT);
output =
fftconvolve<char, baseDim>(signal, filter, expand, convBT);
break;
case c32:
output = fftconvolve_fallback<cfloat, cfloat, cfloat, baseDim>(
signal, filter, expand);
output = fftconvolve_fallback<cfloat, baseDim>(signal, filter,
expand);
break;
case c64:
output =
fftconvolve_fallback<cdouble, cdouble, cdouble, baseDim>(
signal, filter, expand);
output = fftconvolve_fallback<cdouble, baseDim>(signal, filter,
expand);
break;
default: TYPE_ERROR(1, stype);
default: TYPE_ERROR(1, signalType);
}
swap(*out, output);
}
Expand Down
2 changes: 1 addition & 1 deletion src/api/c/morph.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ static inline af_array morph(const af_array &input, const af_array &mask) {
static_cast<dim_t>(seDims[1] % 2 == 0), 0, 0},
{0, 0, 0, 0}, AF_PAD_ZERO);

auto fftConv = fftconvolve<float, float, cfloat, false, false, 2>;
auto fftConv = fftconvolve<float, 2>;

if (isDilation) {
Array<float> dft =
Expand Down
Loading