[python-arrayfire] 17/58: 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 master
in repository python-arrayfire.

commit 7a79ae78c5bb79e4835a3a780ea1c4640dadd6b7
Merge: 2851540 fef2063
Author: Pavan Yalamanchili <pavan at arrayfire.com>
Date:   Fri Jun 24 22:04:47 2016 -0400

    Merge branch 'master' into devel

 __af_version__.py              |  14 ++
 arrayfire/__init__.py          |  33 ++--
 arrayfire/algorithm.py         |   4 +-
 arrayfire/arith.py             |   2 +-
 arrayfire/array.py             |  16 +-
 arrayfire/blas.py              |   2 +-
 arrayfire/data.py              |   6 +-
 arrayfire/device.py            |   6 +-
 arrayfire/features.py          |   2 +-
 arrayfire/graphics.py          |   2 +-
 arrayfire/image.py             |   2 +-
 arrayfire/index.py             |   2 +-
 arrayfire/interop.py           |   1 +
 arrayfire/lapack.py            |   2 +-
 arrayfire/library.py           |   2 +-
 arrayfire/signal.py            |   2 +-
 arrayfire/statistics.py        |   4 +
 arrayfire/timer.py             |   2 +-
 arrayfire/util.py              |   4 +
 arrayfire/vision.py            |   2 +-
 docs/Makefile                  | 225 +++++++++++++++++++++++++++
 docs/arrayfire.algorithm.rst   |   7 +
 docs/arrayfire.arith.rst       |   7 +
 docs/arrayfire.array.rst       |   7 +
 docs/arrayfire.base.rst        |   7 +
 docs/arrayfire.bcast.rst       |   7 +
 docs/arrayfire.blas.rst        |   7 +
 docs/arrayfire.cuda.rst        |   7 +
 docs/arrayfire.data.rst        |   7 +
 docs/arrayfire.device.rst      |   7 +
 docs/arrayfire.features.rst    |   7 +
 docs/arrayfire.graphics.rst    |   7 +
 docs/arrayfire.image.rst       |   7 +
 docs/arrayfire.index.rst       |   7 +
 docs/arrayfire.interop.rst     |   7 +
 docs/arrayfire.lapack.rst      |   7 +
 docs/arrayfire.library.rst     |   7 +
 docs/arrayfire.opencl.rst      |   7 +
 docs/arrayfire.rst             |  34 ++++
 docs/arrayfire.signal.rst      |   7 +
 docs/arrayfire.statistics.rst  |   7 +
 docs/arrayfire.timer.rst       |   7 +
 docs/arrayfire.util.rst        |   7 +
 docs/arrayfire.vision.rst      |   7 +
 docs/arrayfire_logo_symbol.png | Bin 0 -> 35688 bytes
 docs/conf.py                   | 341 +++++++++++++++++++++++++++++++++++++++++
 docs/index.rst                 |   1 +
 docs/make.bat                  | 281 +++++++++++++++++++++++++++++++++
 docs/modules.rst               |   7 +
 setup.py                       |  11 +-
 50 files changed, 1121 insertions(+), 43 deletions(-)

diff --cc arrayfire/__init__.py
index a129392,bd7617f..74d1dca
--- a/arrayfire/__init__.py
+++ b/arrayfire/__init__.py
@@@ -29,9 -33,18 +33,18 @@@ The default backend is chosen in the fo
  
  The backend can be chosen at the beginning of the program by using the following function
  
 -    >>> af.backend.set(name)
 +    >>> af.set_backend(name)
  
- where name is one of 'cuda', 'opencl' or 'cpu'
+ where name is one of 'cuda', 'opencl' or 'cpu'.
+ 
+ The functionality provided by ArrayFire spans the following domains:
+ 
+     1. Vector Algorithms
+     2. Image Processing
+     3. Signal Processing
+     4. Computer Vision
+     5. Linear Algebra
+     6. Statistics
  
  """
  
diff --cc setup.py
index 7657352,294871d..c95e524
--- a/setup.py
+++ b/setup.py
@@@ -10,12 -10,11 +10,11 @@@
  ########################################################
  
  from setuptools import setup, find_packages
+ from __af_version__ import full_version
  
- ## TODO:
- ## 1) Look for af libraries during setup
- ## 2) Include test suite
- 
- release_version = "3.4.0"
 -TODO:
 -1) Look for af libraries during setup
 -2) Include test suite
++#TODO:
++#1) Look for af libraries during setup
++#2) Include test suite
  
  setup(
      author="Pavan Yalamanchili",

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