From 897d1207d42453162ade2d51e44a932d38b31bc1 Mon Sep 17 00:00:00 2001
From: Manuel Guenther <manuel.guenther@idiap.ch>
Date: Mon, 23 Jun 2014 19:16:05 +0200
Subject: [PATCH] Moved files with boost-python bindings to 'old' directory.
---
bob/learn/misc/__init__.py | 2 +-
bob/learn/misc/{bic.cpp => old/bic.cc} | 0
.../{bic_trainer.cpp => old/bic_trainer.cc} | 0
.../{blitz_numpy.cpp => old/blitz_numpy.cc} | 0
.../empca_trainer.cc} | 0
bob/learn/misc/{ => old}/exception.h | 0
.../misc/{gaussian.cpp => old/gaussian.cc} | 0
bob/learn/misc/{gmm.cpp => old/gmm.cc} | 0
.../{gmm_trainer.cpp => old/gmm_trainer.cc} | 0
bob/learn/misc/{hdf5.cpp => old/hdf5.cc} | 0
.../misc/{ivector.cpp => old/ivector.cc} | 0
.../ivector_trainer.cc} | 0
bob/learn/misc/{jfa.cpp => old/jfa.cc} | 0
.../{jfa_trainer.cpp => old/jfa_trainer.cc} | 0
bob/learn/misc/{kmeans.cpp => old/kmeans.cc} | 0
.../kmeans_trainer.cc} | 0
.../linearscoring.cc} | 0
.../misc/{machine.cpp => old/machine.cc} | 0
bob/learn/misc/{main.cpp => old/main.cc} | 0
.../misc/{ndarray.cpp => old/ndarray.cc} | 0
bob/learn/misc/{ => old}/ndarray.h | 0
.../ndarray_numpy.cc} | 0
bob/learn/misc/{plda.cpp => old/plda.cc} | 0
.../{plda_trainer.cpp => old/plda_trainer.cc} | 0
bob/learn/misc/{random.cpp => old/random.cc} | 0
.../{tinyvector.cpp => old/tinyvector.cc} | 0
bob/learn/misc/{wiener.cpp => old/wiener.cc} | 0
.../wiener_trainer.cc} | 0
bob/learn/misc/{ztnorm.cpp => old/ztnorm.cc} | 0
setup.py | 54 +++++++++----------
30 files changed, 28 insertions(+), 28 deletions(-)
rename bob/learn/misc/{bic.cpp => old/bic.cc} (100%)
rename bob/learn/misc/{bic_trainer.cpp => old/bic_trainer.cc} (100%)
rename bob/learn/misc/{blitz_numpy.cpp => old/blitz_numpy.cc} (100%)
rename bob/learn/misc/{empca_trainer.cpp => old/empca_trainer.cc} (100%)
rename bob/learn/misc/{ => old}/exception.h (100%)
rename bob/learn/misc/{gaussian.cpp => old/gaussian.cc} (100%)
rename bob/learn/misc/{gmm.cpp => old/gmm.cc} (100%)
rename bob/learn/misc/{gmm_trainer.cpp => old/gmm_trainer.cc} (100%)
rename bob/learn/misc/{hdf5.cpp => old/hdf5.cc} (100%)
rename bob/learn/misc/{ivector.cpp => old/ivector.cc} (100%)
rename bob/learn/misc/{ivector_trainer.cpp => old/ivector_trainer.cc} (100%)
rename bob/learn/misc/{jfa.cpp => old/jfa.cc} (100%)
rename bob/learn/misc/{jfa_trainer.cpp => old/jfa_trainer.cc} (100%)
rename bob/learn/misc/{kmeans.cpp => old/kmeans.cc} (100%)
rename bob/learn/misc/{kmeans_trainer.cpp => old/kmeans_trainer.cc} (100%)
rename bob/learn/misc/{linearscoring.cpp => old/linearscoring.cc} (100%)
rename bob/learn/misc/{machine.cpp => old/machine.cc} (100%)
rename bob/learn/misc/{main.cpp => old/main.cc} (100%)
rename bob/learn/misc/{ndarray.cpp => old/ndarray.cc} (100%)
rename bob/learn/misc/{ => old}/ndarray.h (100%)
rename bob/learn/misc/{ndarray_numpy.cpp => old/ndarray_numpy.cc} (100%)
rename bob/learn/misc/{plda.cpp => old/plda.cc} (100%)
rename bob/learn/misc/{plda_trainer.cpp => old/plda_trainer.cc} (100%)
rename bob/learn/misc/{random.cpp => old/random.cc} (100%)
rename bob/learn/misc/{tinyvector.cpp => old/tinyvector.cc} (100%)
rename bob/learn/misc/{wiener.cpp => old/wiener.cc} (100%)
rename bob/learn/misc/{wiener_trainer.cpp => old/wiener_trainer.cc} (100%)
rename bob/learn/misc/{ztnorm.cpp => old/ztnorm.cc} (100%)
diff --git a/bob/learn/misc/__init__.py b/bob/learn/misc/__init__.py
index f4216be..1512819 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 cffd5b2..86769f0 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'],
--
GitLab