Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Anthony Larcher
sidekit
Commits
36515bd5
Commit
36515bd5
authored
Feb 27, 2017
by
Anthony Larcher
Browse files
merge with dev
parent
0c6a13cd
Changes
24
Hide whitespace changes
Inline
Side-by-side
__init__.py
View file @
36515bd5
...
...
@@ -176,7 +176,7 @@ if SIDEKIT_CONFIG["mpi"]:
__author__
=
"Anthony Larcher and Sylvain Meignier"
__copyright__
=
"Copyright 2014-201
6
Anthony Larcher and Sylvain Meignier"
__copyright__
=
"Copyright 2014-201
7
Anthony Larcher and Sylvain Meignier"
__license__
=
"LGPL"
__maintainer__
=
"Anthony Larcher"
__email__
=
"anthony.larcher@univ-lemans.fr"
...
...
factor_analyser.py
View file @
36515bd5
...
...
@@ -39,6 +39,13 @@ from sidekit.statserver import StatServer
from
sidekit.mixture
import
Mixture
from
sidekit.sidekit_wrappers
import
process_parallel_lists
,
deprecated
,
check_path_existance
__license__
=
"LGPL"
__author__
=
"Anthony Larcher & Sylvain Meignier"
__copyright__
=
"Copyright 2014-2017 Anthony Larcher"
__maintainer__
=
"Anthony Larcher"
__email__
=
"anthony.larcher@univ-lemans.fr"
__status__
=
"Production"
__docformat__
=
'reStructuredText'
def
e_on_batch
(
stat0
,
stat1
,
ubm
,
F
):
"""
...
...
features_extractor.py
View file @
36515bd5
...
...
@@ -42,7 +42,7 @@ from sidekit.bosaris.idmap import IdMap
__license__
=
"LGPL"
__author__
=
"Anthony Larcher & Sylvain Meignier"
__copyright__
=
"Copyright 2014-201
6
Anthony Larcher"
__copyright__
=
"Copyright 2014-201
7
Anthony Larcher"
__maintainer__
=
"Anthony Larcher"
__email__
=
"anthony.larcher@univ-lemans.fr"
__status__
=
"Production"
...
...
features_server.py
View file @
36515bd5
...
...
@@ -40,7 +40,7 @@ from sidekit.sv_utils import parse_mask
__license__
=
"LGPL"
__author__
=
"Anthony Larcher & Sylvain Meignier"
__copyright__
=
"Copyright 2014-201
6
Anthony Larcher"
__copyright__
=
"Copyright 2014-201
7
Anthony Larcher"
__maintainer__
=
"Anthony Larcher"
__email__
=
"anthony.larcher@univ-lemans.fr"
__status__
=
"Production"
...
...
frontend/__init__.py
View file @
36515bd5
...
...
@@ -64,7 +64,7 @@ from sidekit.frontend.features import shifted_delta_cepstral
__author__
=
"Anthony Larcher and Sylvain Meignier"
__copyright__
=
"Copyright 2014-201
6
Anthony Larcher and Sylvain Meignier"
__copyright__
=
"Copyright 2014-201
7
Anthony Larcher and Sylvain Meignier"
__license__
=
"LGPL"
__maintainer__
=
"Anthony Larcher"
__email__
=
"anthony.larcher@univ-lemans.fr"
...
...
frontend/features.py
View file @
36515bd5
...
...
@@ -41,7 +41,7 @@ import numpy.matlib
PARAM_TYPE
=
numpy
.
float32
__author__
=
"Anthony Larcher and Sylvain Meignier"
__copyright__
=
"Copyright 2014-201
6
Anthony Larcher and Sylvain Meignier"
__copyright__
=
"Copyright 2014-201
7
Anthony Larcher and Sylvain Meignier"
__license__
=
"LGPL"
__maintainer__
=
"Anthony Larcher"
__email__
=
"anthony.larcher@univ-lemans.fr"
...
...
frontend/io.py
View file @
36515bd5
...
...
@@ -45,7 +45,7 @@ from sidekit.sidekit_wrappers import check_path_existance
__author__
=
"Anthony Larcher"
__copyright__
=
"Copyright 2014-201
6
Anthony Larcher"
__copyright__
=
"Copyright 2014-201
7
Anthony Larcher"
__license__
=
"LGPL"
__maintainer__
=
"Anthony Larcher"
__email__
=
"anthony.larcher@univ-lemans.fr"
...
...
frontend/normfeat.py
View file @
36515bd5
...
...
@@ -34,7 +34,7 @@ from scipy.signal import lfilter
__author__
=
"Anthony Larcher and Sylvain Meignier"
__copyright__
=
"Copyright 2014-201
6
Anthony Larcher and Sylvain Meignier"
__copyright__
=
"Copyright 2014-201
7
Anthony Larcher and Sylvain Meignier"
__license__
=
"LGPL"
__maintainer__
=
"Anthony Larcher"
__email__
=
"anthony.larcher@univ-lemans.fr"
...
...
frontend/vad.py
View file @
36515bd5
...
...
@@ -36,7 +36,7 @@ from sidekit.mixture import Mixture
__author__
=
"Anthony Larcher and Sylvain Meignier"
__copyright__
=
"Copyright 2014-201
6
Anthony Larcher and Sylvain Meignier"
__copyright__
=
"Copyright 2014-201
7
Anthony Larcher and Sylvain Meignier"
__license__
=
"LGPL"
__maintainer__
=
"Anthony Larcher"
__email__
=
"anthony.larcher@univ-lemans.fr"
...
...
gmm_scoring.py
View file @
36515bd5
...
...
@@ -43,7 +43,7 @@ from sidekit.bosaris import Scores
__license__
=
"LGPL"
__author__
=
"Anthony Larcher"
__copyright__
=
"Copyright 2014-201
6
Anthony Larcher"
__copyright__
=
"Copyright 2014-201
7
Anthony Larcher"
__maintainer__
=
"Anthony Larcher"
__email__
=
"anthony.larcher@univ-lemans.fr"
__status__
=
"Production"
...
...
iv_scoring.py
View file @
36515bd5
...
...
@@ -40,7 +40,7 @@ if sys.version_info.major > 2:
__license__
=
"LGPL"
__author__
=
"Anthony Larcher"
__copyright__
=
"Copyright 2014-201
6
Anthony Larcher"
__copyright__
=
"Copyright 2014-201
7
Anthony Larcher"
__maintainer__
=
"Anthony Larcher"
__email__
=
"anthony.larcher@univ-lemans.fr"
__status__
=
"Production"
...
...
jfa_scoring.py
View file @
36515bd5
...
...
@@ -35,7 +35,7 @@ from sidekit.bosaris import Scores
__license__
=
"LGPL"
__author__
=
"Anthony Larcher"
__copyright__
=
"Copyright 2014-201
6
Anthony Larcher"
__copyright__
=
"Copyright 2014-201
7
Anthony Larcher"
__maintainer__
=
"Anthony Larcher"
__email__
=
"anthony.larcher@univ-lemans.fr"
__status__
=
"Production"
...
...
libsvm/__init__.py
View file @
36515bd5
...
...
@@ -26,7 +26,7 @@ Copyright 2014-2017 Anthony Larcher
"""
__author__
=
"Anthony Larcher"
__copyright__
=
"Copyright 2014-201
5
Anthony Larcher"
__copyright__
=
"Copyright 2014-201
7
Anthony Larcher"
__license__
=
"LGPL"
__maintainer__
=
"Anthony Larcher"
__email__
=
"anthony.larcher@univ-lemans.fr"
...
...
lid_utils.py
View file @
36515bd5
...
...
@@ -37,7 +37,7 @@ import sidekit.frontend
__license__
=
"LGPL"
__author__
=
"Anthony Larcher"
__copyright__
=
"Copyright 2014-201
6
Anthony Larcher"
__copyright__
=
"Copyright 2014-201
7
Anthony Larcher"
__maintainer__
=
"Anthony Larcher"
__email__
=
"anthony.larcher@univ-lemans.fr"
__status__
=
"Production"
...
...
mixture.py
View file @
36515bd5
...
...
@@ -41,7 +41,7 @@ import sys
__license__
=
"LGPL"
__author__
=
"Anthony Larcher"
__copyright__
=
"Copyright 2014-201
6
Anthony Larcher"
__copyright__
=
"Copyright 2014-201
7
Anthony Larcher"
__maintainer__
=
"Anthony Larcher"
__email__
=
"anthony.larcher@univ-lemans.fr"
__status__
=
"Production"
...
...
nnet/__init__.py
View file @
36515bd5
...
...
@@ -32,7 +32,7 @@ from sidekit.nnet.feed_forward import kaldi_to_hdf5
__author__
=
"Anthony Larcher and Sylvain Meignier"
__copyright__
=
"Copyright 2014-201
6
Anthony Larcher and Sylvain Meignier"
__copyright__
=
"Copyright 2014-201
7
Anthony Larcher and Sylvain Meignier"
__license__
=
"LGPL"
__maintainer__
=
"Anthony Larcher"
__email__
=
"anthony.larcher@univ-lemans.fr"
...
...
nnet/feed_forward.py
View file @
36515bd5
...
...
@@ -57,7 +57,7 @@ import theano.tensor as T
__license__
=
"LGPL"
__author__
=
"Anthony Larcher"
__copyright__
=
"Copyright 2015-201
6
Anthony Larcher"
__copyright__
=
"Copyright 2015-201
7
Anthony Larcher"
__maintainer__
=
"Anthony Larcher"
__email__
=
"anthony.larcher@univ-lemans.fr"
__status__
=
"Production"
...
...
sidekit_io.py
View file @
36515bd5
...
...
@@ -41,7 +41,7 @@ from sidekit.sidekit_wrappers import check_path_existance
__license__
=
"LGPL"
__author__
=
"Anthony Larcher"
__copyright__
=
"Copyright 2014-201
6
Anthony Larcher"
__copyright__
=
"Copyright 2014-201
7
Anthony Larcher"
__maintainer__
=
"Anthony Larcher"
__email__
=
"anthony.larcher@univ-lemans.fr"
__status__
=
"Production"
...
...
sidekit_mpi.py
View file @
36515bd5
...
...
@@ -44,6 +44,14 @@ from sidekit.factor_analyser import e_on_batch
from
mpi4py
import
MPI
__license__
=
"LGPL"
__author__
=
"Anthony Larcher"
__copyright__
=
"Copyright 2014-2017 Anthony Larcher"
__maintainer__
=
"Anthony Larcher"
__email__
=
"anthony.larcher@univ-lemans.fr"
__status__
=
"Production"
__docformat__
=
'reStructuredText'
data_type
=
numpy
.
float32
def
total_variability
(
stat_server_file_name
,
...
...
@@ -431,15 +439,9 @@ def EM_split(ubm,
logging
.
critical
(
"
\t
iteration {} / {}"
.
format
(
i
+
1
,
it
))
_tmp_llk
=
numpy
.
array
(
0
)
accum
.
_reset
()
tmp_w
=
numpy
.
zeros_like
(
ubm
.
w
)
tmp_mu
=
numpy
.
zeros_like
(
ubm
.
mu
)
tmp_invcov
=
numpy
.
zeros_like
(
ubm
.
invcov
)
else
:
_tmp_llk
=
numpy
.
array
([
None
])
tmp_w
=
None
tmp_mu
=
None
tmp_invcov
=
None
# E step
logging
.
critical
(
"
\n
Start E-step, rank {}"
.
format
(
comm
.
rank
))
...
...
@@ -506,14 +508,6 @@ def EM_split(ubm,
pass
# Send the new Mixture to all process
comm
.
Barrier
()
#self.w = comm.bcast(self.w, root=0)
#self.mu = comm.bcast(self.mu, root=0)
#self.invcov = comm.bcast(self.invcov, root=0)
#self.invchol = comm.bcast(self.invchol, root=0)
#self.cov_var_ctl = comm.bcast(self.cov_var_ctl, root=0)
#self.cst = comm.bcast(self.cst, root=0)
#self.det = comm.bcast(self.det, root=0)
#self.A = comm.bcast(self.A, root=0)
ubm
=
comm
.
bcast
(
ubm
,
root
=
0
)
comm
.
Barrier
()
if
comm
.
rank
==
0
:
...
...
sidekit_wrappers.py
View file @
36515bd5
...
...
@@ -34,7 +34,7 @@ from sidekit import PARALLEL_MODULE
__license__
=
"LGPL"
__author__
=
"Anthony Larcher"
__copyright__
=
"Copyright 2014-201
6
Anthony Larcher"
__copyright__
=
"Copyright 2014-201
7
Anthony Larcher"
__maintainer__
=
"Anthony Larcher"
__email__
=
"anthony.larcher@univ-lemans.fr"
__status__
=
"Production"
...
...
Prev
1
2
Next
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment