tests for ndarray input and exceptions

DC23 · DC23 · commit 5ec050fe8cf8 · 2018-09-14T16:22:20.000+08:00
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -8,5 +8,18 @@
     "python.unitTest.pyTestEnabled": true,
     "python.formatting.provider": "black",
     "python.linting.pylamaEnabled": true,
-    "python.linting.pylintEnabled": false
+    "python.linting.pylintEnabled": false,
+    "files.associations": {
+        ".flaskenv": "dotenv",
+        "array": "cpp",
+        "deque": "cpp",
+        "forward_list": "cpp",
+        "list": "cpp",
+        "unordered_map": "cpp",
+        "unordered_set": "cpp",
+        "vector": "cpp",
+        "initializer_list": "cpp",
+        "string_view": "cpp",
+        "valarray": "cpp"
+    }
 }
diff --git a/Pipfile b/Pipfile
@@ -13,7 +13,7 @@ pybind11 = "*"
 [dev-packages]
 pylama = "*"
 pytest = "*"
-pylint = "*"
+numpy = "*"
 
 [requires]
 python_version = "3.6"
diff --git a/Pipfile.lock b/Pipfile.lock
diff --git a/setup.py b/setup.py
@@ -80,8 +80,6 @@ class BuildExt(build_ext):
             '-DWINDOWS',
             ],
         'unix': [
-            '-O3',
-            '-DNDEBUG',
             '-DUNIX',
             ],
     }
diff --git a/src/main.cpp b/src/main.cpp
@@ -1,12 +1,43 @@
+#include <exception>
+#include <numeric>
+#include <vector>
+#include <pybind11/numpy.h>
 #include <pybind11/pybind11.h>
+#include <pybind11/stl.h>
 
-int add(int i, int j) {
+namespace py = pybind11;
+
+void runtime_error()
+{
+    throw std::runtime_error("C++ failure");
+}
+
+void range_error()
+{
+    throw std::range_error("C++ range error");
+}
+
+int add(int i, int j)
+{
     return i + j;
 }
 
-namespace py = pybind11;
+double ndarray_sum(py::array_t<double> ndarray)
+{
+    // double ndarray_sum(std::vector<double> &ndarray) {
+    // return std::accumulate(ndarray.begin(), ndarray.end(), 0.0);
+    auto buf1 = ndarray.request();
+    double sum = 0;
+    int n = buf1.size;
+    for (int i = 0; i < n; i++)
+    {
+        sum += ((double *)buf1.ptr)[i];
+    }
+    return sum;
+}
 
-PYBIND11_MODULE(python_example, m) {
+PYBIND11_MODULE(python_example, m)
+{
     m.doc() = R"pbdoc(
         Pybind11 example plugin
         -----------------------
@@ -32,6 +63,16 @@ PYBIND11_MODULE(python_example, m) {
         Some other explanation about the subtract function.
     )pbdoc");
 
+    m.def("ndarray_sum", &ndarray_sum, R"pbdoc(
+        Return the sum of a numpy ndarray.
+
+        Tests functions that accept a numpy array and
+        autoconvert to std::vector.
+    )pbdoc");
+
+    m.def("runtime_error", &runtime_error);
+    m.def("range_error", &range_error);
+
 #ifdef VERSION_INFO
     m.attr("__version__") = VERSION_INFO;
 #else
diff --git a/tests/test_python_example.py b/tests/test_python_example.py
@@ -1,10 +1,30 @@
+import numpy as np
 import python_example as m
+import pytest
+
 
 def test_version():
-    assert m.__version__ == '0.0.1'
+    assert m.__version__ == "0.0.1"
+
 
 def test_add_1_2():
     assert m.add(1, 2) == 3
 
+
 def test_subtract_1_2():
     assert m.subtract(1, 2) == -1
+
+
+def test_ndarray_args():
+    data = np.array([range(10)])
+    assert m.ndarray_sum(data) == sum(range(10))
+
+
+def test_runtime_error():
+    with pytest.raises(RuntimeError):
+        m.runtime_error()
+
+
+def test_range_error():
+    with pytest.raises(ValueError):
+        m.range_error()

Original file line number	Diff line number	Diff line change
`@@ -80,8 +80,6 @@ class BuildExt(build_ext):`
`80`	`80`	`'-DWINDOWS',`
`81`	`81`	`],`
`82`	`82`	`'unix': [`
`83`		`- '-O3',`
`84`		`- '-DNDEBUG',`
`85`	`83`	`'-DUNIX',`
`86`	`84`	`],`
`87`	`85`	`}`