refactor the code

pull/1087/head
huangyuxin 3 years ago
parent ed12db61a6
commit cea5ffe0e4

@ -11,21 +11,15 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
from paddlespeech.s2t.utils.log import Log
logger = Log(__name__).getlog()
try:
from .ctcdecoder import swig_wrapper
except:
logger = Log(__name__).getlog()
try:
import pip
if int(pip.__version__.split('.')[0])>9:
from pip._internal import main
else:
from pip import main
from paddlespeech.s2t.utils import dynamic_pip_install
package_name = 'paddlespeech_ctcdecoders'
main(['install', package_name])
dynamic_pip_install.install(package_name)
except Exception as e:
logger.info("paddlespeech_ctcdecoders not installed!")

@ -13,20 +13,17 @@
# limitations under the License.
from .deepspeech2 import DeepSpeech2InferModel
from .deepspeech2 import DeepSpeech2Model
from paddlespeech.s2t.utils import dynamic_pip_install
try:
import swig_decoders
except:
try:
import pip
if int(pip.__version__.split('.')[0])>9:
from pip._internal import main
else:
from pip import main
package_name = 'paddlespeech_ctcdecoders'
main(['install', package_name])
dynamic_pip_install.install(package_name)
except:
raise RuntimeError("Can not install package paddlespeech_ctcdecoders on your system. \
raise RuntimeError(
"Can not install package paddlespeech_ctcdecoders on your system. \
The DeepSpeech2 model is not supported for your system")
__all__ = ['DeepSpeech2Model', 'DeepSpeech2InferModel']

@ -13,21 +13,17 @@
# limitations under the License.
from .deepspeech2 import DeepSpeech2InferModelOnline
from .deepspeech2 import DeepSpeech2ModelOnline
from paddlespeech.s2t.utils import dynamic_pip_install
try:
import swig_decoders
except:
try:
import pip
if int(pip.__version__.split('.')[0])>9:
from pip._internal import main
else:
from pip import main
package_name = 'paddlespeech_ctcdecoders'
main(['install', package_name])
dynamic_pip_install.install(package_name)
except:
raise RuntimeError("Can not install package paddlespeech_ctcdecoders on your system. \
raise RuntimeError(
"Can not install package paddlespeech_ctcdecoders on your system. \
The DeepSpeech2 model is not supported for your system")
__all__ = ['DeepSpeech2ModelOnline', 'DeepSpeech2InferModelOnline']

@ -30,13 +30,9 @@ try:
from paddlespeech.s2t.decoders.ctcdecoder.swig_wrapper import Scorer # noqa: F401
except:
try:
import pip
if int(pip.__version__.split('.')[0])>9:
from pip._internal import main
else:
from pip import main
from paddlespeech.s2t.utils import dynamic_pip_install
package_name = 'paddlespeech_ctcdecoders'
main(['install', package_name])
dynamic_pip_install.install(package_name)
except Exception as e:
logger.info("paddlespeech_ctcdecoders not installed!")

@ -0,0 +1,22 @@
# Copyright (c) 2021 PaddlePaddle Authors. All Rights Reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
import pip
def install(package_name):
if int(pip.__version__.split('.')[0]) > 9:
from pip._internal import main
else:
from pip import main
main(['install', package_name])
Loading…
Cancel
Save