[arrayfire] 248/284: Merge branch 'memory' of shehzan10/arrayfire into devel

[Ghislain Vaillant]

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

ghisvail-guest pushed a commit to branch debian/experimental
in repository arrayfire.

commit 78f157c3550e70e0cfe0b139353b68c423b0b0be
Merge: cc2dda0 7eb905f
Author: Pavan Yalamanchili <pavan at arrayfire.com>
Date:   Mon Jan 25 21:54:17 2016 -0500

    Merge branch 'memory' of shehzan10/arrayfire into devel

 CMakeLists.txt                                     |  12 ++-
 .../ArrayFireConfig.cmake.in                       |   0
 .../ArrayFireConfigVersion.cmake.in                |   0
 CPack.cmake => CMakeModules/CPackConfig.cmake      |   2 +-
 docs/details/device.dox                            |  16 +++
 include/af/device.h                                |  16 +--
 src/api/c/err_common.cpp                           |   8 +-
 src/api/unified/CMakeLists.txt                     |   4 -
 src/backend/MemoryManager.cpp                      |  23 ++++-
 src/backend/MemoryManager.hpp                      |  11 +-
 src/backend/cpu/Array.cpp                          |   2 +-
 src/backend/cpu/memory.cpp                         |  12 ++-
 src/backend/cpu/memory.hpp                         |   5 +-
 src/backend/cpu/platform.cpp                       |  29 +++++-
 src/backend/cpu/platform.hpp                       |   4 +
 src/backend/cuda/Array.cpp                         |   2 +-
 src/backend/cuda/kernel/fast_pyramid.hpp           |   6 +-
 src/backend/cuda/kernel/random.hpp                 |  15 ++-
 src/backend/cuda/memory.cpp                        |  20 +++-
 src/backend/cuda/memory.hpp                        |   5 +-
 src/backend/cuda/platform.cpp                      |  20 +++-
 src/backend/cuda/platform.hpp                      |   4 +
 src/backend/host_memory.cpp                        | 113 +++++++++++++++++++++
 test/basic_c.c => src/backend/host_memory.hpp      |  13 +--
 src/backend/opencl/Array.cpp                       |   2 +-
 src/backend/opencl/Array.hpp                       |   6 +-
 src/backend/opencl/CMakeLists.txt                  |   4 -
 src/backend/opencl/err_opencl.hpp                  |   4 +-
 src/backend/opencl/memory.cpp                      |  20 +++-
 src/backend/opencl/memory.hpp                      |   5 +-
 src/backend/opencl/platform.cpp                    |  27 ++++-
 src/backend/opencl/platform.hpp                    |  10 +-
 test/basic_c.c                                     |   1 +
 test/meanshift.cpp                                 |  15 +--
 test/solve_dense.cpp                               |   5 +-
 35 files changed, 357 insertions(+), 84 deletions(-)


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