Merge pull request #3454 from mozilla/branding-cleanup

Branding cleanup
This commit is contained in:
Reuben Morais 2020-12-07 13:59:03 +02:00 committed by GitHub
commit a947e80f70
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
28 changed files with 48 additions and 48 deletions

View File

@ -1,5 +1,5 @@
This file contains a list of papers in chronological order that have been published This file contains a list of papers in chronological order that have been published
using Mozilla's DeepSpeech. using DeepSpeech.
To appear To appear
========== ==========

View File

@ -247,7 +247,7 @@ N.B. - If you have access to a pre-trained model which uses UTF-8 bytes at the o
Fine-Tuning (same alphabet) Fine-Tuning (same alphabet)
^^^^^^^^^^^^^^^^^^^^^^^^^^^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^
If you'd like to use one of the pre-trained models released by Mozilla to bootstrap your training process (fine tuning), you can do so by using the ``--checkpoint_dir`` flag in ``DeepSpeech.py``. Specify the path where you downloaded the checkpoint from the release, and training will resume from the pre-trained model. If you'd like to use one of the pre-trained models to bootstrap your training process (fine tuning), you can do so by using the ``--checkpoint_dir`` flag in ``DeepSpeech.py``. Specify the path where you downloaded the checkpoint from the release, and training will resume from the pre-trained model.
For example, if you want to fine tune the entire graph using your own data in ``my-train.csv``\ , ``my-dev.csv`` and ``my-test.csv``\ , for three epochs, you can something like the following, tuning the hyperparameters as needed: For example, if you want to fine tune the entire graph using your own data in ``my-train.csv``\ , ``my-dev.csv`` and ``my-test.csv``\ , for three epochs, you can something like the following, tuning the hyperparameters as needed:

View File

@ -46,8 +46,8 @@ import semver
# -- Project information ----------------------------------------------------- # -- Project information -----------------------------------------------------
project = u'DeepSpeech' project = u'DeepSpeech'
copyright = '2019-2020, Mozilla Corporation' copyright = '2019-2020 Mozilla Corporation, 2020 DeepSpeech authors'
author = 'Mozilla Corporation' author = 'DeepSpeech authors'
with open('../VERSION', 'r') as ver: with open('../VERSION', 'r') as ver:
v = ver.read().strip() v = ver.read().strip()
@ -175,7 +175,7 @@ latex_elements = {
# author, documentclass [howto, manual, or own class]). # author, documentclass [howto, manual, or own class]).
latex_documents = [ latex_documents = [
(master_doc, 'DeepSpeech.tex', u'DeepSpeech Documentation', (master_doc, 'DeepSpeech.tex', u'DeepSpeech Documentation',
u'Mozilla Research', 'manual'), u'DeepSpeech authors', 'manual'),
] ]

View File

@ -5,7 +5,7 @@ using System.IO;
namespace DeepSpeechClient.Interfaces namespace DeepSpeechClient.Interfaces
{ {
/// <summary> /// <summary>
/// Client interface of Mozilla's DeepSpeech implementation. /// Client interface for DeepSpeech
/// </summary> /// </summary>
public interface IDeepSpeech : IDisposable public interface IDeepSpeech : IDisposable
{ {

View File

@ -61,7 +61,7 @@ There should already be a symbolic link, for this example let's suppose that we
├── D:\ ├── D:\
│ ├── cloned # Contains DeepSpeech and tensorflow side by side │ ├── cloned # Contains DeepSpeech and tensorflow side by side
│ │ └── DeepSpeech # Root of the cloned DeepSpeech │ │ └── DeepSpeech # Root of the cloned DeepSpeech
│ │ ├── tensorflow # Root of the cloned Mozilla's tensorflow │ │ ├── tensorflow # Root of the cloned mozilla/tensorflow
└── ... └── ...

View File

@ -4,13 +4,13 @@
<id>$NUPKG_ID</id> <id>$NUPKG_ID</id>
<version>$NUPKG_VERSION</version> <version>$NUPKG_VERSION</version>
<title>DeepSpeech</title> <title>DeepSpeech</title>
<authors>Mozilla</authors> <authors>DeepSpeech authors</authors>
<owners>Mozilla</owners> <owners>DeepSpeech authors</owners>
<license type="expression">MPL-2.0</license> <license type="expression">MPL-2.0</license>
<projectUrl>http://github.com/mozilla/DeepSpeech</projectUrl> <projectUrl>http://github.com/mozilla/DeepSpeech</projectUrl>
<requireLicenseAcceptance>false</requireLicenseAcceptance> <requireLicenseAcceptance>false</requireLicenseAcceptance>
<description>A library for running inference with a DeepSpeech model</description> <description>A library for running inference with a DeepSpeech model</description>
<copyright>Copyright (c) 2019 Mozilla Corporation</copyright> <copyright>Copyright (c) 2019-2020 Mozilla Corporation, 2020 DeepSpeech authors</copyright>
<tags>native speech speech_recognition</tags> <tags>native speech speech_recognition</tags>
</metadata> </metadata>
<files> <files>

View File

@ -28,4 +28,4 @@ maven-bundle: apk
$(GRADLE) zipMavenArtifacts $(GRADLE) zipMavenArtifacts
bindings: clean ds-swig bindings: clean ds-swig
$(DS_SWIG_ENV) swig -c++ -java -package org.mozilla.deepspeech.libdeepspeech -outdir libdeepspeech/src/main/java/org/mozilla/deepspeech/libdeepspeech/ -o jni/deepspeech_wrap.cpp jni/deepspeech.i $(DS_SWIG_ENV) swig -c++ -java -package org.deepspeech.libdeepspeech -outdir libdeepspeech/src/main/java/org/deepspeech/libdeepspeech/ -o jni/deepspeech_wrap.cpp jni/deepspeech.i

View File

@ -4,7 +4,7 @@ android {
compileSdkVersion 27 compileSdkVersion 27
defaultConfig { defaultConfig {
applicationId "org.mozilla.deepspeech" applicationId "org.deepspeech"
minSdkVersion 21 minSdkVersion 21
targetSdkVersion 27 targetSdkVersion 27
versionName androidGitVersion.name() versionName androidGitVersion.name()

View File

@ -1,4 +1,4 @@
package org.mozilla.deepspeech; package org.deepspeech;
import android.content.Context; import android.content.Context;
import android.support.test.InstrumentationRegistry; import android.support.test.InstrumentationRegistry;
@ -21,6 +21,6 @@ public class ExampleInstrumentedTest {
// Context of the app under test. // Context of the app under test.
Context appContext = InstrumentationRegistry.getTargetContext(); Context appContext = InstrumentationRegistry.getTargetContext();
assertEquals("org.mozilla.deepspeech", appContext.getPackageName()); assertEquals("org.deepspeech", appContext.getPackageName());
} }
} }

View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.mozilla.deepspeech"> package="org.deepspeech">
<application <application
android:allowBackup="true" android:allowBackup="true"

View File

@ -1,4 +1,4 @@
package org.mozilla.deepspeech; package org.deepspeech;
import android.support.v7.app.AppCompatActivity; import android.support.v7.app.AppCompatActivity;
import android.os.Bundle; import android.os.Bundle;
@ -16,7 +16,7 @@ import java.io.IOException;
import java.nio.ByteOrder; import java.nio.ByteOrder;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
import org.mozilla.deepspeech.libdeepspeech.DeepSpeechModel; import org.deepspeech.libdeepspeech.DeepSpeechModel;
public class DeepSpeechActivity extends AppCompatActivity { public class DeepSpeechActivity extends AppCompatActivity {

View File

@ -1,4 +1,4 @@
package org.mozilla.deepspeech; package org.deepspeech;
import org.junit.Test; import org.junit.Test;

View File

@ -46,7 +46,7 @@ android {
// Avoid scanning libdeepspeech_doc // Avoid scanning libdeepspeech_doc
sourceSets { sourceSets {
main.java.srcDirs = [ 'src/main/java/org/mozilla/deepspeech/libdeepspeech/' ] main.java.srcDirs = [ 'src/main/java/org/deepspeech/libdeepspeech/' ]
} }
} }
@ -77,7 +77,7 @@ uploadArchives {
mavenDeployer { mavenDeployer {
pom.packaging = 'aar' pom.packaging = 'aar'
pom.name = 'libdeepspeech' pom.name = 'libdeepspeech'
pom.groupId = 'org.mozilla.deepspeech' pom.groupId = 'org.deepspeech'
pom.artifactId = 'libdeepspeech' pom.artifactId = 'libdeepspeech'
pom.version = dsVersionString + (project.hasProperty('snapshot') ? '-SNAPSHOT' : '') pom.version = dsVersionString + (project.hasProperty('snapshot') ? '-SNAPSHOT' : '')
@ -96,7 +96,7 @@ uploadArchives {
developers { developers {
developer { developer {
id 'deepspeech' id 'deepspeech'
name 'Mozilla DeepSpeech Team' name 'DeepSpeech authors'
email 'deepspeechs@lists.mozilla.org' email 'deepspeechs@lists.mozilla.org'
} }
} }

View File

@ -1,4 +1,4 @@
package org.mozilla.deepspeech.libdeepspeech.test; package org.deepspeech.libdeepspeech.test;
import android.content.Context; import android.content.Context;
import android.support.test.InstrumentationRegistry; import android.support.test.InstrumentationRegistry;
@ -11,8 +11,8 @@ import org.junit.runners.MethodSorters;
import static org.junit.Assert.*; import static org.junit.Assert.*;
import org.mozilla.deepspeech.libdeepspeech.DeepSpeechModel; import org.deepspeech.libdeepspeech.DeepSpeechModel;
import org.mozilla.deepspeech.libdeepspeech.CandidateTranscript; import org.deepspeech.libdeepspeech.CandidateTranscript;
import java.io.RandomAccessFile; import java.io.RandomAccessFile;
import java.io.FileNotFoundException; import java.io.FileNotFoundException;
@ -54,7 +54,7 @@ public class BasicTest {
// Context of the app under test. // Context of the app under test.
Context appContext = InstrumentationRegistry.getTargetContext(); Context appContext = InstrumentationRegistry.getTargetContext();
assertEquals("org.mozilla.deepspeech.libdeepspeech.test", appContext.getPackageName()); assertEquals("org.deepspeech.libdeepspeech.test", appContext.getPackageName());
} }
@Test @Test

View File

@ -1,2 +1,2 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.mozilla.deepspeech.libdeepspeech" /> package="org.deepspeech.libdeepspeech" />

View File

@ -1,4 +1,4 @@
package org.mozilla.deepspeech.libdeepspeech; package org.deepspeech.libdeepspeech;
/** /**
* @brief Exposes a DeepSpeech model in Java * @brief Exposes a DeepSpeech model in Java

View File

@ -1,4 +1,4 @@
package org.mozilla.deepspeech.libdeepspeech; package org.deepspeech.libdeepspeech;
public final class DeepSpeechStreamingState { public final class DeepSpeechStreamingState {
private SWIGTYPE_p_StreamingState _sp; private SWIGTYPE_p_StreamingState _sp;

View File

@ -6,7 +6,7 @@
* the SWIG interface file instead. * the SWIG interface file instead.
* ----------------------------------------------------------------------------- */ * ----------------------------------------------------------------------------- */
package org.mozilla.deepspeech.libdeepspeech; package org.deepspeech.libdeepspeech;
/** /**
* A single transcript computed by the model, including a confidence<br> * A single transcript computed by the model, including a confidence<br>

View File

@ -6,7 +6,7 @@
* the SWIG interface file instead. * the SWIG interface file instead.
* ----------------------------------------------------------------------------- */ * ----------------------------------------------------------------------------- */
package org.mozilla.deepspeech.libdeepspeech; package org.deepspeech.libdeepspeech;
public enum DeepSpeech_Error_Codes { public enum DeepSpeech_Error_Codes {
ERR_OK(0x0000), ERR_OK(0x0000),

View File

@ -6,7 +6,7 @@
* the SWIG interface file instead. * the SWIG interface file instead.
* ----------------------------------------------------------------------------- */ * ----------------------------------------------------------------------------- */
package org.mozilla.deepspeech.libdeepspeech; package org.deepspeech.libdeepspeech;
/** /**
* An array of CandidateTranscript objects computed by the model. * An array of CandidateTranscript objects computed by the model.

View File

@ -8,4 +8,4 @@ To update, please install SWIG (4.0 at least) and then run from native_client/ja
.. code-block:: .. code-block::
swig -c++ -java -doxygen -package org.mozilla.deepspeech.libdeepspeech -outdir libdeepspeech/src/main/java/org/mozilla/deepspeech/libdeepspeech_doc -o jni/deepspeech_wrap.cpp jni/deepspeech.i swig -c++ -java -doxygen -package org.deepspeech.libdeepspeech -outdir libdeepspeech/src/main/java/org/deepspeech/libdeepspeech_doc -o jni/deepspeech_wrap.cpp jni/deepspeech.i

View File

@ -6,7 +6,7 @@
* the SWIG interface file instead. * the SWIG interface file instead.
* ----------------------------------------------------------------------------- */ * ----------------------------------------------------------------------------- */
package org.mozilla.deepspeech.libdeepspeech; package org.deepspeech.libdeepspeech;
/** /**
* Stores text of an individual token, along with its timing information * Stores text of an individual token, along with its timing information

View File

@ -1,4 +1,4 @@
package org.mozilla.deepspeech.libdeepspeech; package org.deepspeech.libdeepspeech;
import org.junit.Test; import org.junit.Test;

View File

@ -7,7 +7,7 @@
"bin": { "bin": {
"deepspeech": "./client.js" "deepspeech": "./client.js"
}, },
"author" : "Mozilla", "author" : "DeepSpeech authors",
"license": "MPL-2.0", "license": "MPL-2.0",
"homepage": "https://github.com/mozilla/DeepSpeech/tree/v$(PROJECT_VERSION)#project-deepspeech", "homepage": "https://github.com/mozilla/DeepSpeech/tree/v$(PROJECT_VERSION)#project-deepspeech",
"files": [ "files": [

View File

@ -7,7 +7,7 @@ Pod::Spec.new do |s|
s.summary = "DeepSpeech" s.summary = "DeepSpeech"
s.homepage = "https://github.com/mozilla/DeepSpeech" s.homepage = "https://github.com/mozilla/DeepSpeech"
s.license = "Mozilla Public License 2.0" s.license = "Mozilla Public License 2.0"
s.authors = "Mozilla et al." s.authors = "DeepSpeech authors"
s.platforms = { :ios => "9.0" } s.platforms = { :ios => "9.0" }
s.source = { :git => "https://github.com/mozilla/DeepSpeech.git", :tag => "v#{s.version}" } s.source = { :git => "https://github.com/mozilla/DeepSpeech.git", :tag => "v#{s.version}" }

View File

@ -395,7 +395,7 @@
"$(PROJECT_DIR)", "$(PROJECT_DIR)",
); );
MODULEMAP_FILE = deepspeech_ios/deepspeech_ios.modulemap; MODULEMAP_FILE = deepspeech_ios/deepspeech_ios.modulemap;
PRODUCT_BUNDLE_IDENTIFIER = "org.mozilla.deepspeech-ios"; PRODUCT_BUNDLE_IDENTIFIER = "org.deepspeech.deepspeech-ios";
OTHER_LDFLAGS = "-lstdc++"; OTHER_LDFLAGS = "-lstdc++";
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
SKIP_INSTALL = YES; SKIP_INSTALL = YES;
@ -434,7 +434,7 @@
"$(PROJECT_DIR)", "$(PROJECT_DIR)",
); );
MODULEMAP_FILE = deepspeech_ios/deepspeech_ios.modulemap; MODULEMAP_FILE = deepspeech_ios/deepspeech_ios.modulemap;
PRODUCT_BUNDLE_IDENTIFIER = "org.mozilla.deepspeech-ios"; PRODUCT_BUNDLE_IDENTIFIER = "org.deepspeech.deepspeech-ios";
OTHER_LDFLAGS = "-lstdc++"; OTHER_LDFLAGS = "-lstdc++";
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
SKIP_INSTALL = YES; SKIP_INSTALL = YES;
@ -454,7 +454,7 @@
"@executable_path/Frameworks", "@executable_path/Frameworks",
"@loader_path/Frameworks", "@loader_path/Frameworks",
); );
PRODUCT_BUNDLE_IDENTIFIER = "org.mozilla.deepspeech-iosTests"; PRODUCT_BUNDLE_IDENTIFIER = "org.deepspeech.deepspeech-iosTests";
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 5.0; SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2"; TARGETED_DEVICE_FAMILY = "1,2";
@ -472,7 +472,7 @@
"@executable_path/Frameworks", "@executable_path/Frameworks",
"@loader_path/Frameworks", "@loader_path/Frameworks",
); );
PRODUCT_BUNDLE_IDENTIFIER = "org.mozilla.deepspeech-iosTests"; PRODUCT_BUNDLE_IDENTIFIER = "org.deepspeech.deepspeech-iosTests";
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 5.0; SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2"; TARGETED_DEVICE_FAMILY = "1,2";

View File

@ -486,7 +486,7 @@
"$(inherited)", "$(inherited)",
"$(PROJECT_DIR)", "$(PROJECT_DIR)",
); );
PRODUCT_BUNDLE_IDENTIFIER = "org.mozilla.deepspeech-ios-test"; PRODUCT_BUNDLE_IDENTIFIER = "org.deepspeech.deepspeech-ios-test";
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 5.0; SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2"; TARGETED_DEVICE_FAMILY = "1,2";
@ -511,7 +511,7 @@
"$(inherited)", "$(inherited)",
"$(PROJECT_DIR)", "$(PROJECT_DIR)",
); );
PRODUCT_BUNDLE_IDENTIFIER = "org.mozilla.deepspeech-ios-test"; PRODUCT_BUNDLE_IDENTIFIER = "org.deepspeech.deepspeech-ios-test";
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 5.0; SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2"; TARGETED_DEVICE_FAMILY = "1,2";
@ -531,7 +531,7 @@
"@executable_path/Frameworks", "@executable_path/Frameworks",
"@loader_path/Frameworks", "@loader_path/Frameworks",
); );
PRODUCT_BUNDLE_IDENTIFIER = "org.mozilla.deepspeech-ios-testTests"; PRODUCT_BUNDLE_IDENTIFIER = "org.deepspeech.deepspeech-ios-testTests";
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 5.0; SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2"; TARGETED_DEVICE_FAMILY = "1,2";
@ -552,7 +552,7 @@
"@executable_path/Frameworks", "@executable_path/Frameworks",
"@loader_path/Frameworks", "@loader_path/Frameworks",
); );
PRODUCT_BUNDLE_IDENTIFIER = "org.mozilla.deepspeech-ios-testTests"; PRODUCT_BUNDLE_IDENTIFIER = "org.deepspeech.deepspeech-ios-testTests";
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 5.0; SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2"; TARGETED_DEVICE_FAMILY = "1,2";
@ -571,7 +571,7 @@
"@executable_path/Frameworks", "@executable_path/Frameworks",
"@loader_path/Frameworks", "@loader_path/Frameworks",
); );
PRODUCT_BUNDLE_IDENTIFIER = "org.mozilla.deepspeech-ios-testUITests"; PRODUCT_BUNDLE_IDENTIFIER = "org.deepspeech.deepspeech-ios-testUITests";
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 5.0; SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2"; TARGETED_DEVICE_FAMILY = "1,2";
@ -590,7 +590,7 @@
"@executable_path/Frameworks", "@executable_path/Frameworks",
"@loader_path/Frameworks", "@loader_path/Frameworks",
); );
PRODUCT_BUNDLE_IDENTIFIER = "org.mozilla.deepspeech-ios-testUITests"; PRODUCT_BUNDLE_IDENTIFIER = "org.deepspeech.deepspeech-ios-testUITests";
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 5.0; SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2"; TARGETED_DEVICE_FAMILY = "1,2";

View File

@ -98,9 +98,9 @@ def main():
setup( setup(
name='deepspeech_training', name='deepspeech_training',
version=version, version=version,
description='Training code for mozilla DeepSpeech', description='Training code for DeepSpeech',
url='https://github.com/mozilla/DeepSpeech', url='https://github.com/mozilla/DeepSpeech',
author='Mozilla', author='DeepSpeech authors',
license='MPL-2.0', license='MPL-2.0',
# Classifiers help users find your project by categorizing it. # Classifiers help users find your project by categorizing it.
# #