From aeef80cdf27887a3a35d322636d27fa264c341d8 Mon Sep 17 00:00:00 2001
From: Yannick DAYER <yannick.dayer@idiap.ch>
Date: Fri, 18 Feb 2022 09:24:11 +0100
Subject: [PATCH] [setup] cleaning config and entry-points
---
bob/bio/gmm/config/algorithm/gmm_regular.py | 5 -----
bob/bio/gmm/config/algorithm/isv.py | 8 --------
bob/bio/gmm/config/algorithm/ivector_cosine.py | 10 ----------
.../config/algorithm/ivector_lda_wccn_plda.py | 17 -----------------
bob/bio/gmm/config/algorithm/ivector_plda.py | 14 --------------
bob/bio/gmm/config/algorithm/jfa.py | 12 ------------
setup.py | 10 +---------
7 files changed, 1 insertion(+), 75 deletions(-)
delete mode 100644 bob/bio/gmm/config/algorithm/gmm_regular.py
delete mode 100644 bob/bio/gmm/config/algorithm/isv.py
delete mode 100644 bob/bio/gmm/config/algorithm/ivector_cosine.py
delete mode 100644 bob/bio/gmm/config/algorithm/ivector_lda_wccn_plda.py
delete mode 100644 bob/bio/gmm/config/algorithm/ivector_plda.py
delete mode 100644 bob/bio/gmm/config/algorithm/jfa.py
diff --git a/bob/bio/gmm/config/algorithm/gmm_regular.py b/bob/bio/gmm/config/algorithm/gmm_regular.py
deleted file mode 100644
index 5bedd86..0000000
--- a/bob/bio/gmm/config/algorithm/gmm_regular.py
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/usr/bin/env python
-
-import bob.bio.gmm
-
-algorithm = bob.bio.gmm.algorithm.GMMRegular(number_of_gaussians=512)
diff --git a/bob/bio/gmm/config/algorithm/isv.py b/bob/bio/gmm/config/algorithm/isv.py
deleted file mode 100644
index 3d6d9c7..0000000
--- a/bob/bio/gmm/config/algorithm/isv.py
+++ /dev/null
@@ -1,8 +0,0 @@
-import bob.bio.gmm
-
-algorithm = bob.bio.gmm.algorithm.ISV(
- # ISV parameters
- subspace_dimension_of_u=160,
- # GMM parameters
- number_of_gaussians=512,
-)
diff --git a/bob/bio/gmm/config/algorithm/ivector_cosine.py b/bob/bio/gmm/config/algorithm/ivector_cosine.py
deleted file mode 100644
index 1006de1..0000000
--- a/bob/bio/gmm/config/algorithm/ivector_cosine.py
+++ /dev/null
@@ -1,10 +0,0 @@
-import bob.bio.gmm
-
-algorithm = bob.bio.gmm.algorithm.IVector(
- # IVector parameters
- subspace_dimension_of_t=400,
- update_sigma=True,
- tv_training_iterations=3, # Number of EM iterations for the TV training
- # GMM parameters
- number_of_gaussians=512,
-)
diff --git a/bob/bio/gmm/config/algorithm/ivector_lda_wccn_plda.py b/bob/bio/gmm/config/algorithm/ivector_lda_wccn_plda.py
deleted file mode 100644
index de9bd5a..0000000
--- a/bob/bio/gmm/config/algorithm/ivector_lda_wccn_plda.py
+++ /dev/null
@@ -1,17 +0,0 @@
-import bob.bio.gmm
-
-algorithm = bob.bio.gmm.algorithm.IVector(
- # IVector parameters
- subspace_dimension_of_t=100,
- update_sigma=True,
- tv_training_iterations=25, # Number of EM iterations for the TV training
- # GMM parameters
- number_of_gaussians=256,
- use_lda=True,
- use_wccn=True,
- use_plda=True,
- lda_dim=50,
- plda_dim_F=50,
- plda_dim_G=50,
- plda_training_iterations=200,
-)
diff --git a/bob/bio/gmm/config/algorithm/ivector_plda.py b/bob/bio/gmm/config/algorithm/ivector_plda.py
deleted file mode 100644
index a99762f..0000000
--- a/bob/bio/gmm/config/algorithm/ivector_plda.py
+++ /dev/null
@@ -1,14 +0,0 @@
-import bob.bio.gmm
-
-algorithm = bob.bio.gmm.algorithm.IVector(
- # IVector parameters
- subspace_dimension_of_t=100,
- update_sigma=True,
- tv_training_iterations=25, # Number of EM iterations for the TV training
- # GMM parameters
- number_of_gaussians=256,
- use_plda=True,
- plda_dim_F=50,
- plda_dim_G=50,
- plda_training_iterations=200,
-)
diff --git a/bob/bio/gmm/config/algorithm/jfa.py b/bob/bio/gmm/config/algorithm/jfa.py
deleted file mode 100644
index 21c5d4d..0000000
--- a/bob/bio/gmm/config/algorithm/jfa.py
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/usr/bin/env python
-
-import bob.bio.gmm
-
-algorithm = bob.bio.gmm.algorithm.JFA(
- # JFA Training
- subspace_dimension_of_u=2, # U subspace dimension
- subspace_dimension_of_v=2, # V subspace dimension
- jfa_training_iterations=10, # Number of EM iterations for the JFA training
- # GMM training
- number_of_gaussians=512,
-)
diff --git a/setup.py b/setup.py
index 3b512f4..6ee603a 100644
--- a/setup.py
+++ b/setup.py
@@ -98,17 +98,9 @@ setup(
"console_scripts": [],
"bob.bio.database": [],
"bob.bio.preprocessor": [],
- "bob.bio.extractor": [
- "dummy2d = bob.bio.gmm.test.dummy.extractor:extractor", # for test purposes only
- ],
+ "bob.bio.extractor": [],
"bob.bio.algorithm": [
"gmm = bob.bio.gmm.config.algorithm.gmm:algorithm",
- "gmm-regular = bob.bio.gmm.config.algorithm.gmm_regular:algorithm",
- "jfa = bob.bio.gmm.config.algorithm.jfa:algorithm",
- "isv = bob.bio.gmm.config.algorithm.isv:algorithm",
- "ivector-cosine = bob.bio.gmm.config.algorithm.ivector_cosine:algorithm",
- "ivector-plda = bob.bio.gmm.config.algorithm.ivector_plda:algorithm",
- "ivector-lda-wccn-plda = bob.bio.gmm.config.algorithm.ivector_lda_wccn_plda:algorithm",
],
},
# Classifiers are important if you plan to distribute this package through
--
GitLab