[arrayfire] 174/248: Add intl/uintl to lookup

[Ghislain Vaillant]

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 c0cb5cdd5d652119c1cd65ba6e0e6b00e6e4ed65
Author: Shehzan Mohammed <shehzan at arrayfire.com>
Date:   Wed Oct 21 16:37:03 2015 -0400

    Add intl/uintl to lookup
---
 src/api/c/index.cpp           | 2 ++
 src/backend/cpu/lookup.cpp    | 2 ++
 src/backend/cuda/lookup.cu    | 2 ++
 src/backend/opencl/lookup.cpp | 2 ++
 test/index.cpp                | 2 +-
 5 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/api/c/index.cpp b/src/api/c/index.cpp
index 6ba8772..b6eb8ab 100644
--- a/src/api/c/index.cpp
+++ b/src/api/c/index.cpp
@@ -122,6 +122,8 @@ af_err af_lookup(af_array *out, const af_array in, const af_array indices, const
             case u32: output = lookup<unsigned>(in, indices, dim); break;
             case s16: output = lookup<short   >(in, indices, dim); break;
             case u16: output = lookup<ushort  >(in, indices, dim); break;
+            case s64: output = lookup<intl    >(in, indices, dim); break;
+            case u64: output = lookup<uintl   >(in, indices, dim); break;
             case  u8: output = lookup<uchar   >(in, indices, dim); break;
             default : TYPE_ERROR(1, idxType);
         }
diff --git a/src/backend/cpu/lookup.cpp b/src/backend/cpu/lookup.cpp
index 1c47699..128cc02 100644
--- a/src/backend/cpu/lookup.cpp
+++ b/src/backend/cpu/lookup.cpp
@@ -82,6 +82,8 @@ Array<in_t> lookup(const Array<in_t> &input, const Array<idx_t> &indices, const
     template Array<T>  lookup<T, unsigned>(const Array<T> &input, const Array<unsigned> &indices, const unsigned dim); \
     template Array<T>  lookup<T, short   >(const Array<T> &input, const Array<short   > &indices, const unsigned dim); \
     template Array<T>  lookup<T, ushort  >(const Array<T> &input, const Array<ushort  > &indices, const unsigned dim); \
+    template Array<T>  lookup<T, intl    >(const Array<T> &input, const Array<intl    > &indices, const unsigned dim); \
+    template Array<T>  lookup<T, uintl   >(const Array<T> &input, const Array<uintl   > &indices, const unsigned dim); \
     template Array<T>  lookup<T, uchar   >(const Array<T> &input, const Array<uchar   > &indices, const unsigned dim);
 
 INSTANTIATE(float   );
diff --git a/src/backend/cuda/lookup.cu b/src/backend/cuda/lookup.cu
index 934e68e..70c9ed9 100644
--- a/src/backend/cuda/lookup.cu
+++ b/src/backend/cuda/lookup.cu
@@ -44,6 +44,8 @@ Array<in_t> lookup(const Array<in_t> &input, const Array<idx_t> &indices, const
     template Array<T> lookup<T, unsigned>(const Array<T> &input, const Array<unsigned> &indices, const unsigned dim); \
     template Array<T> lookup<T, short   >(const Array<T> &input, const Array<short   > &indices, const unsigned dim); \
     template Array<T> lookup<T, ushort  >(const Array<T> &input, const Array<ushort  > &indices, const unsigned dim); \
+    template Array<T> lookup<T, intl    >(const Array<T> &input, const Array<intl    > &indices, const unsigned dim); \
+    template Array<T> lookup<T, uintl   >(const Array<T> &input, const Array<uintl   > &indices, const unsigned dim); \
     template Array<T> lookup<T, uchar   >(const Array<T> &input, const Array<uchar   > &indices, const unsigned dim);
 
 INSTANTIATE(float   );
diff --git a/src/backend/opencl/lookup.cpp b/src/backend/opencl/lookup.cpp
index b51305f..761200f 100644
--- a/src/backend/opencl/lookup.cpp
+++ b/src/backend/opencl/lookup.cpp
@@ -46,6 +46,8 @@ Array<in_t> lookup(const Array<in_t> &input, const Array<idx_t> &indices, const
     template Array<T> lookup<T, unsigned>(const Array<T> &input, const Array<unsigned> &indices, const unsigned dim); \
     template Array<T> lookup<T, short   >(const Array<T> &input, const Array<short   > &indices, const unsigned dim); \
     template Array<T> lookup<T, ushort  >(const Array<T> &input, const Array<ushort  > &indices, const unsigned dim); \
+    template Array<T> lookup<T, intl    >(const Array<T> &input, const Array<intl    > &indices, const unsigned dim); \
+    template Array<T> lookup<T, uintl   >(const Array<T> &input, const Array<uintl   > &indices, const unsigned dim); \
     template Array<T> lookup<T, uchar   >(const Array<T> &input, const Array<uchar   > &indices, const unsigned dim);
 
 INSTANTIATE(float   );
diff --git a/test/index.cpp b/test/index.cpp
index 497183d..a7cb315 100644
--- a/test/index.cpp
+++ b/test/index.cpp
@@ -549,7 +549,7 @@ class lookup : public ::testing::Test
         }
 };
 
-typedef ::testing::Types<float, double, int, unsigned, unsigned char, short, ushort> ArrIdxTestTypes;
+typedef ::testing::Types<float, double, int, unsigned, unsigned char, short, ushort, intl, uintl> ArrIdxTestTypes;
 TYPED_TEST_CASE(lookup, ArrIdxTestTypes);
 
 template<typename T>

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/arrayfire.git