Merge pull request #703 from gsomix/buffer_protocol

Python buffer protocol for Labels and SGVector
shogun-toolbox · Aug 10, 2012 · 9ddf049 · 9ddf049
2 parents baebab2 + 6c5b634
commit 9ddf049
Show file tree

Hide file tree

Showing 8 changed files with 1,087 additions and 186 deletions.
diff --git a/examples/undocumented/python_modular/features_director_dot__modular.py b/examples/undocumented/python_modular/features_director_dot__modular.py
diff --git a/src/interfaces/modular/Features.i b/src/interfaces/modular/Features.i
@@ -33,6 +33,7 @@
 
 #ifndef SWIGPYTHON
 #define PYPROTO_DENSEFEATURES(class_name, type_name, format_str, typecode)
+#define PYPROTO_DENSELABELS(class_type, class_name, type_name, format_str, typecode)
 #endif
 
 /* Remove C Prefix */
@@ -49,10 +50,19 @@
 %rename(CombinedFeatures) CCombinedFeatures;
 %rename(CombinedDotFeatures) CCombinedDotFeatures;
 %rename(Labels) CLabels;
+
+PYPROTO_DENSELABELS(CDenseLabels, DenseLabels, float64_t, "d\0", NPY_FLOAT64)
 %rename(DenseLabels) CDenseLabels;
+
+PYPROTO_DENSELABELS(CBinaryLabels, BinaryLabels, float64_t, "d\0", NPY_FLOAT64)
 %rename(BinaryLabels) CBinaryLabels;
+
+PYPROTO_DENSELABELS(CMulticlassLabels, MulticlassLabels, float64_t, "d\0", NPY_FLOAT64)
 %rename(MulticlassLabels) CMulticlassLabels;
+
+PYPROTO_DENSELABELS(CRegressionLabels, RegressionLabels, float64_t, "d\0", NPY_FLOAT64)
 %rename(RegressionLabels) CRegressionLabels;
+
 %rename(StructuredLabels) CStructuredLabels;
 %rename(MulticlassMultipleOutputLabels) CMulticlassMultipleOutputLabels;
 %rename(RealFileFeatures) CRealFileFeatures;
@@ -346,7 +356,7 @@ namespace shogun
 #endif
 
 #ifdef USE_FLOAT32
-	PYPROTO_DENSEFEATURES(ShortRealFeatures, float64_t, "f\0", NPY_FLOAT32)
+	PYPROTO_DENSEFEATURES(ShortRealFeatures, float32_t, "f\0", NPY_FLOAT32)
     %template(ShortRealFeatures) CDenseFeatures<float32_t>;
 #endif
 

diff --git a/src/interfaces/modular/Library.i b/src/interfaces/modular/Library.i
@@ -6,8 +6,13 @@
  *
  * Written (W) 2009 Soeren Sonnenburg
  * Copyright (C) 2009 Fraunhofer Institute FIRST and Max-Planck-Society
+ * Copyright (c) 2012 Evgeniy Andreev (gsomix)
  */
 
+#ifndef SWIGPYTHON
+#define PYPROTO_SGVECTOR(class_name, type_name, format_str, typecode)
+#endif
+
 %rename(Cache) CCache;
 %rename(ListElement) CListElement;
 %rename(List) CList;
@@ -236,6 +241,9 @@ namespace shogun
     SERIALIZABLE_DUMMY(SGString<floatmax_t>);
 #endif
 
+%ignore SGVector<float64_t>::operator+=;
+%ignore SGVector<float64_t>::operator+;
+
 #ifdef USE_BOOL
     %template(BoolVector) SGVector<bool>;
     SERIALIZABLE_DUMMY(SGVector<bool>);
@@ -273,10 +281,12 @@ namespace shogun
     SERIALIZABLE_DUMMY(SGVector<uint64_t>);
 #endif
 #ifdef USE_FLOAT32
+	PYPROTO_SGVECTOR(ShortRealVector, float32_t, "f\0", NPY_FLOAT32)
     %template(ShortRealVector) SGVector<float32_t>;
     SERIALIZABLE_DUMMY(SGVector<float32_t>);
 #endif
 #ifdef USE_FLOAT64
+	PYPROTO_SGVECTOR(RealVector, float64_t, "d\0", NPY_FLOAT64)
     %template(RealVector) SGVector<float64_t>;
     SERIALIZABLE_DUMMY(SGVector<float64_t>);
 #endif