Skip to content

Commit efc4b88

Browse files
curufinwecurufinwe
authored
Remove recipe prefix from all imports (rwth-i6#36)
1 parent 45e6a40 commit efc4b88

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

72 files changed

+153
-154
lines changed

‎__init__.py

Whitespace-only changes.

‎adaptation/__init__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,5 @@
1010
import logging
1111

1212
logging.debug(
13-
'Warning (recipe.adaptation.__init__.py): "bob" was not found. I-vector training and extraction will not be available.'
13+
'Warning (adaptation.__init__.py): "bob" was not found. I-vector training and extraction will not be available.'
1414
)

‎adaptation/ivector.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@
1818
'No module named "bob".\nInstallation guide: https://www.idiap.ch/software/bob/docs/bob/docs/stable/bob/doc/install.html\nAlternatively use this python: /work/asr3/kitza/software/miniconda3/envs/bob_py3/bin/python'
1919
)
2020

21-
import recipe.i6_core.rasr as rasr
22-
import recipe.i6_core.util as util
23-
import recipe.i6_core.lib.rasr_cache as sc
21+
import i6_core.rasr as rasr
22+
import i6_core.util as util
23+
import i6_core.lib.rasr_cache as sc
2424

2525
"""
2626
If filesystem locking problems occur set:

‎adaptation/linear_adaptation_layer.py

+6-6
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@
1212

1313
Path = setup_path(__package__)
1414

15-
import recipe.i6_core.rasr as rasr
16-
import recipe.i6_core.returnn as returnn
17-
import recipe.i6_core.corpus as corpus_recipes
18-
import recipe.i6_core.util as util
19-
import recipe.i6_core.recognition as recog
20-
from recipe.i6_core.util import MultiOutputPath
15+
import i6_core.rasr as rasr
16+
import i6_core.returnn as returnn
17+
import i6_core.corpus as corpus_recipes
18+
import i6_core.util as util
19+
import i6_core.recognition as recog
20+
from i6_core.util import MultiOutputPath
2121

2222
# we do not put features in caches or calc alignment here, that is part of the setup
2323
# nothing should be hard coded here, only modules

‎adaptation/ubm.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010

1111
Path = setup_path(__package__)
1212

13-
import recipe.i6_core.mm as mm
14-
import recipe.i6_core.rasr as rasr
15-
import recipe.i6_core.util as util
13+
import i6_core.mm as mm
14+
import i6_core.rasr as rasr
15+
import i6_core.util as util
1616

1717

1818
def label_features_with_map_flow(

‎am/config.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
__all__ = ["acoustic_model_config"]
22

3-
import recipe.i6_core.rasr as rasr
3+
import i6_core.rasr as rasr
44

55

66
def acoustic_model_config(

‎am/score_features.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
import math
88
import xml.etree.ElementTree as ET
99

10-
import recipe.i6_core.rasr as rasr
11-
import recipe.i6_core.util as util
10+
import i6_core.rasr as rasr
11+
import i6_core.util as util
1212

1313

1414
class ScoreFeaturesJob(rasr.RasrCommand, Job):

‎audio/encoding.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
from sisyphus import Path
44

5-
from recipe.i6_core.audio.ffmpeg import BlissFfmpegJob
5+
from i6_core.audio.ffmpeg import BlissFfmpegJob
66

77

88
class BlissChangeEncodingJob(BlissFfmpegJob):

‎audio/ffmpeg.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
from sisyphus import *
99

10-
from recipe.i6_core.lib import corpus
10+
from i6_core.lib import corpus
1111

1212

1313
class BlissFfmpegJob(Job):

‎bpe/apply.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010

1111
Path = setup_path(__package__)
1212

13-
from recipe.i6_core.tools.git import *
14-
from recipe.i6_core.lib.lexicon import Lexicon
13+
from i6_core.tools.git import *
14+
from i6_core.lib.lexicon import Lexicon
1515

1616

1717
class ApplyBPEModelToLexiconJob(Job):

‎bpe/train.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
Path = setup_path(__package__)
1111

12-
from recipe.i6_core.tools.git import *
12+
from i6_core.tools.git import *
1313

1414

1515
class TrainBPEModelJob(Job):

‎cart/estimate.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77

88
Path = setup_path(__package__)
99

10-
import recipe.i6_core.rasr as rasr
11-
import recipe.i6_core.util as util
10+
import i6_core.rasr as rasr
11+
import i6_core.util as util
1212

1313

1414
class AccumulateCartStatisticsJob(rasr.RasrCommand, Job):

‎corpus/convert.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66

77
from sisyphus import *
88

9-
from recipe.i6_core.lib import corpus
10-
from recipe.i6_core.util import uopen
9+
from i6_core.lib import corpus
10+
from i6_core.util import uopen
1111

1212
Path = setup_path(__package__)
1313

‎corpus/costa.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
Path = setup_path(__package__)
44

5-
from recipe.i6_core.features.common import raw_audio_flow
6-
import recipe.i6_core.rasr as rasr
7-
import recipe.i6_core.util as util
5+
from i6_core.features.common import raw_audio_flow
6+
import i6_core.rasr as rasr
7+
import i6_core.util as util
88

99

1010
class CostaJob(rasr.RasrCommand, Job):

‎corpus/data_augmentation.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
from sisyphus import *
1010

11-
from recipe.i6_core.lib import corpus
11+
from i6_core.lib import corpus
1212

1313
Path = setup_path(__package__)
1414

‎corpus/filter.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@
1111

1212
import numpy as np
1313

14-
from recipe.i6_core.util import MultiOutputPath
14+
from i6_core.util import MultiOutputPath
1515

16-
from recipe.i6_core.lib import corpus
17-
from recipe.i6_core.util import chunks, uopen
16+
from i6_core.lib import corpus
17+
from i6_core.util import chunks, uopen
1818

1919
from sisyphus import *
2020

@@ -87,7 +87,7 @@ def __init__(
8787
:param dict[int,str] alignment_logs: alignment_job.log_file; task_id -> log_file
8888
:param float|int percentile: in range [0,100]. for :func:`np.percentile`
8989
:param float absolute_threshold:
90-
:param recipe.rasr.crp.CommonRasrParameters crp:
90+
:param rasr.crp.CommonRasrParameters crp:
9191
:param bool plot:
9292
"""
9393
self.alignment_logs = alignment_logs # alignment_job.log_file

‎corpus/segments.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@
1616

1717
import numpy as np
1818

19-
from recipe.i6_core.util import MultiOutputPath
20-
from recipe.i6_core.lib import corpus
21-
from recipe.i6_core.util import chunks
19+
from i6_core.util import MultiOutputPath
20+
from i6_core.lib import corpus
21+
from i6_core.util import chunks
2222

2323
from sisyphus import *
2424

@@ -264,7 +264,7 @@ def run(self):
264264
class SortSegmentsByLengthAndShuffleJob(Job):
265265
def __init__(self, crp, shuffle_strength=1.0, shuffle_seed=0x3C5EA3E47D4E0077):
266266
"""
267-
:param crp: recipe.rasr.crp.CommonRasrParameters
267+
:param crp: rasr.crp.CommonRasrParameters
268268
:param shuffle_strength: float in [0,inf) determines how much the length should affect sorting
269269
0 -> completely random; inf -> strictly sorted
270270
:param shuffle_seed: random number seed

‎corpus/stats.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import xml.etree.cElementTree as ET
44

5-
from recipe.i6_core.util import uopen
5+
from i6_core.util import uopen
66

77
from sisyphus import *
88

‎corpus/transform.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
import wave
1717
import xml.etree.cElementTree as ET
1818

19-
from recipe.i6_core.lib import corpus
20-
from recipe.i6_core.util import uopen
19+
from i6_core.lib import corpus
20+
from i6_core.util import uopen
2121

2222
from sisyphus import *
2323

‎datasets/librispeech.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
from sisyphus import *
1212

13-
from recipe.i6_core.lib import corpus
13+
from i6_core.lib import corpus
1414

1515

1616
class DownloadLibriSpeechCorpusJob(Job):

‎discriminative_training/lattice_generation.py

+5-5
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@
1414

1515
Path = setup_path(__package__)
1616

17-
from recipe.i6_core.mm.flow import alignment_flow
18-
import recipe.i6_core.mm as mm
19-
import recipe.i6_core.recognition as recognition
20-
import recipe.i6_core.util as util
21-
import recipe.i6_core.rasr as rasr
17+
from i6_core.mm.flow import alignment_flow
18+
import i6_core.mm as mm
19+
import i6_core.recognition as recognition
20+
import i6_core.util as util
21+
import i6_core.rasr as rasr
2222

2323

2424
class NumeratorLatticeJob(rasr.RasrCommand, Job):

‎docs/conf.py

+4-5
Original file line numberDiff line numberDiff line change
@@ -13,18 +13,17 @@
1313
import os
1414
import sys
1515

16-
if not os.path.exists("recipe"):
17-
os.mkdir("recipe")
18-
os.mkdir("recipe/i6_core")
16+
if not os.path.exists("i6_core"):
17+
os.mkdir("i6_core")
1918
for fn in sorted(os.listdir("..")):
2019
print(fn)
2120
if fn.endswith(".py"):
22-
os.symlink("../../../%s" % fn, "recipe/i6_core/%s" % fn)
21+
os.symlink("../../%s" % fn, "i6_core/%s" % fn)
2322
continue
2423
if os.path.isdir(os.path.join("..", fn)) and os.path.exists(
2524
os.path.join("..", fn, "__init__.py")
2625
):
27-
os.symlink("../../../%s" % fn, "recipe/i6_core/%s" % fn)
26+
os.symlink("../../%s" % fn, "i6_core/%s" % fn)
2827
continue
2928

3029
sys.path.insert(0, os.path.abspath("."))

‎docs/generateapi.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@ def makeapi(modname):
1515
"""
1616
:param str modname:
1717
"""
18-
fn = "api/%s.rst" % (modname[len("recipe.i6_core.") :] or "___base")
18+
fn = "api/%s.rst" % (modname[len("i6_core.") :] or "___base")
1919
if os.path.exists(fn):
2020
return
2121
f = open(fn, "w")
22-
title = ":mod:`%s`" % modname[len("recipe.") :]
22+
title = ":mod:`%s`" % modname
2323
f.write("\n%s\n%s\n\n" % (title, "-" * len(title)))
2424
f.write(".. automodule:: %s\n\t:members:\n\t:undoc-members:\n\n" % modname)
2525
f.close()
@@ -59,4 +59,4 @@ def scan_modules(modpath):
5959
continue
6060
makeapi(".".join(modpath + [modname]))
6161

62-
scan_modules(["recipe"])
62+
scan_modules(["i6_core"])

‎features/common.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"select_features",
1515
]
1616

17-
import recipe.i6_core.rasr as rasr
17+
import i6_core.rasr as rasr
1818

1919

2020
# -------------------- Flows --------------------

‎features/energy.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
from .common import *
66
from .extraction import *
7-
import recipe.i6_core.rasr as rasr
7+
import i6_core.rasr as rasr
88

99

1010
def EnergyJob(crp, energy_options=None, extra_config=None, extra_post_config=None):

‎features/extraction.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
Path = setup_path(__package__)
88

99
from .common import *
10-
import recipe.i6_core.rasr as rasr
11-
import recipe.i6_core.util as util
10+
import i6_core.rasr as rasr
11+
import i6_core.util as util
1212

1313

1414
class FeatureExtractionJob(rasr.RasrCommand, Job):
@@ -126,7 +126,7 @@ def create_config(
126126
:param rasr.config.RasrConfig|None extra_config:
127127
:param rasr.config.RasrConfig|None extra_post_config:
128128
:return: config, post_config
129-
:rtype: (rasr.config.RasrConfig, recipe.rasr.config.RasrConfig)
129+
:rtype: (rasr.config.RasrConfig, rasr.config.RasrConfig)
130130
"""
131131
config, post_config = rasr.build_config_from_mapping(
132132
crp, {"corpus": "extraction.corpus"}, parallelize=True

‎features/filterbank.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
from .common import *
88
from .extraction import *
9-
import recipe.i6_core.rasr as rasr
9+
import i6_core.rasr as rasr
1010

1111

1212
def FilterbankJob(

‎features/gammatone.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
from .common import *
66
from .extraction import *
7-
import recipe.i6_core.rasr as rasr
7+
import i6_core.rasr as rasr
88

99

1010
def GammatoneJob(crp, gt_options=None, extra_config=None, extra_post_config=None):

‎features/mfcc.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@
44

55
from .common import *
66
from .extraction import *
7-
import recipe.i6_core.rasr as rasr
7+
import i6_core.rasr as rasr
88

99

1010
def MfccJob(crp, mfcc_options=None, extra_config=None, extra_post_config=None):
1111
"""
12-
:param recipe.rasr.crp.CommonRasrParameters crp:
12+
:param rasr.crp.CommonRasrParameters crp:
1313
:param dict[str] mfcc_options:
14-
:param recipe.rasr.config.RasrConfig|None extra_config:
15-
:param recipe.rasr.config.RasrConfig|None extra_post_config:
14+
:param rasr.config.RasrConfig|None extra_config:
15+
:param rasr.config.RasrConfig|None extra_post_config:
1616
:rtype: FeatureExtractionJob
1717
"""
1818
if mfcc_options is None:

‎features/mrasta.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
from .common import *
77
from .extraction import *
8-
import recipe.i6_core.rasr as rasr
8+
import i6_core.rasr as rasr
99

1010

1111
def MrastaJob(crp, mrasta_options=None, extra_config=None, extra_post_config=None):

‎features/normalization.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66

77
Path = setup_path(__package__)
88

9-
import recipe.i6_core.rasr as rasr
10-
import recipe.i6_core.util as util
9+
import i6_core.rasr as rasr
10+
import i6_core.util as util
1111

1212

1313
class CovarianceNormalizationJob(rasr.RasrCommand, Job):

‎features/plp.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
from .common import *
66
from .extraction import *
77
from math import log, sqrt, floor
8-
import recipe.i6_core.rasr as rasr
8+
import i6_core.rasr as rasr
99

1010

1111
def PlpJob(

0 commit comments

Comments
 (0)