Skip to content
Snippets Groups Projects
Commit fca1e9b3 authored by Tiago de Freitas Pereira's avatar Tiago de Freitas Pereira
Browse files

Bind GMMStats class

parent 5d24e859
No related branches found
No related tags found
No related merge requests found
...@@ -41,6 +41,7 @@ static PyObject* create_module (void) { ...@@ -41,6 +41,7 @@ static PyObject* create_module (void) {
if (PyModule_AddStringConstant(module, "__version__", BOB_EXT_MODULE_VERSION) < 0) return 0; if (PyModule_AddStringConstant(module, "__version__", BOB_EXT_MODULE_VERSION) < 0) return 0;
if (!init_BobLearnMiscGaussian(module)) return 0; if (!init_BobLearnMiscGaussian(module)) return 0;
if (!init_BobLearnMiscGMMStats(module)) return 0;
static void* PyBobLearnMisc_API[PyBobLearnMisc_API_pointers]; static void* PyBobLearnMisc_API[PyBobLearnMisc_API_pointers];
......
...@@ -18,6 +18,7 @@ ...@@ -18,6 +18,7 @@
#include <bob.learn.misc/api.h> #include <bob.learn.misc/api.h>
#include <bob.learn.misc/Gaussian.h> #include <bob.learn.misc/Gaussian.h>
#include <bob.learn.misc/GMMStats.h>
#if PY_VERSION_HEX >= 0x03000000 #if PY_VERSION_HEX >= 0x03000000
...@@ -69,4 +70,16 @@ bool init_BobLearnMiscGaussian(PyObject* module); ...@@ -69,4 +70,16 @@ bool init_BobLearnMiscGaussian(PyObject* module);
int PyBobLearnMiscGaussian_Check(PyObject* o); int PyBobLearnMiscGaussian_Check(PyObject* o);
// GMMStats
typedef struct {
PyObject_HEAD
boost::shared_ptr<bob::learn::misc::GMMStats> cxx;
} PyBobLearnMiscGMMStatsObject;
extern PyTypeObject PyBobLearnMiscGMMStats_Type;
bool init_BobLearnMiscGMMStats(PyObject* module);
int PyBobLearnMiscGMMStats_Check(PyObject* o);
#endif // BOB_LEARN_EM_MAIN_H #endif // BOB_LEARN_EM_MAIN_H
...@@ -15,11 +15,11 @@ import tempfile ...@@ -15,11 +15,11 @@ import tempfile
import bob.io.base import bob.io.base
from bob.io.base.test_utils import datafile from bob.io.base.test_utils import datafile
from . import GMMStats, GMMMachine from . import GMMStats
#, GMMMachine
def test_GMMStats(): def test_GMMStats():
# Test a GMMStats # Test a GMMStats
# Initializes a GMMStats # Initializes a GMMStats
gs = GMMStats(2,3) gs = GMMStats(2,3)
log_likelihood = -3. log_likelihood = -3.
......
...@@ -56,7 +56,7 @@ setup( ...@@ -56,7 +56,7 @@ setup(
[ [
"bob/learn/misc/cpp/Gaussian.cpp", "bob/learn/misc/cpp/Gaussian.cpp",
#"bob/learn/misc/cpp/GMMMachine.cpp", #"bob/learn/misc/cpp/GMMMachine.cpp",
#"bob/learn/misc/cpp/GMMStats.cpp", "bob/learn/misc/cpp/GMMStats.cpp",
#"bob/learn/misc/cpp/IVectorMachine.cpp", #"bob/learn/misc/cpp/IVectorMachine.cpp",
#"bob/learn/misc/cpp/JFAMachine.cpp", #"bob/learn/misc/cpp/JFAMachine.cpp",
#"bob/learn/misc/cpp/KMeansMachine.cpp", #"bob/learn/misc/cpp/KMeansMachine.cpp",
...@@ -101,6 +101,7 @@ setup( ...@@ -101,6 +101,7 @@ setup(
Extension("bob.learn.misc._library", Extension("bob.learn.misc._library",
[ [
"bob/learn/misc/gaussian.cpp", "bob/learn/misc/gaussian.cpp",
"bob/learn/misc/gmm_stats.cpp",
"bob/learn/misc/main.cpp", "bob/learn/misc/main.cpp",
], ],
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment