Started binding

bob/learn/misc/__init__.py

@@ -7,8 +7,8 @@ import bob.learn.linear
 import bob.extension
 bob.extension.load_bob_library('bob.learn.misc', __file__)
 
-from ._old_library import *
-#from ._library import *
+#from ._old_library import *
+from ._library import *
 from . import version
 from .version import module as __version__
 

setup.py

@@ -55,25 +55,25 @@ setup(
       Library("bob.learn.misc.bob_learn_misc",
         [
           "bob/learn/misc/cpp/Gaussian.cpp",
-          "bob/learn/misc/cpp/GMMMachine.cpp",
-          "bob/learn/misc/cpp/GMMStats.cpp",
-          "bob/learn/misc/cpp/IVectorMachine.cpp",
-          "bob/learn/misc/cpp/JFAMachine.cpp",
-          "bob/learn/misc/cpp/KMeansMachine.cpp",
-          "bob/learn/misc/cpp/LinearScoring.cpp",
-          "bob/learn/misc/cpp/PLDAMachine.cpp",
-          "bob/learn/misc/cpp/WienerMachine.cpp",
-          "bob/learn/misc/cpp/ZTNorm.cpp",
-
-          "bob/learn/misc/cpp/EMPCATrainer.cpp",
-          "bob/learn/misc/cpp/GMMTrainer.cpp",
-          "bob/learn/misc/cpp/IVectorTrainer.cpp",
-          "bob/learn/misc/cpp/JFATrainer.cpp",
-          "bob/learn/misc/cpp/KMeansTrainer.cpp",
-          "bob/learn/misc/cpp/MAP_GMMTrainer.cpp",
-          "bob/learn/misc/cpp/ML_GMMTrainer.cpp",
-          "bob/learn/misc/cpp/PLDATrainer.cpp",
-          "bob/learn/misc/cpp/WienerTrainer.cpp",
+          #"bob/learn/misc/cpp/GMMMachine.cpp",
+          #"bob/learn/misc/cpp/GMMStats.cpp",
+          #"bob/learn/misc/cpp/IVectorMachine.cpp",
+          #"bob/learn/misc/cpp/JFAMachine.cpp",
+          #"bob/learn/misc/cpp/KMeansMachine.cpp",
+          #"bob/learn/misc/cpp/LinearScoring.cpp",
+          #"bob/learn/misc/cpp/PLDAMachine.cpp",
+          #"bob/learn/misc/cpp/WienerMachine.cpp",
+          #"bob/learn/misc/cpp/ZTNorm.cpp",
+
+          #"bob/learn/misc/cpp/EMPCATrainer.cpp",
+          #"bob/learn/misc/cpp/GMMTrainer.cpp",
+          #"bob/learn/misc/cpp/IVectorTrainer.cpp",
+          #"bob/learn/misc/cpp/JFATrainer.cpp",
+          #"bob/learn/misc/cpp/KMeansTrainer.cpp",
+          #"bob/learn/misc/cpp/MAP_GMMTrainer.cpp",
+          #"bob/learn/misc/cpp/ML_GMMTrainer.cpp",
+          #"bob/learn/misc/cpp/PLDATrainer.cpp",
+          #"bob/learn/misc/cpp/WienerTrainer.cpp",
         ],
         bob_packages = bob_packages,
         packages = packages,
@@ -100,33 +100,11 @@ setup(
 #        version = version,
 #      ),
 
-      Extension("bob.learn.misc._old_library",
+      Extension("bob.learn.misc._library",
         [
-          "bob/learn/misc/old/empca_trainer.cc",
-          "bob/learn/misc/old/gaussian.cc",
-          "bob/learn/misc/old/gmm.cc",
-          "bob/learn/misc/old/gmm_trainer.cc",
-          "bob/learn/misc/old/ivector.cc",
-          "bob/learn/misc/old/ivector_trainer.cc",
-          "bob/learn/misc/old/jfa.cc",
-          "bob/learn/misc/old/jfa_trainer.cc",
-          "bob/learn/misc/old/kmeans.cc",
-          "bob/learn/misc/old/kmeans_trainer.cc",
-          "bob/learn/misc/old/machine.cc",
-          "bob/learn/misc/old/linearscoring.cc",
-          "bob/learn/misc/old/plda.cc",
-          "bob/learn/misc/old/plda_trainer.cc",
-          "bob/learn/misc/old/wiener.cc",
-          "bob/learn/misc/old/wiener_trainer.cc",
-          "bob/learn/misc/old/ztnorm.cc",
-
-          # external requirements as boost::python bindings
-          "bob/learn/misc/old/blitz_numpy.cc",
-          "bob/learn/misc/old/ndarray.cc",
-          "bob/learn/misc/old/ndarray_numpy.cc",
-          "bob/learn/misc/old/tinyvector.cc",
-
-          "bob/learn/misc/old/main.cc",
+          "bob/learn/misc/gaussian.cpp",
+
+          "bob/learn/misc/main.cpp",
         ],
         bob_packages = bob_packages,
         packages = packages,