[arrayfire] 54/248: Merge branch 'arrayfire/master' into 'arrayfire/devel'

[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 2d756722341358448106302eb58a9e25fcf86574
Merge: 11a6b07 92e08e9
Author: Pavan Yalamanchili <pavan at arrayfire.com>
Date:   Mon Sep 14 10:39:04 2015 -0400

    Merge branch 'arrayfire/master' into 'arrayfire/devel'

 CMakeModules/FindCBLAS.cmake                |  25 +++++
 CMakeModules/FindLAPACKE.cmake              | 144 +++++++++++++++++-----------
 CMakeModules/Version.cmake                  |   2 +-
 CMakeModules/build_forge.cmake              |   2 +-
 README.md                                   |   4 +-
 docs/pages/release_notes.md                 |  40 ++++++--
 docs/pages/using_on_windows.md              |   8 +-
 examples/financial/heston_model.cpp         |  20 ++--
 examples/image_processing/image_editing.cpp |   2 +-
 include/arrayfire.h                         |   2 +
 src/api/cpp/array.cpp                       |   9 +-
 src/api/cpp/index.cpp                       |   2 +-
 src/api/cpp/seq.cpp                         |   6 +-
 src/backend/cuda/kernel/fftconvolve.hpp     |  18 +++-
 src/backend/cuda/kernel/ireduce.hpp         |   2 +-
 src/backend/cuda/kernel/reduce.hpp          |   2 +-
 src/backend/dim4.cpp                        |  20 ++--
 src/backend/opencl/kernel/ireduce.hpp       |   6 +-
 src/backend/opencl/kernel/reduce.hpp        |   5 +-
 src/backend/opencl/magma/magma_cpu_blas.h   |   1 +
 src/backend/opencl/magma/magma_cpu_lapack.h |   1 +
 test/ireduce.cpp                            |  45 +++++++++
 test/reduce.cpp                             |  39 ++++++++
 23 files changed, 285 insertions(+), 120 deletions(-)

diff --cc src/backend/dim4.cpp
index cad5444,d1f69d2..024e359
--- a/src/backend/dim4.cpp
+++ b/src/backend/dim4.cpp
@@@ -216,4 -209,49 +209,5 @@@ dim_t calcDim(const af_seq &seq, const 
  
      return outDim;
  }
+ 
 -} // end namespace af
 -
 -using af::dim4;
 -using std::vector;
 -
 -dim4
 -toDims(const vector<af_seq>& seqs, const dim4 &parentDims)
 -{
 -    dim4 outDims(1, 1, 1, 1);
 -    for(unsigned i = 0; i < seqs.size(); i++ ) {
 -        outDims[i] = af::calcDim(seqs[i], parentDims[i]);
 -        if (outDims[i] > parentDims[i])
 -            AF_ERROR("Size mismatch between input and output", AF_ERR_SIZE);
 -    }
 -    return outDims;
 -}
 -
 -dim4
 -toOffset(const vector<af_seq>& seqs, const dim4 &parentDims)
 -{
 -    dim4 outOffsets(0, 0, 0, 0);
 -    for(unsigned i = 0; i < seqs.size(); i++ ) {
 -        if (seqs[i].step !=0 && seqs[i].begin >= 0) {
 -            outOffsets[i] = seqs[i].begin;
 -        } else if (seqs[i].begin <= -1) {
 -            outOffsets[i] = parentDims[i] + seqs[i].begin;
 -        } else {
 -            outOffsets[i] = 0;
 -        }
 -
 -        if (outOffsets[i] >= parentDims[i])
 -            AF_ERROR("Index out of range", AF_ERR_SIZE);
 -    }
 -    return outOffsets;
 -}
 -
 -dim4
 -toStride(const vector<af_seq>& seqs, const af::dim4 &parentDims)
 -{
 -    dim4 out(calcStrides(parentDims));
 -    for(unsigned i = 0; i < seqs.size(); i++ ) {
 -        if  (seqs[i].step != 0) {   out[i] *= seqs[i].step; }
 -    }
 -    return out;
  }

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