[arrayfire] 173/248: use cl_long and cl_ulong in sort functions

Ghislain Vaillant ghisvail-guest at moszumanska.debian.org
Tue Nov 17 15:54:23 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 d60ae28b9d75dfa79256bd826a9e914b21553181
Author: Shehzan Mohammed <shehzan at arrayfire.com>
Date:   Wed Oct 21 20:31:57 2015 -0400

    use cl_long and cl_ulong in sort functions
---
 src/backend/opencl/kernel/sort.hpp        | 4 ++--
 src/backend/opencl/kernel/sort_by_key.hpp | 4 ++--
 src/backend/opencl/kernel/sort_index.hpp  | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/backend/opencl/kernel/sort.hpp b/src/backend/opencl/kernel/sort.hpp
index 1693f0a..013d8c5 100644
--- a/src/backend/opencl/kernel/sort.hpp
+++ b/src/backend/opencl/kernel/sort.hpp
@@ -41,11 +41,11 @@ namespace opencl
         using std::conditional;
         using std::is_same;
         template<typename T>
-        using ltype_t = typename conditional<is_same<T, intl>::value, long, T>::type;
+        using ltype_t = typename conditional<is_same<T, intl>::value, cl_long, T>::type;
 
         template<typename T>
         using type_t = typename conditional<is_same<T, uintl>::value,
-                                            unsigned long, ltype_t<T>
+                                            cl_ulong, ltype_t<T>
                                            >::type;
 
         template<typename T, bool isAscending>
diff --git a/src/backend/opencl/kernel/sort_by_key.hpp b/src/backend/opencl/kernel/sort_by_key.hpp
index 4813abd..0cb9cb0 100644
--- a/src/backend/opencl/kernel/sort_by_key.hpp
+++ b/src/backend/opencl/kernel/sort_by_key.hpp
@@ -41,11 +41,11 @@ namespace opencl
         using std::conditional;
         using std::is_same;
         template<typename T>
-        using ltype_t = typename conditional<is_same<T, intl>::value, long, T>::type;
+        using ltype_t = typename conditional<is_same<T, intl>::value, cl_long, T>::type;
 
         template<typename T>
         using type_t = typename conditional<is_same<T, uintl>::value,
-                                            unsigned long, ltype_t<T>
+                                            cl_ulong, ltype_t<T>
                                            >::type;
 
         template<typename Tk, typename Tv, bool isAscending>
diff --git a/src/backend/opencl/kernel/sort_index.hpp b/src/backend/opencl/kernel/sort_index.hpp
index 667cbc6..3a8ab14 100644
--- a/src/backend/opencl/kernel/sort_index.hpp
+++ b/src/backend/opencl/kernel/sort_index.hpp
@@ -42,11 +42,11 @@ namespace opencl
         using std::conditional;
         using std::is_same;
         template<typename T>
-        using ltype_t = typename conditional<is_same<T, intl>::value, long, T>::type;
+        using ltype_t = typename conditional<is_same<T, intl>::value, cl_long, T>::type;
 
         template<typename T>
         using type_t = typename conditional<is_same<T, uintl>::value,
-                                            unsigned long, ltype_t<T>
+                                            cl_ulong, ltype_t<T>
                                            >::type;
 
         template<typename T, bool isAscending>

-- 
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