[arrayfire] 79/248: Merge branch 'master' into 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 31d247584d15d5bf352438c4a6c4ef11b5170590
Merge: 14b0a4d 77128bb
Author: Shehzan Mohammed <shehzan at arrayfire.com>
Date:   Fri Sep 25 20:33:01 2015 -0400

    Merge branch 'master' into devel
    
    https://github.com/arrayfire/arrayfire/pull/1027
    
    Conflicts:
    	include/arrayfire.h
    	src/api/c/histogram.cpp

 CMakeModules/build_forge.cmake                     |  2 +-
 CMakeModules/osx_install/cpu_scripts/postinstall   |  6 +--
 CMakeModules/osx_install/cuda_scripts/postinstall  |  4 +-
 .../osx_install/opencl_scripts/postinstall         |  4 +-
 docs/CMakeLists.txt                                |  2 +-
 docs/details/array.dox                             | 13 +----
 docs/pages/README.md                               | 32 ++++++------
 docs/pages/release_notes.md                        | 24 +++++++++
 docs/pages/using_on_linux.md                       |  2 +-
 docs/pages/using_on_osx.md                         |  2 +-
 include/af/defines.h                               |  4 +-
 include/arrayfire.h                                | 58 ++++++++++++++--------
 src/api/c/histogram.cpp                            | 24 +++++----
 src/backend/cpu/histogram.cpp                      |  8 +--
 src/backend/cpu/histogram.hpp                      |  2 +-
 src/backend/cpu/platform.cpp                       |  4 +-
 src/backend/cuda/histogram.cu                      | 19 ++-----
 src/backend/cuda/histogram.hpp                     |  2 +-
 src/backend/cuda/kernel/histogram.hpp              | 33 ++++--------
 src/backend/cuda/kernel/ireduce.hpp                | 11 ++++
 src/backend/cuda/kernel/reduce.hpp                 | 11 ++--
 src/backend/opencl/histogram.cpp                   | 19 ++-----
 src/backend/opencl/histogram.hpp                   |  2 +-
 src/backend/opencl/kernel/histogram.cl             | 24 ++++-----
 src/backend/opencl/kernel/histogram.hpp            | 15 +++---
 src/backend/opencl/kernel/iops.cl                  | 24 ++++++++-
 src/backend/opencl/kernel/ireduce.hpp              | 15 +++++-
 src/backend/opencl/kernel/reduce.hpp               | 12 ++---
 test/blas.cpp                                      | 37 ++++++++------
 test/histogram.cpp                                 | 19 +++++++
 test/info.cpp                                      | 36 +++++++++-----
 test/ireduce.cpp                                   | 22 ++++++++
 test/median.cpp                                    | 25 +++++++++-
 test/reduce.cpp                                    | 25 +++++++++-
 34 files changed, 341 insertions(+), 201 deletions(-)

diff --cc include/arrayfire.h
index bdaa0e1,56518b2..c3de4d0
--- a/include/arrayfire.h
+++ b/include/arrayfire.h
@@@ -241,37 -234,50 +241,51 @@@
  */
  
  /**
- \example helloworld.cpp
- \example pi.cpp
- \example integer.cpp
- \example rainfall.cpp
- \example vectorize.cpp
- \example black_scholes_options.cpp
- \example monte_carlo_options.cpp
- \example heston_model.cpp
+ \example matching.cpp
+ \example fast.cpp
  \example harris.cpp
- \example kmeans.cpp
- \example knn.cpp
- \example bagging.cpp
- \example naive_bayes.cpp
+ \example susan.cpp
+ \example logistic_regression.cpp
+ \example rbm.cpp
  \example perceptron.cpp
  \example neural_network.cpp
- \example rbm.cpp
+ \example bagging.cpp
+ \example naive_bayes.cpp
  \example deep_belief_net.cpp
- \example logistic_regression.cpp
+ \example kmeans.cpp
+ \example softmax_regression.cpp
+ \example knn.cpp
+ \example monte_carlo_options.cpp
+ \example heston_model.cpp
+ \example black_scholes_options.cpp
+ \example blas.cpp
+ \example fft.cpp
+ \example pi.cpp
+ \example svd.cpp
+ \example cholesky.cpp
+ \example qr.cpp
+ \example lu.cpp
  \example conway.cpp
- \example conway_pretty.cpp
- \example fractal.cpp
  \example histogram.cpp
+ \example fractal.cpp
  \example plot2d.cpp
- \example brain_segmentation.cpp
- \example image_demo.cpp
- \example image_editing.cpp
+ \example conway_pretty.cpp
++\example basic.cpp
+ \example helloworld.cpp
+ \example vectorize.cpp
+ \example integer.cpp
+ \example convolve.cpp
+ \example rainfall.cpp
  \example morphing.cpp
- \example optical_flow.cpp
+ \example image_demo.cpp
+ \example brain_segmentation.cpp
  \example pyramids.cpp
+ \example binary_thresholding.cpp
+ \example optical_flow.cpp
+ \example adaptive_thresholding.cpp
+ \example image_editing.cpp
  \example edge.cpp
- \example basic.cpp
+ \example filters.cpp
  */
  
  #include "af/compatible.h"
diff --cc src/api/c/histogram.cpp
index 08ae354,a7c4be7..3d6494c
--- a/src/api/c/histogram.cpp
+++ b/src/api/c/histogram.cpp
@@@ -33,14 -37,12 +37,14 @@@ af_err af_histogram(af_array *out, cons
  
          af_array output;
          switch(type) {
-             case f32: output = histogram<float , uint>(in, nbins, minval, maxval); break;
-             case f64: output = histogram<double, uint>(in, nbins, minval, maxval); break;
-             case b8 : output = histogram<char  , uint>(in, nbins, minval, maxval); break;
-             case s32: output = histogram<int   , uint>(in, nbins, minval, maxval); break;
-             case u32: output = histogram<uint  , uint>(in, nbins, minval, maxval); break;
-             case s16: output = histogram<short , uint>(in, nbins, minval, maxval); break;
-             case u16: output = histogram<ushort, uint>(in, nbins, minval, maxval); break;
-             case u8 : output = histogram<uchar , uint>(in, nbins, minval, maxval); break;
+             case f32: output = histogram<float , uint>(in, nbins, minval, maxval, info.isLinear()); break;
+             case f64: output = histogram<double, uint>(in, nbins, minval, maxval, info.isLinear()); break;
+             case b8 : output = histogram<char  , uint>(in, nbins, minval, maxval, info.isLinear()); break;
+             case s32: output = histogram<int   , uint>(in, nbins, minval, maxval, info.isLinear()); break;
+             case u32: output = histogram<uint  , uint>(in, nbins, minval, maxval, info.isLinear()); break;
++            case s16: output = histogram<short , uint>(in, nbins, minval, maxval, info.isLinear()); break;
++            case u16: output = histogram<ushort, uint>(in, nbins, minval, maxval, info.isLinear()); break;
+             case u8 : output = histogram<uchar , uint>(in, nbins, minval, maxval, info.isLinear()); break;
              default : TYPE_ERROR(1, type);
          }
          std::swap(*out,output);

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