diff --git a/bob/learn/misc/__init__.py b/bob/learn/misc/__init__.py index f4216be17e582a5234df0bbd960267ebe74660b4..15128195bae11c14871bf2ce0173478fe5f7453b 100644 --- a/bob/learn/misc/__init__.py +++ b/bob/learn/misc/__init__.py @@ -1,4 +1,4 @@ -from ._library import * +from ._old_library import * from . import version from .version import module as __version__ diff --git a/bob/learn/misc/bic.cpp b/bob/learn/misc/old/bic.cc similarity index 100% rename from bob/learn/misc/bic.cpp rename to bob/learn/misc/old/bic.cc diff --git a/bob/learn/misc/bic_trainer.cpp b/bob/learn/misc/old/bic_trainer.cc similarity index 100% rename from bob/learn/misc/bic_trainer.cpp rename to bob/learn/misc/old/bic_trainer.cc diff --git a/bob/learn/misc/blitz_numpy.cpp b/bob/learn/misc/old/blitz_numpy.cc similarity index 100% rename from bob/learn/misc/blitz_numpy.cpp rename to bob/learn/misc/old/blitz_numpy.cc diff --git a/bob/learn/misc/empca_trainer.cpp b/bob/learn/misc/old/empca_trainer.cc similarity index 100% rename from bob/learn/misc/empca_trainer.cpp rename to bob/learn/misc/old/empca_trainer.cc diff --git a/bob/learn/misc/exception.h b/bob/learn/misc/old/exception.h similarity index 100% rename from bob/learn/misc/exception.h rename to bob/learn/misc/old/exception.h diff --git a/bob/learn/misc/gaussian.cpp b/bob/learn/misc/old/gaussian.cc similarity index 100% rename from bob/learn/misc/gaussian.cpp rename to bob/learn/misc/old/gaussian.cc diff --git a/bob/learn/misc/gmm.cpp b/bob/learn/misc/old/gmm.cc similarity index 100% rename from bob/learn/misc/gmm.cpp rename to bob/learn/misc/old/gmm.cc diff --git a/bob/learn/misc/gmm_trainer.cpp b/bob/learn/misc/old/gmm_trainer.cc similarity index 100% rename from bob/learn/misc/gmm_trainer.cpp rename to bob/learn/misc/old/gmm_trainer.cc diff --git a/bob/learn/misc/hdf5.cpp b/bob/learn/misc/old/hdf5.cc similarity index 100% rename from bob/learn/misc/hdf5.cpp rename to bob/learn/misc/old/hdf5.cc diff --git a/bob/learn/misc/ivector.cpp b/bob/learn/misc/old/ivector.cc similarity index 100% rename from bob/learn/misc/ivector.cpp rename to bob/learn/misc/old/ivector.cc diff --git a/bob/learn/misc/ivector_trainer.cpp b/bob/learn/misc/old/ivector_trainer.cc similarity index 100% rename from bob/learn/misc/ivector_trainer.cpp rename to bob/learn/misc/old/ivector_trainer.cc diff --git a/bob/learn/misc/jfa.cpp b/bob/learn/misc/old/jfa.cc similarity index 100% rename from bob/learn/misc/jfa.cpp rename to bob/learn/misc/old/jfa.cc diff --git a/bob/learn/misc/jfa_trainer.cpp b/bob/learn/misc/old/jfa_trainer.cc similarity index 100% rename from bob/learn/misc/jfa_trainer.cpp rename to bob/learn/misc/old/jfa_trainer.cc diff --git a/bob/learn/misc/kmeans.cpp b/bob/learn/misc/old/kmeans.cc similarity index 100% rename from bob/learn/misc/kmeans.cpp rename to bob/learn/misc/old/kmeans.cc diff --git a/bob/learn/misc/kmeans_trainer.cpp b/bob/learn/misc/old/kmeans_trainer.cc similarity index 100% rename from bob/learn/misc/kmeans_trainer.cpp rename to bob/learn/misc/old/kmeans_trainer.cc diff --git a/bob/learn/misc/linearscoring.cpp b/bob/learn/misc/old/linearscoring.cc similarity index 100% rename from bob/learn/misc/linearscoring.cpp rename to bob/learn/misc/old/linearscoring.cc diff --git a/bob/learn/misc/machine.cpp b/bob/learn/misc/old/machine.cc similarity index 100% rename from bob/learn/misc/machine.cpp rename to bob/learn/misc/old/machine.cc diff --git a/bob/learn/misc/main.cpp b/bob/learn/misc/old/main.cc similarity index 100% rename from bob/learn/misc/main.cpp rename to bob/learn/misc/old/main.cc diff --git a/bob/learn/misc/ndarray.cpp b/bob/learn/misc/old/ndarray.cc similarity index 100% rename from bob/learn/misc/ndarray.cpp rename to bob/learn/misc/old/ndarray.cc diff --git a/bob/learn/misc/ndarray.h b/bob/learn/misc/old/ndarray.h similarity index 100% rename from bob/learn/misc/ndarray.h rename to bob/learn/misc/old/ndarray.h diff --git a/bob/learn/misc/ndarray_numpy.cpp b/bob/learn/misc/old/ndarray_numpy.cc similarity index 100% rename from bob/learn/misc/ndarray_numpy.cpp rename to bob/learn/misc/old/ndarray_numpy.cc diff --git a/bob/learn/misc/plda.cpp b/bob/learn/misc/old/plda.cc similarity index 100% rename from bob/learn/misc/plda.cpp rename to bob/learn/misc/old/plda.cc diff --git a/bob/learn/misc/plda_trainer.cpp b/bob/learn/misc/old/plda_trainer.cc similarity index 100% rename from bob/learn/misc/plda_trainer.cpp rename to bob/learn/misc/old/plda_trainer.cc diff --git a/bob/learn/misc/random.cpp b/bob/learn/misc/old/random.cc similarity index 100% rename from bob/learn/misc/random.cpp rename to bob/learn/misc/old/random.cc diff --git a/bob/learn/misc/tinyvector.cpp b/bob/learn/misc/old/tinyvector.cc similarity index 100% rename from bob/learn/misc/tinyvector.cpp rename to bob/learn/misc/old/tinyvector.cc diff --git a/bob/learn/misc/wiener.cpp b/bob/learn/misc/old/wiener.cc similarity index 100% rename from bob/learn/misc/wiener.cpp rename to bob/learn/misc/old/wiener.cc diff --git a/bob/learn/misc/wiener_trainer.cpp b/bob/learn/misc/old/wiener_trainer.cc similarity index 100% rename from bob/learn/misc/wiener_trainer.cpp rename to bob/learn/misc/old/wiener_trainer.cc diff --git a/bob/learn/misc/ztnorm.cpp b/bob/learn/misc/old/ztnorm.cc similarity index 100% rename from bob/learn/misc/ztnorm.cpp rename to bob/learn/misc/old/ztnorm.cc diff --git a/setup.py b/setup.py index cffd5b254d30fdbc751fbe9ab30ab06aa4de9189..86769f01ce7cc3b871f5b6045e1cea6088ce9321 100644 --- a/setup.py +++ b/setup.py @@ -51,37 +51,37 @@ setup( include_dirs = include_dirs, version = version, ), - Extension("bob.learn.misc._library", + Extension("bob.learn.misc._old_library", [ - "bob/learn/misc/bic.cpp", - "bob/learn/misc/bic_trainer.cpp", - "bob/learn/misc/empca_trainer.cpp", - "bob/learn/misc/gaussian.cpp", - "bob/learn/misc/gmm.cpp", - "bob/learn/misc/gmm_trainer.cpp", - "bob/learn/misc/ivector.cpp", - "bob/learn/misc/ivector_trainer.cpp", - "bob/learn/misc/jfa.cpp", - "bob/learn/misc/jfa_trainer.cpp", - "bob/learn/misc/kmeans.cpp", - "bob/learn/misc/kmeans_trainer.cpp", - "bob/learn/misc/machine.cpp", - "bob/learn/misc/linearscoring.cpp", - "bob/learn/misc/plda.cpp", - "bob/learn/misc/plda_trainer.cpp", - "bob/learn/misc/wiener.cpp", - "bob/learn/misc/wiener_trainer.cpp", - "bob/learn/misc/ztnorm.cpp", + "bob/learn/misc/old/bic.cc", + "bob/learn/misc/old/bic_trainer.cc", + "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/blitz_numpy.cpp", - "bob/learn/misc/ndarray.cpp", - "bob/learn/misc/ndarray_numpy.cpp", - "bob/learn/misc/tinyvector.cpp", - "bob/learn/misc/hdf5.cpp", - "bob/learn/misc/random.cpp", + "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/hdf5.cc", + "bob/learn/misc/old/random.cc", - "bob/learn/misc/main.cpp", + "bob/learn/misc/old/main.cc", ], packages = packages, boost_modules = ['python'],