[arrayfire] branch master updated (f53efc3 -> f65dd97)

Ghislain Vaillant ghisvail-guest at moszumanska.debian.org
Tue Apr 26 17:29:18 UTC 2016


This is an automated email from the git hooks/post-receive script.

ghisvail-guest pushed a change to branch master
in repository arrayfire.

      from  f53efc3   Merge pull request #1341 from arrayfire/hotfix-3.3.1
      adds  8e733d7   Incrementing the version to 3.3.2
      adds  300970a   BUGFIX: Handle errors being returned by the C binary functions
      adds  0b4c072   Handle errors for CUDA and OpenCL specific functions
      adds  8fb4709   BUGFIX: Do not take control of external OpenCL device and contexts
      adds  5409155   Merge pull request #1354 from pavanky/fixes-3.3.2
      adds  8ce7eb6   Prevent inclusion of <sys/sysctl.h> on gnu hurd.
      adds  8f8e54f   Merge pull request #1368 from ghisvail/fix/gnu-hurd-support
      adds  fe037d9   More detailed message about CUDA computes in CMake
      adds  7129359   Disable JPEG_GREYSCALE flag in imageio if not defined in freeimage header file
      adds  3e462b4   If CUDA_CUDA_LIBRARY is not found, check for stub and throw error
      adds  89d7694   Merge pull request #1367 from shehzan10/cmake-fixes
      adds  92103cb   Disable CPU Async if GCC Version is less than 4.8.4
      adds  ab2f36c   Merge pull request #1380 from shehzan10/cpu-async-gcc
      adds  986b6c3   BUILD: fix to disable using CPUID on demand
      adds  fe49998   Merge branch 'fixes_32' of pavanky/arrayfire into hotfix-3.3.1
      adds  962b34d   Fixes for compiling CPU/OpenCL on Windows with static MKL and freeimage
      adds  1a928fd   Add NOMINMAX for windows for tests when build out of source
      adds  b2a55a4   Check for MKL options after find blas
      adds  98a5b27   Merge pull request #1385 from shehzan10/hotfix-3.3.2
      adds  46547a1   TEST: Adding rgb <--> gray conversion tests
      adds  8d7eaad   BUGFIX: Fixing rgb to gray conversion
      adds  2da0b4f   Merge pull request #1387 from pavanky/rgb2gray_fix
      adds  98e023d   Updated boost.compute to latest develop commit
      adds  8026cdb   Use stable sort for thrust and boost compute
      adds  09129b0   Allow complex types as value type in sort_by_key
      adds  cda059f   Improvements to sort
      adds  e6c9e93   Revert "Updated boost.compute to latest develop commit"
      adds  aaa0a05   Boost.Compute sort/sort_by_key are stable in v0.5. So revert to that
      adds  3422d01   Call modDims when setDataDims is called
      adds  3fea8a2   Fix temp Array T and moddims in CPU batched sort
      adds  03ce51f   Call thrust/compute::sort_by_key instead of kernel::sort_by_key wrapper
      adds  6c47b15   PERF Add batched sort to sort_index for CPU and CUDA
      adds  48dcfb0   Fix ordering of data from sort
      adds  c79b26f   Fix reordering of data for sort_index in cpu and cuda
      adds  08613a8   Added sort_by_key batching to CPU and CUDA
      adds  aaa13f6   Added tests for sort_index and sort_by_key for higher dimensions
      adds  8dad427   Add sort index, sort by key batching to OpenCL
      adds  efdc542   Combine sort_index and sort_by_key kernels in CPU
      adds  460bf6c   Combine sort_index and sort_by_key kernels in CUDA
      adds  363e86e   Combine sort_index and sort_by_key kernels in OpenCL
      adds  87513e0   Fix sort calls from harris and orb in CUDA
      adds  c6e08d5   Fix sort calls from harris and orb in OpenCL
      adds  8f48cdc   Clean up sort tests
      adds  b6a6a87   Fixed sort_by_key kernel for OpenCL
      adds  75b1a6b   Instantiate sort_by_key kernels in separately
      adds  bbdae15   Instantiate sort_by_key kernels in separately in opencl
      adds  cbefc1f   Instantiate sort_by_key kernels in separately in cpu
      adds  45574db   Sort by key cuda - create pair memory using memalloc, reasonable heuristic
      adds  840ea28   Remove sort 0 dim restriction note from documentation
      adds  f6eae07   Add multi dimension support to median, tests
      adds  9c4cad3   Merge pull request #1373 from shehzan10/sort
      adds  9066af5   BUILD: Add options to build deb and rpm packages on demand
      adds  7f1a3fd   DOCS: Updating documentation for replace.
      adds  37a47fb   Merge pull request #1389 from pavanky/rpm_deb_builds
      adds  4a3a839   Converting std::pair to std::tuple to get for sorting in CPU backend
      adds  9443bf2   Use memAlloc and memFree instead of std::vector internally
      adds  6cacb59   Merge pull request #1391 from pavanky/compile_fix
      adds  4cdb9fb   Fixes to Using on OSX page
      adds  ad7256d   OSX Installer: better error handling from brew failures
      adds  98cbd9c   Updated release notes for v3.3.2
      adds  be22316   Merge pull request #1393 from shehzan10/hotfix-3.3.2
      adds  f65dd97   Merge pull request #1394 from arrayfire/hotfix-3.3.2

No new revisions were added by this update.

Summary of changes:
 CMakeModules/CPackConfig.cmake                     |  35 +-
 CMakeModules/Version.cmake                         |   2 +-
 CMakeModules/osx_install/OSXInstaller.cmake        |   1 +
 CMakeModules/osx_install/cpu_scripts/postinstall   |  17 +-
 CMakeModules/osx_install/cuda_scripts/postinstall  |  17 +-
 .../osx_install/opencl_scripts/postinstall         |  17 +-
 CMakeModules/osx_install/readme.html               |   1 +
 docs/details/data.dox                              |   4 +-
 docs/pages/release_notes.md                        |  45 ++-
 docs/pages/using_on_osx.md                         | 185 ++++++----
 examples/CMakeLists.txt                            |  21 ++
 include/af/algorithm.h                             |  12 -
 include/af/data.h                                  |  32 +-
 include/af/defines.h                               |   4 -
 include/af/opencl.h                                |  16 +-
 src/api/c/binary.cpp                               |   5 +-
 src/api/c/imageio.cpp                              |   2 +
 src/api/c/median.cpp                               |  13 +-
 src/api/c/moddims.cpp                              |   1 -
 src/api/c/rgb_gray.cpp                             |  24 +-
 src/api/c/sort.cpp                                 |  22 +-
 src/api/cpp/binary.cpp                             |  12 +-
 src/backend/cpu/Array.hpp                          |   1 +
 src/backend/cpu/CMakeLists.txt                     |  25 +-
 src/backend/cpu/kernel/sort.hpp                    |   2 +-
 src/backend/cpu/kernel/sort_by_key.hpp             |  67 +---
 .../{opencl => cpu/kernel}/sort_by_key/b8.cpp      |   7 +-
 .../{opencl => cpu/kernel}/sort_by_key/f32.cpp     |   7 +-
 .../{opencl => cpu/kernel}/sort_by_key/f64.cpp     |   7 +-
 .../{opencl => cpu/kernel}/sort_by_key/s16.cpp     |   7 +-
 .../{opencl => cpu/kernel}/sort_by_key/s32.cpp     |   7 +-
 .../{opencl => cpu/kernel}/sort_by_key/s64.cpp     |   7 +-
 .../{opencl => cpu/kernel}/sort_by_key/u16.cpp     |   7 +-
 .../{opencl => cpu/kernel}/sort_by_key/u32.cpp     |   7 +-
 .../{opencl => cpu/kernel}/sort_by_key/u64.cpp     |   7 +-
 .../{opencl => cpu/kernel}/sort_by_key/u8.cpp      |   7 +-
 src/backend/cpu/kernel/sort_by_key_impl.hpp        | 172 ++++++++++
 src/backend/cpu/kernel/sort_helper.hpp             |  60 ++++
 src/backend/cpu/kernel/sort_index.hpp              |  71 ----
 src/backend/cpu/platform.cpp                       |  11 +-
 src/backend/cpu/sort.cpp                           |  63 +++-
 src/backend/cpu/sort_by_key.cpp                    |  34 +-
 src/backend/cpu/sort_index.cpp                     |  36 +-
 src/backend/cuda/Array.hpp                         |   1 +
 src/backend/cuda/CMakeLists.txt                    |  22 +-
 src/backend/cuda/kernel/harris.hpp                 |   7 +-
 src/backend/cuda/kernel/iota.hpp                   |   9 +-
 src/backend/cuda/kernel/orb.hpp                    |   7 +-
 src/backend/cuda/kernel/range.hpp                  |  14 +-
 src/backend/cuda/kernel/sort.hpp                   |  95 +++++-
 src/backend/cuda/kernel/sort_by_key.hpp            |  37 +-
 .../cuda/{ => kernel}/sort_by_key/ascd_f32.cu      |   5 +-
 .../cuda/{ => kernel}/sort_by_key/ascd_f64.cu      |   5 +-
 .../cuda/{ => kernel}/sort_by_key/ascd_s16.cu      |   5 +-
 .../cuda/{ => kernel}/sort_by_key/ascd_s32.cu      |   5 +-
 .../cuda/{ => kernel}/sort_by_key/ascd_s64.cu      |   5 +-
 .../cuda/{ => kernel}/sort_by_key/ascd_s8.cu       |   5 +-
 .../cuda/{ => kernel}/sort_by_key/ascd_u16.cu      |   5 +-
 .../cuda/{ => kernel}/sort_by_key/ascd_u32.cu      |   5 +-
 .../cuda/{ => kernel}/sort_by_key/ascd_u64.cu      |   5 +-
 .../cuda/{ => kernel}/sort_by_key/ascd_u8.cu       |   5 +-
 .../cuda/{ => kernel}/sort_by_key/desc_f32.cu      |   5 +-
 .../cuda/{ => kernel}/sort_by_key/desc_f64.cu      |   5 +-
 .../cuda/{ => kernel}/sort_by_key/desc_s16.cu      |   5 +-
 .../cuda/{ => kernel}/sort_by_key/desc_s32.cu      |   5 +-
 .../cuda/{ => kernel}/sort_by_key/desc_s64.cu      |   5 +-
 .../cuda/{ => kernel}/sort_by_key/desc_s8.cu       |   5 +-
 .../cuda/{ => kernel}/sort_by_key/desc_u16.cu      |   5 +-
 .../cuda/{ => kernel}/sort_by_key/desc_u32.cu      |   5 +-
 .../cuda/{ => kernel}/sort_by_key/desc_u64.cu      |   5 +-
 .../cuda/{ => kernel}/sort_by_key/desc_u8.cu       |   5 +-
 src/backend/cuda/kernel/sort_by_key_impl.hpp       | 215 ++++++++++++
 src/backend/cuda/kernel/sort_index.hpp             |  59 ----
 src/backend/cuda/platform.cpp                      |  12 +-
 src/backend/cuda/sort.cu                           |  22 +-
 src/backend/cuda/sort_by_key.cu                    |  86 +++++
 src/backend/cuda/sort_by_key_impl.hpp              |  49 ---
 src/backend/cuda/sort_index.cu                     |  35 +-
 src/backend/host_memory.cpp                        |   2 +-
 src/backend/opencl/Array.hpp                       |   1 +
 src/backend/opencl/CMakeLists.txt                  |  34 +-
 src/backend/opencl/kernel/harris.hpp               |   7 +-
 src/backend/opencl/kernel/iota.hpp                 |   9 +-
 src/backend/opencl/kernel/orb.hpp                  |   7 +-
 src/backend/opencl/kernel/range.hpp                |  14 +-
 src/backend/opencl/kernel/sift_nonfree.hpp         |   3 +-
 src/backend/opencl/kernel/sort.hpp                 | 110 +++++-
 src/backend/opencl/kernel/sort_by_key.hpp          |  74 +---
 src/backend/opencl/{ => kernel}/sort_by_key/b8.cpp |   5 +-
 .../opencl/{ => kernel}/sort_by_key/f32.cpp        |   5 +-
 .../opencl/{ => kernel}/sort_by_key/f64.cpp        |   5 +-
 .../opencl/{ => kernel}/sort_by_key/s16.cpp        |   5 +-
 .../opencl/{ => kernel}/sort_by_key/s32.cpp        |   5 +-
 .../opencl/{ => kernel}/sort_by_key/s64.cpp        |   5 +-
 .../opencl/{ => kernel}/sort_by_key/u16.cpp        |   5 +-
 .../opencl/{ => kernel}/sort_by_key/u32.cpp        |   5 +-
 .../opencl/{ => kernel}/sort_by_key/u64.cpp        |   5 +-
 src/backend/opencl/{ => kernel}/sort_by_key/u8.cpp |   5 +-
 src/backend/opencl/kernel/sort_by_key_impl.hpp     | 373 +++++++++++++++++++++
 src/backend/opencl/kernel/sort_helper.hpp          |  48 +++
 src/backend/opencl/kernel/sort_index.hpp           |  99 ------
 src/backend/opencl/kernel/sort_pair.cl             |  43 +++
 src/backend/opencl/platform.cpp                    |  50 ++-
 src/backend/opencl/sort.cpp                        |  23 +-
 src/backend/opencl/sort_by_key.cpp                 |  90 +++++
 src/backend/opencl/sort_by_key/impl.hpp            |  57 ----
 src/backend/opencl/sort_index.cpp                  |  40 ++-
 src/backend/opencl/traits.hpp                      |   1 +
 test/CMakeLists.txt                                |  25 ++
 test/gray_rgb.cpp                                  | 105 ++++++
 test/median.cpp                                    | 156 ++++++---
 test/sort.cpp                                      |  83 ++++-
 test/sort_by_key.cpp                               | 106 +++++-
 test/sort_index.cpp                                | 108 +++++-
 114 files changed, 2669 insertions(+), 919 deletions(-)
 copy src/backend/{opencl => cpu/kernel}/sort_by_key/b8.cpp (84%)
 copy src/backend/{opencl => cpu/kernel}/sort_by_key/f32.cpp (84%)
 copy src/backend/{opencl => cpu/kernel}/sort_by_key/f64.cpp (84%)
 copy src/backend/{opencl => cpu/kernel}/sort_by_key/s16.cpp (84%)
 copy src/backend/{opencl => cpu/kernel}/sort_by_key/s32.cpp (84%)
 copy src/backend/{opencl => cpu/kernel}/sort_by_key/s64.cpp (84%)
 copy src/backend/{opencl => cpu/kernel}/sort_by_key/u16.cpp (84%)
 copy src/backend/{opencl => cpu/kernel}/sort_by_key/u32.cpp (84%)
 copy src/backend/{opencl => cpu/kernel}/sort_by_key/u64.cpp (84%)
 copy src/backend/{opencl => cpu/kernel}/sort_by_key/u8.cpp (84%)
 create mode 100644 src/backend/cpu/kernel/sort_by_key_impl.hpp
 create mode 100644 src/backend/cpu/kernel/sort_helper.hpp
 delete mode 100644 src/backend/cpu/kernel/sort_index.hpp
 rename src/backend/cuda/{ => kernel}/sort_by_key/ascd_f32.cu (86%)
 rename src/backend/cuda/{ => kernel}/sort_by_key/ascd_f64.cu (86%)
 rename src/backend/cuda/{ => kernel}/sort_by_key/ascd_s16.cu (86%)
 rename src/backend/cuda/{ => kernel}/sort_by_key/ascd_s32.cu (86%)
 rename src/backend/cuda/{ => kernel}/sort_by_key/ascd_s64.cu (86%)
 rename src/backend/cuda/{ => kernel}/sort_by_key/ascd_s8.cu (86%)
 rename src/backend/cuda/{ => kernel}/sort_by_key/ascd_u16.cu (86%)
 rename src/backend/cuda/{ => kernel}/sort_by_key/ascd_u32.cu (86%)
 rename src/backend/cuda/{ => kernel}/sort_by_key/ascd_u64.cu (86%)
 rename src/backend/cuda/{ => kernel}/sort_by_key/ascd_u8.cu (86%)
 rename src/backend/cuda/{ => kernel}/sort_by_key/desc_f32.cu (86%)
 rename src/backend/cuda/{ => kernel}/sort_by_key/desc_f64.cu (86%)
 rename src/backend/cuda/{ => kernel}/sort_by_key/desc_s16.cu (86%)
 rename src/backend/cuda/{ => kernel}/sort_by_key/desc_s32.cu (86%)
 rename src/backend/cuda/{ => kernel}/sort_by_key/desc_s64.cu (86%)
 rename src/backend/cuda/{ => kernel}/sort_by_key/desc_s8.cu (86%)
 rename src/backend/cuda/{ => kernel}/sort_by_key/desc_u16.cu (86%)
 rename src/backend/cuda/{ => kernel}/sort_by_key/desc_u32.cu (86%)
 rename src/backend/cuda/{ => kernel}/sort_by_key/desc_u64.cu (86%)
 rename src/backend/cuda/{ => kernel}/sort_by_key/desc_u8.cu (86%)
 create mode 100644 src/backend/cuda/kernel/sort_by_key_impl.hpp
 delete mode 100644 src/backend/cuda/kernel/sort_index.hpp
 create mode 100644 src/backend/cuda/sort_by_key.cu
 delete mode 100644 src/backend/cuda/sort_by_key_impl.hpp
 rename src/backend/opencl/{ => kernel}/sort_by_key/b8.cpp (87%)
 rename src/backend/opencl/{ => kernel}/sort_by_key/f32.cpp (87%)
 rename src/backend/opencl/{ => kernel}/sort_by_key/f64.cpp (87%)
 rename src/backend/opencl/{ => kernel}/sort_by_key/s16.cpp (87%)
 rename src/backend/opencl/{ => kernel}/sort_by_key/s32.cpp (87%)
 rename src/backend/opencl/{ => kernel}/sort_by_key/s64.cpp (87%)
 rename src/backend/opencl/{ => kernel}/sort_by_key/u16.cpp (87%)
 rename src/backend/opencl/{ => kernel}/sort_by_key/u32.cpp (87%)
 rename src/backend/opencl/{ => kernel}/sort_by_key/u64.cpp (87%)
 rename src/backend/opencl/{ => kernel}/sort_by_key/u8.cpp (87%)
 create mode 100644 src/backend/opencl/kernel/sort_by_key_impl.hpp
 create mode 100644 src/backend/opencl/kernel/sort_helper.hpp
 delete mode 100644 src/backend/opencl/kernel/sort_index.hpp
 create mode 100644 src/backend/opencl/kernel/sort_pair.cl
 create mode 100644 src/backend/opencl/sort_by_key.cpp
 delete mode 100644 src/backend/opencl/sort_by_key/impl.hpp
 create mode 100644 test/gray_rgb.cpp

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