[arrayfire] 178/248: Add intl/uintl to meanshift
Ghislain Vaillant
ghisvail-guest at moszumanska.debian.org
Tue Nov 17 15:54:24 UTC 2015
This is an automated email from the git hooks/post-receive script.
ghisvail-guest pushed a commit to branch dfsg-clean
in repository arrayfire.
commit a479c25ecd2db7416d68609318e39e924bf54eec
Author: Shehzan Mohammed <shehzan at arrayfire.com>
Date: Wed Oct 21 16:45:05 2015 -0400
Add intl/uintl to meanshift
---
src/api/c/meanshift.cpp | 2 ++
src/backend/cpu/meanshift.cpp | 2 ++
src/backend/cuda/meanshift.cu | 2 ++
src/backend/opencl/meanshift.cpp | 2 ++
test/meanshift.cpp | 2 +-
5 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/src/api/c/meanshift.cpp b/src/api/c/meanshift.cpp
index 1001a9c..eb4305a 100644
--- a/src/api/c/meanshift.cpp
+++ b/src/api/c/meanshift.cpp
@@ -48,6 +48,8 @@ af_err mean_shift(af_array *out, const af_array in, const float s_sigma, const f
case u32: output = mean_shift<uint , is_color>(in, s_sigma, c_sigma, iter); break;
case s16: output = mean_shift<short , is_color>(in, s_sigma, c_sigma, iter); break;
case u16: output = mean_shift<ushort, is_color>(in, s_sigma, c_sigma, iter); break;
+ case s64: output = mean_shift<intl , is_color>(in, s_sigma, c_sigma, iter); break;
+ case u64: output = mean_shift<uintl , is_color>(in, s_sigma, c_sigma, iter); break;
case u8 : output = mean_shift<uchar , is_color>(in, s_sigma, c_sigma, iter); break;
default : TYPE_ERROR(1, type);
}
diff --git a/src/backend/cpu/meanshift.cpp b/src/backend/cpu/meanshift.cpp
index 1be2281..b52eaf9 100644
--- a/src/backend/cpu/meanshift.cpp
+++ b/src/backend/cpu/meanshift.cpp
@@ -157,5 +157,7 @@ INSTANTIATE(uint )
INSTANTIATE(uchar )
INSTANTIATE(short )
INSTANTIATE(ushort)
+INSTANTIATE(intl )
+INSTANTIATE(uintl )
}
diff --git a/src/backend/cuda/meanshift.cu b/src/backend/cuda/meanshift.cu
index 20f200b..2e6dcfc 100644
--- a/src/backend/cuda/meanshift.cu
+++ b/src/backend/cuda/meanshift.cu
@@ -44,5 +44,7 @@ INSTANTIATE(uint )
INSTANTIATE(uchar )
INSTANTIATE(short )
INSTANTIATE(ushort)
+INSTANTIATE(intl )
+INSTANTIATE(uintl )
}
diff --git a/src/backend/opencl/meanshift.cpp b/src/backend/opencl/meanshift.cpp
index b0997a1..ab884d4 100644
--- a/src/backend/opencl/meanshift.cpp
+++ b/src/backend/opencl/meanshift.cpp
@@ -41,5 +41,7 @@ INSTANTIATE(uint )
INSTANTIATE(uchar )
INSTANTIATE(short )
INSTANTIATE(ushort)
+INSTANTIATE(intl )
+INSTANTIATE(uintl )
}
diff --git a/test/meanshift.cpp b/test/meanshift.cpp
index 2cc8750..7363350 100644
--- a/test/meanshift.cpp
+++ b/test/meanshift.cpp
@@ -27,7 +27,7 @@ class Meanshift : public ::testing::Test
virtual void SetUp() {}
};
-typedef ::testing::Types<float, double, int, uint, char, uchar, short, ushort> TestTypes;
+typedef ::testing::Types<float, double, int, uint, char, uchar, short, ushort, intl, uintl> TestTypes;
TYPED_TEST_CASE(Meanshift, TestTypes);
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/arrayfire.git
More information about the debian-science-commits
mailing list