experiments/STT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Missing renames in CI scripts

Browse Source
This commit is contained in:
Reuben Morais 2020-08-04 15:25:46 +02:00
parent b301cdf83e
commit ee1235678d
4 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
native_client/python/__init__.py
View File

@ -20,7 +20,7 @@ if platform.system().lower() == "windows":
import mozilla_voice_stt as stt import mozilla_voice_stt as stt
# rename for backwards compatibility # rename for backwards compatibility
from stt.impl import Version as version from mozilla_voice_stt.impl import Version as version
class Model(object): class Model(object):
""" """

8
taskcluster/tc-android-utils.sh
View File

@ -5,7 +5,7 @@ set -xe
force_java_apk_x86_64() force_java_apk_x86_64()
{ {
cd ${DS_DSDIR}/native_client/java/ cd ${DS_DSDIR}/native_client/java/
cat <<EOF > libdeepspeech/gradle.properties cat <<EOF > libmozillavoicestt/gradle.properties
ABI_FILTERS = x86_64 ABI_FILTERS = x86_64
EOF EOF
} }
@ -37,9 +37,9 @@ do_deepspeech_java_apk_build()
nc_dir="x86_64" nc_dir="x86_64"
fi; fi;
mkdir native_client/java/libdeepspeech/libs/${nc_dir} mkdir native_client/java/libmozillavoicestt/libs/${nc_dir}
curl -L https://community-tc.services.mozilla.com/api/queue/v1/task/${dep}/artifacts/public/native_client.tar.xz | tar -C native_client/java/libdeepspeech/libs/${nc_dir}/ -Jxvf - libmozilla_voice_stt.so curl -L https://community-tc.services.mozilla.com/api/queue/v1/task/${dep}/artifacts/public/native_client.tar.xz | tar -C native_client/java/libmozillavoicestt/libs/${nc_dir}/ -Jxvf - libmozilla_voice_stt.so
fi; fi;
done; done;
@ -56,7 +56,7 @@ android_run_tests()
adb shell ls -hal /data/local/tmp/test/ adb shell ls -hal /data/local/tmp/test/
./gradlew --console=plain libdeepspeech:connectedAndroidTest ./gradlew --console=plain libmozillavoicestt:connectedAndroidTest
} }
android_sdk_accept_licenses() android_sdk_accept_licenses()

26
taskcluster/tc-build-utils.sh
View File

@ -231,7 +231,7 @@ do_deepspeech_netframework_build()
cd ${DS_DSDIR}/native_client/dotnet cd ${DS_DSDIR}/native_client/dotnet
# Setup dependencies # Setup dependencies
nuget restore DeepSpeech.sln nuget restore MozillaVoiceStt.sln
MSBUILD="$(cygpath 'C:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools\MSBuild\Current\Bin\MSBuild.exe')" MSBUILD="$(cygpath 'C:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools\MSBuild\Current\Bin\MSBuild.exe')"
@ -239,35 +239,35 @@ do_deepspeech_netframework_build()
# We build the .NET Client for .NET Framework v4.5,v4.6,v4.7 # We build the .NET Client for .NET Framework v4.5,v4.6,v4.7
MSYS2_ARG_CONV_EXCL='/' "${MSBUILD}" \ MSYS2_ARG_CONV_EXCL='/' "${MSBUILD}" \
DeepSpeechClient/DeepSpeechClient.csproj \ MozillaVoiceSttClient/MozillaVoiceSttClient.csproj \
/p:Configuration=Release \ /p:Configuration=Release \
/p:Platform=x64 \ /p:Platform=x64 \
/p:TargetFramework="net452" \ /p:TargetFramework="net452" \
/p:OutputPath=bin/nuget/x64/v4.5 /p:OutputPath=bin/nuget/x64/v4.5
MSYS2_ARG_CONV_EXCL='/' "${MSBUILD}" \ MSYS2_ARG_CONV_EXCL='/' "${MSBUILD}" \
DeepSpeechClient/DeepSpeechClient.csproj \ MozillaVoiceSttClient/MozillaVoiceSttClient.csproj \
/p:Configuration=Release \ /p:Configuration=Release \
/p:Platform=x64 \ /p:Platform=x64 \
/p:TargetFramework="net46" \ /p:TargetFramework="net46" \
/p:OutputPath=bin/nuget/x64/v4.6 /p:OutputPath=bin/nuget/x64/v4.6
MSYS2_ARG_CONV_EXCL='/' "${MSBUILD}" \ MSYS2_ARG_CONV_EXCL='/' "${MSBUILD}" \
DeepSpeechClient/DeepSpeechClient.csproj \ MozillaVoiceSttClient/MozillaVoiceSttClient.csproj \
/p:Configuration=Release \ /p:Configuration=Release \
/p:Platform=x64 \ /p:Platform=x64 \
/p:TargetFramework="net47" \ /p:TargetFramework="net47" \
/p:OutputPath=bin/nuget/x64/v4.7 /p:OutputPath=bin/nuget/x64/v4.7
MSYS2_ARG_CONV_EXCL='/' "${MSBUILD}" \ MSYS2_ARG_CONV_EXCL='/' "${MSBUILD}" \
DeepSpeechClient/DeepSpeechClient.csproj \ MozillaVoiceSttClient/MozillaVoiceSttClient.csproj \
/p:Configuration=Release \ /p:Configuration=Release \
/p:Platform=x64 \ /p:Platform=x64 \
/p:TargetFramework="uap10.0" \ /p:TargetFramework="uap10.0" \
/p:OutputPath=bin/nuget/x64/uap10.0 /p:OutputPath=bin/nuget/x64/uap10.0
MSYS2_ARG_CONV_EXCL='/' "${MSBUILD}" \ MSYS2_ARG_CONV_EXCL='/' "${MSBUILD}" \
DeepSpeechConsole/DeepSpeechConsole.csproj \ MozillaVoiceSttConsole/MozillaVoiceSttConsole.csproj \
/p:Configuration=Release \ /p:Configuration=Release \
/p:Platform=x64 /p:Platform=x64
} }
@ -277,14 +277,14 @@ do_deepspeech_netframework_wpf_build()
cd ${DS_DSDIR}/native_client/dotnet cd ${DS_DSDIR}/native_client/dotnet
# Setup dependencies # Setup dependencies
nuget install DeepSpeechWPF/packages.config -OutputDirectory DeepSpeechWPF/packages/ nuget install MozillaVoiceSttWPF/packages.config -OutputDirectory MozillaVoiceSttWPF/packages/
MSBUILD="$(cygpath 'C:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools\MSBuild\Current\Bin\MSBuild.exe')" MSBUILD="$(cygpath 'C:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools\MSBuild\Current\Bin\MSBuild.exe')"
# We need MSYS2_ARG_CONV_EXCL='/' otherwise the '/' of CLI parameters gets mangled and disappears # We need MSYS2_ARG_CONV_EXCL='/' otherwise the '/' of CLI parameters gets mangled and disappears
# Build WPF example # Build WPF example
MSYS2_ARG_CONV_EXCL='/' "${MSBUILD}" \ MSYS2_ARG_CONV_EXCL='/' "${MSBUILD}" \
DeepSpeechWPF/DeepSpeech.WPF.csproj \ MozillaVoiceSttWPF/MozillaVoiceStt.WPF.csproj \
/p:Configuration=Release \ /p:Configuration=Release \
/p:Platform=x64 \ /p:Platform=x64 \
/p:OutputPath=bin/x64 /p:OutputPath=bin/x64
@ -306,16 +306,16 @@ do_nuget_build()
# We copy the generated clients for .NET into the Nuget framework dirs # We copy the generated clients for .NET into the Nuget framework dirs
mkdir -p nupkg/lib/net45/ mkdir -p nupkg/lib/net45/
cp DeepSpeechClient/bin/nuget/x64/v4.5/DeepSpeechClient.dll nupkg/lib/net45/ cp MozillaVoiceSttClient/bin/nuget/x64/v4.5/MozillaVoiceSttClient.dll nupkg/lib/net45/
mkdir -p nupkg/lib/net46/ mkdir -p nupkg/lib/net46/
cp DeepSpeechClient/bin/nuget/x64/v4.6/DeepSpeechClient.dll nupkg/lib/net46/ cp MozillaVoiceSttClient/bin/nuget/x64/v4.6/MozillaVoiceSttClient.dll nupkg/lib/net46/
mkdir -p nupkg/lib/net47/ mkdir -p nupkg/lib/net47/
cp DeepSpeechClient/bin/nuget/x64/v4.7/DeepSpeechClient.dll nupkg/lib/net47/ cp MozillaVoiceSttClient/bin/nuget/x64/v4.7/MozillaVoiceSttClient.dll nupkg/lib/net47/
mkdir -p nupkg/lib/uap10.0/ mkdir -p nupkg/lib/uap10.0/
cp DeepSpeechClient/bin/nuget/x64/uap10.0/DeepSpeechClient.dll nupkg/lib/uap10.0/ cp MozillaVoiceSttClient/bin/nuget/x64/uap10.0/MozillaVoiceSttClient.dll nupkg/lib/uap10.0/
PROJECT_VERSION=$(strip "${DS_VERSION}") PROJECT_VERSION=$(strip "${DS_VERSION}")
sed \ sed \
@ -341,5 +341,5 @@ do_deepspeech_ios_framework_build()
xcodeArch="arm64" xcodeArch="arm64"
;; ;;
esac esac
xcodebuild -workspace deepspeech_ios.xcworkspace -scheme deepspeech_ios_test -configuration Release -arch "${xcodeArch}" -sdk "${iosSDK}" -derivedDataPath DerivedData CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO CODE_SIGNING_ALLOWED=NO xcodebuild -workspace mozilla_voice_stt.xcworkspace -scheme mozilla_voice_stt_test -configuration Release -arch "${xcodeArch}" -sdk "${iosSDK}" -derivedDataPath DerivedData CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO CODE_SIGNING_ALLOWED=NO
} }

2
taskcluster/tc-netframework-ds-tests.sh
View File

@ -25,7 +25,7 @@ download_data
install_nuget "${PROJECT_NAME}" install_nuget "${PROJECT_NAME}"
DS_BINARY_FILE="DeepSpeechConsole.exe" DS_BINARY_FILE="MozillaVoiceSttConsole.exe"
ensure_cuda_usage "$2" ensure_cuda_usage "$2"
run_netframework_inference_tests run_netframework_inference_tests