Expose versions numbers on stderr

Fixes #1292
2018-03-15 13:53:17 +01:00 · 2018-03-15 13:53:17 +01:00 · 6c4d4f1e68
commit 6c4d4f1e68
parent b6c78264ee
21 changed files with 82 additions and 22 deletions
--- a/native_client/BUILD
+++ b/native_client/BUILD
@ -45,9 +45,16 @@ genrule(
    cmd = "cp $(DS_MODEL_FILE) $@"
 )

+genrule(
+    name = "ds_git_version",
+    outs = ["ds_version.h"],
+    cmd = "$(location :ds_git_version.sh) >$@",
+    tools = [":ds_git_version.sh"]
+)
+
 tf_cc_shared_object(
    name = "libdeepspeech.so",
-    srcs = ["deepspeech.cc", "deepspeech.h", "deepspeech_utils.h", "alphabet.h", "beam_search.h", "trie_node.h"] +
+    srcs = ["deepspeech.cc", "deepspeech.h", "deepspeech_utils.h", "alphabet.h", "beam_search.h", "trie_node.h", "ds_version.h"] +
           if_native_model(["deepspeech_model_core.h"]) +
           glob(["kenlm/lm/*.cc", "kenlm/util/*.cc", "kenlm/util/double-conversion/*.cc",
                 "kenlm/lm/*.hh", "kenlm/util/*.hh", "kenlm/util/double-conversion/*.h"],
--- a/native_client/client.cc
+++ b/native_client/client.cc
@ -228,6 +228,7 @@ main(int argc, char **argv)
    printf("  AUDIO_PATH\tPath to the audio file (or directory of files) to run"
           " (any file format supported by libsox). \n");
    printf("  -t\t\tRun in benchmark mode, output mfcc & inference time\n");
+    print_versions();
    return 1;
  }

--- a/native_client/deepspeech.cc
+++ b/native_client/deepspeech.cc
@ -14,6 +14,9 @@
 #include "alphabet.h"
 #include "beam_search.h"

+#include "tensorflow/core/public/version.h"
+#include "native_client/ds_version.h"
+
 #include "tensorflow/core/public/session.h"
 #include "tensorflow/core/platform/env.h"
 #include "tensorflow/core/util/memmapped_file_system.h"
@ -53,6 +56,8 @@ Model::Model(const char* aModelPath, int aNCep, int aNContext,
  mPriv->beam_width = aBeamWidth;
  mPriv->run_aot    = false;

+  print_versions();
+
  if (!aModelPath || strlen(aModelPath) < 1) {
    std::cerr << "No model specified, will rely on built-in model." << std::endl;
    mPriv->run_aot = true;
@ -352,4 +357,11 @@ Model::stt(const short* aBuffer, unsigned int aBufferSize, int aSampleRate)
  return string;
 }

+DEEPSPEECH_EXPORT
+void
+print_versions() {
+  std::cerr << "TensorFlow: " << tf_git_version() << std::endl;
+  std::cerr << "DeepSpeech: " << ds_git_version() << std::endl;
+}
+
 }
--- a/native_client/deepspeech.h
+++ b/native_client/deepspeech.h
@ -10,6 +10,8 @@ namespace DeepSpeech

  class Private;

+  void print_versions();
+
  class Model {
    private:
      Private* mPriv;
--- a/native_client/ds_git_version.sh
+++ b/native_client/ds_git_version.sh
@ -0,0 +1,18 @@
+#!/bin/sh
+
+GIT_DIR="$(realpath "$(dirname "$(realpath "$0")")/../.git/")"
+if [ ! -d "${GIT_DIR}" ]; then
+   return 1
+fi;
+
+GIT_VERSION=$(git --git-dir="${GIT_DIR}" describe --long --tags)
+if [ $? -ne 0 ]; then
+   GIT_VERSION=unknown;
+fi
+
+cat <<EOF
+#include <string>
+const char* ds_git_version() {
+  return "${GIT_VERSION}";
+}
+EOF
--- a/taskcluster/darwin-amd64-cpu-aot_prod-opt.yml
+++ b/taskcluster/darwin-amd64-cpu-aot_prod-opt.yml
@ -4,8 +4,8 @@ build:
    - "index.project.deepspeech.deepspeech.native_client.${event.head.branch}.osx_aot"
    - "index.project.deepspeech.deepspeech.native_client.${event.head.branch}.${event.head.sha}.osx_aot"
    - "index.project.deepspeech.deepspeech.native_client.osx_aot.${event.head.sha}"
-  tensorflow: "https://index.taskcluster.net/v1/task/project.deepspeech.tensorflow.pip.r1.6.1bd035dd4853a1f95396cb087343a952b6b61272.osx/artifacts/public/home.tar.xz"
-  summarize_graph: "https://index.taskcluster.net/v1/task/project.deepspeech.tensorflow.pip.r1.6.1bd035dd4853a1f95396cb087343a952b6b61272.osx/artifacts/public/summarize_graph"
+  tensorflow: "https://index.taskcluster.net/v1/task/project.deepspeech.tensorflow.pip.r1.6.236f83eb5d4d73a33938154f4b1e631355f6a1f0.osx/artifacts/public/home.tar.xz"
+  summarize_graph: "https://index.taskcluster.net/v1/task/project.deepspeech.tensorflow.pip.r1.6.236f83eb5d4d73a33938154f4b1e631355f6a1f0.osx/artifacts/public/summarize_graph"
  scripts:
    build: "taskcluster/host-build.sh --aot"
    package: "taskcluster/package.sh"
--- a/taskcluster/darwin-amd64-cpu-opt.yml
+++ b/taskcluster/darwin-amd64-cpu-opt.yml
@ -6,8 +6,8 @@ build:
    - "index.project.deepspeech.deepspeech.native_client.osx.${event.head.sha}"
    - "notify.irc-channel.${notifications.irc}.on-exception"
    - "notify.irc-channel.${notifications.irc}.on-failed"
-  tensorflow: "https://index.taskcluster.net/v1/task/project.deepspeech.tensorflow.pip.r1.6.1bd035dd4853a1f95396cb087343a952b6b61272.osx/artifacts/public/home.tar.xz"
-  summarize_graph: "https://index.taskcluster.net/v1/task/project.deepspeech.tensorflow.pip.r1.6.1bd035dd4853a1f95396cb087343a952b6b61272.osx/artifacts/public/summarize_graph"
+  tensorflow: "https://index.taskcluster.net/v1/task/project.deepspeech.tensorflow.pip.r1.6.236f83eb5d4d73a33938154f4b1e631355f6a1f0.osx/artifacts/public/home.tar.xz"
+  summarize_graph: "https://index.taskcluster.net/v1/task/project.deepspeech.tensorflow.pip.r1.6.236f83eb5d4d73a33938154f4b1e631355f6a1f0.osx/artifacts/public/summarize_graph"
  scripts:
    build: "taskcluster/host-build.sh"
    package: "taskcluster/package.sh"
--- a/taskcluster/linux-amd64-cpu-aot_prod-opt.yml
+++ b/taskcluster/linux-amd64-cpu-aot_prod-opt.yml
@ -4,8 +4,8 @@ build:
    - "index.project.deepspeech.deepspeech.native_client.${event.head.branch}.cpu_aot"
    - "index.project.deepspeech.deepspeech.native_client.${event.head.branch}.${event.head.sha}.cpu_aot"
    - "index.project.deepspeech.deepspeech.native_client.cpu_aot.${event.head.sha}"
-  tensorflow: "https://index.taskcluster.net/v1/task/project.deepspeech.tensorflow.pip.r1.6.1bd035dd4853a1f95396cb087343a952b6b61272.cpu/artifacts/public/home.tar.xz"
-  summarize_graph: "https://index.taskcluster.net/v1/task/project.deepspeech.tensorflow.pip.r1.6.1bd035dd4853a1f95396cb087343a952b6b61272.cpu/artifacts/public/summarize_graph"
+  tensorflow: "https://index.taskcluster.net/v1/task/project.deepspeech.tensorflow.pip.r1.6.236f83eb5d4d73a33938154f4b1e631355f6a1f0.cpu/artifacts/public/home.tar.xz"
+  summarize_graph: "https://index.taskcluster.net/v1/task/project.deepspeech.tensorflow.pip.r1.6.236f83eb5d4d73a33938154f4b1e631355f6a1f0.cpu/artifacts/public/summarize_graph"
  system_setup:
    >
      ${nodejs.packages.prep_6} && apt-get -qq update && apt-get -qq -y install nodejs python-yaml &&
--- a/taskcluster/linux-amd64-cpu-aot_test-opt.yml
+++ b/taskcluster/linux-amd64-cpu-aot_test-opt.yml
@ -6,8 +6,8 @@ build:
  template_file: linux-opt-base.tyml
  dependencies:
    - "test-training_upstream-linux-amd64-py27mu-opt"
-  tensorflow: "https://index.taskcluster.net/v1/task/project.deepspeech.tensorflow.pip.r1.6.1bd035dd4853a1f95396cb087343a952b6b61272.cpu/artifacts/public/home.tar.xz"
-  summarize_graph: "https://index.taskcluster.net/v1/task/project.deepspeech.tensorflow.pip.r1.6.1bd035dd4853a1f95396cb087343a952b6b61272.cpu/artifacts/public/summarize_graph"
+  tensorflow: "https://index.taskcluster.net/v1/task/project.deepspeech.tensorflow.pip.r1.6.236f83eb5d4d73a33938154f4b1e631355f6a1f0.cpu/artifacts/public/home.tar.xz"
+  summarize_graph: "https://index.taskcluster.net/v1/task/project.deepspeech.tensorflow.pip.r1.6.236f83eb5d4d73a33938154f4b1e631355f6a1f0.cpu/artifacts/public/summarize_graph"
  system_setup:
    >
      ${nodejs.packages.prep_6} && apt-get -qq update && apt-get -qq -y install nodejs python-yaml &&
--- a/taskcluster/linux-amd64-cpu-opt.yml
+++ b/taskcluster/linux-amd64-cpu-opt.yml
@ -13,8 +13,8 @@ build:
  system_config:
    >
      ${swig.patch_nodejs.linux}
-  tensorflow: "https://index.taskcluster.net/v1/task/project.deepspeech.tensorflow.pip.r1.6.1bd035dd4853a1f95396cb087343a952b6b61272.cpu/artifacts/public/home.tar.xz"
-  summarize_graph: "https://index.taskcluster.net/v1/task/project.deepspeech.tensorflow.pip.r1.6.1bd035dd4853a1f95396cb087343a952b6b61272.cpu/artifacts/public/summarize_graph"
+  tensorflow: "https://index.taskcluster.net/v1/task/project.deepspeech.tensorflow.pip.r1.6.236f83eb5d4d73a33938154f4b1e631355f6a1f0.cpu/artifacts/public/home.tar.xz"
+  summarize_graph: "https://index.taskcluster.net/v1/task/project.deepspeech.tensorflow.pip.r1.6.236f83eb5d4d73a33938154f4b1e631355f6a1f0.cpu/artifacts/public/summarize_graph"
  scripts:
    build: "taskcluster/host-build.sh"
    package: "taskcluster/package.sh"
--- a/taskcluster/linux-amd64-ctc-opt.yml
+++ b/taskcluster/linux-amd64-ctc-opt.yml
@ -4,8 +4,8 @@ build:
    - "pull_request.synchronize"
    - "pull_request.reopened"
  template_file: linux-opt-base.tyml
-  tensorflow: "https://index.taskcluster.net/v1/task/project.deepspeech.tensorflow.pip.r1.6.1bd035dd4853a1f95396cb087343a952b6b61272.cpu/artifacts/public/home.tar.xz"
-  summarize_graph: "https://index.taskcluster.net/v1/task/project.deepspeech.tensorflow.pip.r1.6.1bd035dd4853a1f95396cb087343a952b6b61272.cpu/artifacts/public/summarize_graph"
+  tensorflow: "https://index.taskcluster.net/v1/task/project.deepspeech.tensorflow.pip.r1.6.236f83eb5d4d73a33938154f4b1e631355f6a1f0.cpu/artifacts/public/home.tar.xz"
+  summarize_graph: "https://index.taskcluster.net/v1/task/project.deepspeech.tensorflow.pip.r1.6.236f83eb5d4d73a33938154f4b1e631355f6a1f0.cpu/artifacts/public/summarize_graph"
  scripts:
    build: 'taskcluster/decoder-build.sh'
    package: 'taskcluster/decoder-package.sh'
--- a/taskcluster/linux-amd64-gpu-opt.yml
+++ b/taskcluster/linux-amd64-gpu-opt.yml
@ -11,8 +11,8 @@ build:
  system_config:
    >
      ${swig.patch_nodejs.linux}
-  tensorflow: "https://index.taskcluster.net/v1/task/project.deepspeech.tensorflow.pip.r1.6.1bd035dd4853a1f95396cb087343a952b6b61272.gpu/artifacts/public/home.tar.xz"
-  summarize_graph: "https://index.taskcluster.net/v1/task/project.deepspeech.tensorflow.pip.r1.6.1bd035dd4853a1f95396cb087343a952b6b61272.gpu/artifacts/public/summarize_graph"
+  tensorflow: "https://index.taskcluster.net/v1/task/project.deepspeech.tensorflow.pip.r1.6.236f83eb5d4d73a33938154f4b1e631355f6a1f0.gpu/artifacts/public/home.tar.xz"
+  summarize_graph: "https://index.taskcluster.net/v1/task/project.deepspeech.tensorflow.pip.r1.6.236f83eb5d4d73a33938154f4b1e631355f6a1f0.gpu/artifacts/public/summarize_graph"
  maxRunTime: 14400
  scripts:
    build: "taskcluster/cuda-build.sh"
--- a/taskcluster/linux-rpi3-cpu-aot_prod-opt.yml
+++ b/taskcluster/linux-rpi3-cpu-aot_prod-opt.yml
@ -4,8 +4,8 @@ build:
    - "index.project.deepspeech.deepspeech.native_client.${event.head.branch}.arm_aot"
    - "index.project.deepspeech.deepspeech.native_client.${event.head.branch}.${event.head.sha}.arm_aot"
    - "index.project.deepspeech.deepspeech.native_client.arm_aot.${event.head.sha}"
-  tensorflow: "https://index.taskcluster.net/v1/task/project.deepspeech.tensorflow.pip.r1.6.1bd035dd4853a1f95396cb087343a952b6b61272.arm/artifacts/public/home.tar.xz"
-  summarize_graph: "https://index.taskcluster.net/v1/task/project.deepspeech.tensorflow.pip.r1.6.1bd035dd4853a1f95396cb087343a952b6b61272.cpu/artifacts/public/summarize_graph"
+  tensorflow: "https://index.taskcluster.net/v1/task/project.deepspeech.tensorflow.pip.r1.6.236f83eb5d4d73a33938154f4b1e631355f6a1f0.arm/artifacts/public/home.tar.xz"
+  summarize_graph: "https://index.taskcluster.net/v1/task/project.deepspeech.tensorflow.pip.r1.6.236f83eb5d4d73a33938154f4b1e631355f6a1f0.cpu/artifacts/public/summarize_graph"
  ## multistrap 2.2.0-ubuntu1 is broken in 14.04: https://bugs.launchpad.net/ubuntu/+source/multistrap/+bug/1313787
  system_setup:
    >
--- a/taskcluster/linux-rpi3-cpu-opt.yml
+++ b/taskcluster/linux-rpi3-cpu-opt.yml
@ -4,8 +4,8 @@ build:
    - "index.project.deepspeech.deepspeech.native_client.${event.head.branch}.arm"
    - "index.project.deepspeech.deepspeech.native_client.${event.head.branch}.${event.head.sha}.arm"
    - "index.project.deepspeech.deepspeech.native_client.arm.${event.head.sha}"
-  tensorflow: "https://index.taskcluster.net/v1/task/project.deepspeech.tensorflow.pip.r1.6.1bd035dd4853a1f95396cb087343a952b6b61272.arm/artifacts/public/home.tar.xz"
-  summarize_graph: "https://index.taskcluster.net/v1/task/project.deepspeech.tensorflow.pip.r1.6.1bd035dd4853a1f95396cb087343a952b6b61272.cpu/artifacts/public/summarize_graph"
+  tensorflow: "https://index.taskcluster.net/v1/task/project.deepspeech.tensorflow.pip.r1.6.236f83eb5d4d73a33938154f4b1e631355f6a1f0.arm/artifacts/public/home.tar.xz"
+  summarize_graph: "https://index.taskcluster.net/v1/task/project.deepspeech.tensorflow.pip.r1.6.236f83eb5d4d73a33938154f4b1e631355f6a1f0.cpu/artifacts/public/summarize_graph"
  ## multistrap 2.2.0-ubuntu1 is broken in 14.04: https://bugs.launchpad.net/ubuntu/+source/multistrap/+bug/1313787
  system_setup:
    >
--- a/taskcluster/node-package.yml
+++ b/taskcluster/node-package.yml
@ -14,8 +14,8 @@ build:
  system_config:
    >
      ${swig.patch_nodejs.linux}
-  tensorflow: "https://index.taskcluster.net/v1/task/project.deepspeech.tensorflow.pip.r1.6.1bd035dd4853a1f95396cb087343a952b6b61272.cpu/artifacts/public/home.tar.xz"
-  summarize_graph: "https://index.taskcluster.net/v1/task/project.deepspeech.tensorflow.pip.r1.6.1bd035dd4853a1f95396cb087343a952b6b61272.cpu/artifacts/public/summarize_graph"
+  tensorflow: "https://index.taskcluster.net/v1/task/project.deepspeech.tensorflow.pip.r1.6.236f83eb5d4d73a33938154f4b1e631355f6a1f0.cpu/artifacts/public/home.tar.xz"
+  summarize_graph: "https://index.taskcluster.net/v1/task/project.deepspeech.tensorflow.pip.r1.6.236f83eb5d4d73a33938154f4b1e631355f6a1f0.cpu/artifacts/public/summarize_graph"
  scripts:
    build: "taskcluster/node-build.sh"
    package: "taskcluster/node-package.sh"
--- a/taskcluster/test-darwin-opt-base.tyml
+++ b/taskcluster/test-darwin-opt-base.tyml
@ -39,6 +39,7 @@ then:
        DEEPSPEECH_TEST_MODEL: https://queue.taskcluster.net/v1/task/${training}/artifacts/public/output_graph.pb
        DEEPSPEECH_PROD_MODEL: https://s3-us-west-2.amazonaws.com/deepspeech/mmap/output_graph.pb
        DEEPSPEECH_PROD_MODEL_MMAP: https://s3-us-west-2.amazonaws.com/deepspeech/mmap/output_graph.pbmm
+        EXPECTED_TENSORFLOW_VERSION: "TensorFlow: v1.6.0-9-g236f83e"

    command:
      - - "/bin/bash"
--- a/taskcluster/test-linux-opt-base.tyml
+++ b/taskcluster/test-linux-opt-base.tyml
@ -47,6 +47,7 @@ then:
        DEEPSPEECH_PROD_MODEL: https://s3.amazonaws.com/deep-speech/mmap/output_graph.pb
        DEEPSPEECH_PROD_MODEL_MMAP: https://s3.amazonaws.com/deep-speech/mmap/output_graph.pbmm
        PIP_DEFAULT_TIMEOUT: 60
+        EXPECTED_TENSORFLOW_VERSION: "TensorFlow: v1.6.0-9-g236f83e"

    command:
      - "/bin/bash"
--- a/taskcluster/test-training_upstream-linux-amd64-py27mu-opt.yml
+++ b/taskcluster/test-training_upstream-linux-amd64-py27mu-opt.yml
@ -7,7 +7,7 @@ build:
      apt-get -qq -y install ${python.packages.apt}
  args:
    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/tc-train-tests.sh 2.7.14:mu upstream"
-  convert_graphdef: "https://index.taskcluster.net/v1/task/project.deepspeech.tensorflow.pip.r1.6.1bd035dd4853a1f95396cb087343a952b6b61272.cpu/artifacts/public/convert_graphdef_memmapped_format"
+  convert_graphdef: "https://index.taskcluster.net/v1/task/project.deepspeech.tensorflow.pip.r1.6.236f83eb5d4d73a33938154f4b1e631355f6a1f0.cpu/artifacts/public/convert_graphdef_memmapped_format"
  metadata:
    name: "DeepSpeech Linux AMD64 CPU upstream training Py2.7 mu"
    description: "Training a DeepSpeech LDC93S1 model for Linux/AMD64 using upstream TensorFlow Python 2.7 mu, CPU only, optimized version"
--- a/tc-cpp-ds-tests-prod.sh
+++ b/tc-cpp-ds-tests-prod.sh
@ -14,4 +14,6 @@ download_material "${TASKCLUSTER_TMP_DIR}/ds"

 export PATH=${TASKCLUSTER_TMP_DIR}/ds/:$PATH

+check_tensorflow_version
+
 run_prod_inference_tests
--- a/tc-cpp-ds-tests.sh
+++ b/tc-cpp-ds-tests.sh
@ -10,6 +10,8 @@ download_material "${TASKCLUSTER_TMP_DIR}/ds" "${aot_model}"

 export PATH=${TASKCLUSTER_TMP_DIR}/ds/:$PATH

+check_tensorflow_version
+
 run_all_inference_tests

 run_multi_inference_tests
--- a/tc-tests-utils.sh
+++ b/tc-tests-utils.sh
@ -200,6 +200,20 @@ assert_correct_warning_upsampling()
  assert_shows_something "$1" "is lower than 16kHz. Up-sampling might produce erratic speech recognition"
 }

+assert_tensorflow_version()
+{
+  assert_shows_something "$1" "${EXPECTED_TENSORFLOW_VERSION}"
+}
+
+check_tensorflow_version()
+{
+  set +e
+  ds_help=$(deepspeech 2>&1 1>/dev/null)
+  set -e
+
+  assert_tensorflow_version "${ds_help}"
+}
+
 run_all_inference_tests()
 {
  phrase_pbmodel_nolm=$(deepspeech ${TASKCLUSTER_TMP_DIR}/${model_name} ${TASKCLUSTER_TMP_DIR}/alphabet.txt ${TASKCLUSTER_TMP_DIR}/LDC93S1.wav)