Add numpy support

Add simple array converters giving access to NumPy arrays.

Task-number: PYSIDE-354
Task-number: PYSIDE-516
Change-Id: I2446b0f1ef98eaf12df95e4bd0e03d73e0cd7126
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>

4 files changed, 88 insertions, 0 deletions

diff --git a/sources/shiboken2/tests/libsample/functions.cpp b/sources/shiboken2/tests/libsample/functions.cpp
index 9fa4efc37..bf73d5ed7 100644
--- a/sources/shiboken2/tests/libsample/functions.cpp
+++ b/sources/shiboken2/tests/libsample/functions.cpp
@@ -209,6 +209,26 @@ double sumDoubleArray(double array[4])
     return std::accumulate(array, array + 4, double(0));
 }
 
+int sumIntMatrix(int m[2][3])
+{
+    int result = 0;
+    for (int r = 0; r < 2; ++r) {
+        for (int c = 0; c < 3; ++c)
+            result += m[r][c];
+    }
+    return result;
+}
+
+double sumDoubleMatrix(double m[2][3])
+{
+    double result = 0;
+    for (int r = 0; r < 2; ++r) {
+        for (int c = 0; c < 3; ++c)
+            result += m[r][c];
+    }
+    return result;
+}
+
 ArrayModifyTest::ArrayModifyTest()
 {
 }
diff --git a/sources/shiboken2/tests/libsample/functions.h b/sources/shiboken2/tests/libsample/functions.h
index 5289d7ce0..a53f97c6e 100644
--- a/sources/shiboken2/tests/libsample/functions.h
+++ b/sources/shiboken2/tests/libsample/functions.h
@@ -83,6 +83,8 @@ LIBSAMPLE_API OddBool acceptOddBoolReference(OddBool& x);
 
 LIBSAMPLE_API int sumIntArray(int array[4]);
 LIBSAMPLE_API double sumDoubleArray(double array[4]);
+LIBSAMPLE_API int sumIntMatrix(int m[2][3]);
+LIBSAMPLE_API double sumDoubleMatrix(double m[2][3]);
 
 class LIBSAMPLE_API ArrayModifyTest
 {
diff --git a/sources/shiboken2/tests/samplebinding/array_numpy_test.py b/sources/shiboken2/tests/samplebinding/array_numpy_test.py
new file mode 100644
index 000000000..bde46f2e3
--- /dev/null
+++ b/sources/shiboken2/tests/samplebinding/array_numpy_test.py
@@ -0,0 +1,64 @@
+#!/usr/bin/env python
+
+#############################################################################
+##
+## Copyright (C) 2017 The Qt Company Ltd.
+## Contact: https://www.qt.io/licensing/
+##
+## This file is part of the test suite of PySide2.
+##
+## $QT_BEGIN_LICENSE:GPL-EXCEPT$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 as published by the Free Software
+## Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+
+'''Test case for NumPy Array types.'''
+
+import unittest
+import sample
+
+hasNumPy = False
+
+try:
+    import numpy
+    hasNumPy = True
+except ImportError:
+    pass
+
+class ArrayTester(unittest.TestCase):
+    '''Test case for NumPy arrays.'''
+
+    def testIntArray(self):
+        intList = numpy.array([1, 2, 3, 4], dtype = 'int32')
+        self.assertEqual(sample.sumIntArray(intList), 10)
+
+    def testDoubleArray(self):
+        doubleList = numpy.array([1, 2, 3, 4], dtype = 'double')
+        self.assertEqual(sample.sumDoubleArray(doubleList), 10)
+
+    def testIntMatrix(self):
+        intMatrix = numpy.array([[1, 2, 3], [4, 5, 6]], dtype = 'int32')
+        self.assertEqual(sample.sumIntMatrix(intMatrix), 21)
+
+    def testDoubleMatrix(self):
+        doubleMatrix = numpy.array([[1, 2, 3], [4, 5, 6]], dtype = 'double')
+        self.assertEqual(sample.sumDoubleMatrix(doubleMatrix), 21)
+
+if __name__ == '__main__' and hasNumPy:
+    unittest.main()
diff --git a/sources/shiboken2/tests/samplebinding/typesystem_sample.xml b/sources/shiboken2/tests/samplebinding/typesystem_sample.xml
index 32fbd8ced..efc4205ae 100644
--- a/sources/shiboken2/tests/samplebinding/typesystem_sample.xml
+++ b/sources/shiboken2/tests/samplebinding/typesystem_sample.xml
@@ -503,6 +503,8 @@
     <function signature="makeCString()" />
     <function signature="sumIntArray(int[4])"/>
     <function signature="sumDoubleArray(double[4])"/>
+    <function signature="sumIntMatrix(int[2][3])"/>
+    <function signature="sumDoubleMatrix(double[2][3])"/>
     <function signature="multiplyPair(std::pair&lt;double, double>)" />
     <function signature="returnCString()" />
     <function signature="overloadedFunc(double)" />