Merge branch '14-automatic-array-casting-in-c-does-not-work' into 'master'

Resolve "automatic array casting in C++ does not work"

Closes #14 as well, now with a test.

See merge request !9

bob/io/base/include/bob.io.base/blitz_array.h

@@ -244,7 +244,7 @@ namespace bob { namespace io { namespace base { namespace array {
        * data at. Only get the number of dimensions right!
        */
       template <typename T, int N> blitz::Array<T,N> cast() const {
-        return bob::core::array::cast<T,N>(*this);
+        return bob::io::base::array::cast<T,N>(*this);
       }
 
     private: //representation

bob/io/base/test.cpp

+/**
+ * @author Manuel Gunther
+ * @date Tue Sep 13 13:01:31 MDT 2016
+ *
+ * @brief Tests for bob::io::base
+ */
+
+#include <bob.io.base/api.h>
+#include <bob.blitz/cleanup.h>
+#include <bob.extension/documentation.h>
+
+#include <boost/format.hpp>
+#include <boost/filesystem.hpp>
+
+static auto s_test_api = bob::extension::FunctionDoc(
+  "_test_api",
+  "Some tests for API functions"
+)
+.add_prototype("tempdir")
+.add_parameter("tempdir", "str", "A temporary directory to write data to")
+;
+static PyObject* _test_api(PyObject*, PyObject *args, PyObject* kwds){
+BOB_TRY
+  static char** kwlist = s_test_api.kwlist();
+
+  const char* tempdir;
+  if (!PyArg_ParseTupleAndKeywords(args, kwds, "s", kwlist, &tempdir)) return 0;
+
+  blitz::Array<uint8_t, 1> test_data(5);
+  for (int i = 0; i < 5; ++i){
+    test_data(i) = i+1;
+  }
+
+  auto h5file = bob::io::base::CodecRegistry::instance()->findByExtension(".hdf5");
+
+  boost::filesystem::path hdf5(tempdir); hdf5 /= std::string("test.h5");
+
+  auto output = h5file(hdf5.string().c_str(), 'w');
+  output->write(test_data);
+  output.reset();
+
+  auto input = h5file(hdf5.string().c_str(), 'r');
+  blitz::Array<uint8_t,1> read_data = input->read<uint8_t,1>(0);
+
+  // Does not compile at the moment
+  blitz::Array<uint16_t,1> read_data_2 = input->cast<uint16_t,1>(0);
+
+  input.reset();
+
+  if (blitz::any(test_data - read_data))
+    throw std::runtime_error("The CSV IO test did not succeed");
+
+  Py_RETURN_NONE;
+BOB_CATCH_FUNCTION("_test_api", 0)
+}
+
+static PyMethodDef module_methods[] = {
+  {
+    s_test_api.name(),
+    (PyCFunction)_test_api,
+    METH_VARARGS|METH_KEYWORDS,
+    s_test_api.doc(),
+  },
+  {0}  /* Sentinel */
+};
+
+PyDoc_STRVAR(module_docstr, "Tests for bob::io::base");
+
+#if PY_VERSION_HEX >= 0x03000000
+static PyModuleDef module_definition = {
+  PyModuleDef_HEAD_INIT,
+  BOB_EXT_MODULE_NAME,
+  module_docstr,
+  -1,
+  module_methods,
+  0, 0, 0, 0
+};
+#endif
+
+static PyObject* create_module (void) {
+
+# if PY_VERSION_HEX >= 0x03000000
+  PyObject* m = PyModule_Create(&module_definition);
+  auto m_ = make_xsafe(m);
+  const char* ret = "O";
+# else
+  PyObject* m = Py_InitModule3(BOB_EXT_MODULE_NAME, module_methods, module_docstr);
+  const char* ret = "N";
+# endif
+  if (!m) return 0;
+
+  return Py_BuildValue(ret, m);
+}
+
+PyMODINIT_FUNC BOB_EXT_ENTRY_NAME (void) {
+# if PY_VERSION_HEX >= 0x03000000
+  return
+# endif
+    create_module();
+}

bob/io/base/test_cpp.py

+from bob.io.base._test import _test_api
+
+import tempfile
+import shutil
+
+def test_api():
+  temp_dir = tempfile.mkdtemp()
+  try:
+    _test_api(temp_dir)
+  finally:
+    shutil.rmtree(temp_dir)

setup.py

@@ -227,6 +227,20 @@ setup(
         packages = packages,
         boost_modules = boost_modules,
       ),
+
+      Extension("bob.io.base._test",
+        [
+          "bob/io/base/test.cpp",
+        ],
+        library_dirs = library_dirs,
+        libraries = libraries,
+        define_macros = define_macros,
+        system_include_dirs = system_include_dirs,
+        version = version,
+        bob_packages = bob_packages,
+        packages = packages,
+        boost_modules = boost_modules,
+      ),
     ],
 
     cmdclass = {