[SCM] ViennaCL packaging branch, master, updated. debian/1.1.2-6-32-g333e537

[Michael Wild]

The following commit has been merged in the master branch:
commit c10d1b6e6d20a6234abb48d407654f7cf70a4934
Author: Michael Wild <themiwi at users.sourceforge.net>
Date:   Fri Mar 23 09:11:23 2012 +0100

    Removed patches/*, everything fixed in new upstream
    
    Signed-off-by: Michael Wild <themiwi at users.sourceforge.net>

diff --git a/debian/patches/0001-Define-OPENCL_INCLUDE_DIRS-in-cmake-FindOpenCL.cmake.patch b/debian/patches/0001-Define-OPENCL_INCLUDE_DIRS-in-cmake-FindOpenCL.cmake.patch
deleted file mode 100644
index b92c7e6..0000000
--- a/debian/patches/0001-Define-OPENCL_INCLUDE_DIRS-in-cmake-FindOpenCL.cmake.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From: Michael Wild <themiwi at users.sourceforge.net>
-Date: Wed, 15 Feb 2012 16:48:58 +0100
-Subject: Define OPENCL_INCLUDE_DIRS in cmake/FindOpenCL.cmake
-
-Bug: https://sourceforge.net/tracker/?func=detail&aid=3487894&group_id=322140&atid=1353702
-
-Signed-off-by: Michael Wild <themiwi at users.sourceforge.net>
----
- cmake/FindOpenCL.cmake |    2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
-
-diff --git a/cmake/FindOpenCL.cmake b/cmake/FindOpenCL.cmake
-index e77ee3c..a237116 100644
---- a/cmake/FindOpenCL.cmake
-+++ b/cmake/FindOpenCL.cmake
-@@ -68,8 +68,10 @@ find_package_handle_standard_args(
-   )
- 
- if(OPENCL_FOUND)
-+  set(OPENCL_INCLUDE_DIRS ${OPENCL_INCLUDE_DIR})
-   set(OPENCL_LIBRARIES ${OPENCL_LIBRARY})
- else(OPENCL_FOUND)
-+  set(OPENCL_INCLUDE_DIRS)
-   set(OPENCL_LIBRARIES)
- endif(OPENCL_FOUND)
- 
--- 
diff --git a/debian/patches/0002-Double-precision-on-AMD-GPUs-in-version-1.2.0.patch b/debian/patches/0002-Double-precision-on-AMD-GPUs-in-version-1.2.0.patch
deleted file mode 100644
index c7652cd..0000000
--- a/debian/patches/0002-Double-precision-on-AMD-GPUs-in-version-1.2.0.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From: Michael Wild <themiwi at users.sourceforge.net>
-Date: Fri, 17 Feb 2012 09:49:51 +0100
-Subject: Double precision on AMD GPUs in version 1.2.0
-
-On some AMD GPUs, the double precision enabling pragma is set
-incorrectly.
-
-Origin: https://sourceforge.net/tracker/?func=detail&aid=3487234&group_id=322140&atid=1353700
-Author: Karl Rupp <rupp at iue.tuwien.ac.at>
----
- viennacl/tools/tools.hpp |   10 +++-------
- 1 files changed, 3 insertions(+), 7 deletions(-)
-
-diff --git a/viennacl/tools/tools.hpp b/viennacl/tools/tools.hpp
-index 43699ba..23839b4 100644
---- a/viennacl/tools/tools.hpp
-+++ b/viennacl/tools/tools.hpp
-@@ -147,15 +147,11 @@ namespace viennacl
-     * @param platform_info   An info string that contains the OpenCL platform vendor
-     * @return   The double precision kernel
-     */
--    inline std::string make_double_kernel(std::string const & source, std::string platform_info)
--    //inline std::string make_double_kernel(std::string const & source)
-+    inline std::string make_double_kernel(std::string const & source, std::string const & fp_extension)
-     {
-       std::stringstream ss;
--      if (platform_info.compare(0, 8, "Advanced") == 0)  //double precision in Stream SDK is enabled by a non-standard pragma
--        ss << "#pragma OPENCL EXTENSION cl_amd_fp64 : enable\n\n";
--      else
--        ss << "#pragma OPENCL EXTENSION cl_khr_fp64 : enable\n\n";
--      
-+      ss << "#pragma OPENCL EXTENSION " << fp_extension << " : enable\n\n";
-+
-       std::string result = ss.str();
-       result.append(strReplace(source, "float", "double"));
-       return result;
--- 
diff --git a/debian/patches/0003-Fix-adding-a-new-compute-device.patch b/debian/patches/0003-Fix-adding-a-new-compute-device.patch
deleted file mode 100644
index 035bf12..0000000
--- a/debian/patches/0003-Fix-adding-a-new-compute-device.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From: Michael Wild <themiwi at users.sourceforge.net>
-Date: Tue, 21 Feb 2012 07:33:01 +0100
-Subject: Fix adding a new compute device
-
-The existing code only added a device if it already was in the list of
-devices, instead of adding it if *not* in the list.
-
-Origin: http://sourceforge.net/mailarchive/message.php?msg_id=28862919
-Author: Karl Rupp <rupp at iue.tuwien.ac.at>
----
- viennacl/ocl/context.hpp |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/viennacl/ocl/context.hpp b/viennacl/ocl/context.hpp
-index e2355fc..cac6e74 100644
---- a/viennacl/ocl/context.hpp
-+++ b/viennacl/ocl/context.hpp
-@@ -123,7 +123,7 @@ namespace viennacl
-           #if defined(VIENNACL_DEBUG_ALL) || defined(VIENNACL_DEBUG_CONTEXT)
-           std::cout << "ViennaCL: Adding new device to context " << h_ << std::endl;
-           #endif
--          if (std::find(devices_.begin(), devices_.end(), d) != devices_.end())
-+          if (std::find(devices_.begin(), devices_.end(), d) == devices_.end())
-             devices_.push_back(d);
-         }
- 
--- 
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 5e2da2f..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,3 +0,0 @@
-0001-Define-OPENCL_INCLUDE_DIRS-in-cmake-FindOpenCL.cmake.patch
-0002-Double-precision-on-AMD-GPUs-in-version-1.2.0.patch
-0003-Fix-adding-a-new-compute-device.patch

-- 
ViennaCL packaging