Merge pull request #1967 from lissyx/npm-win

Npm win

Author: lissyx

native_client/definitions.mk

@@ -135,6 +135,8 @@ define copy_missing_libs
         if [ "$(OS)" = "Darwin" ]; then \
             new_missing="$$( (for f in $$(otool -L $$lib 2>/dev/null | tail -n +2 | awk '{ print $$1 }' | grep -v '$$lib'); do ls -hal $$f; done;) 2>&1 | grep 'No such' | cut -d':' -f2 | xargs basename -a)"; \
             missing_libs="$$missing_libs $$new_missing"; \
+	elif [ "$(OS)" = "${TC_MSYS_VERSION}" ]; then \
+            missing_libs="libdeepspeech.so"; \
         else \
             missing_libs="$$missing_libs $$($(LDD) $$lib | grep 'not found' | awk '{ print $$1 }')"; \
         fi; \

native_client/javascript/index.js

@@ -2,8 +2,22 @@ const binary = require('node-pre-gyp');
 const path = require('path')
 // 'lib', 'binding', 'v0.1.1', ['node', 'v' + process.versions.modules, process.platform, process.arch].join('-'), 'deepspeech-bingings.node')
 const binding_path = binary.find(path.resolve(path.join(__dirname, 'package.json')));
+
+// On Windows, we can't rely on RPATH being set to $ORIGIN/../ or on
+// @loader_path/../ but we can change the PATH to include the proper directory
+// for the dynamic linker
+if (process.platform === 'win32') {
+  const dslib_path = path.resolve(path.join(binding_path, '../..'));
+  var oldPath = process.env.PATH;
+  process.env['PATH'] = `${dslib_path};${process.env.PATH}`;
+}
+
 const binding = require(binding_path);
 
+if (process.platform === 'win32') {
+  process.env['PATH'] = oldPath;
+}
+
 function Model() {
     this._impl = null;
 

taskcluster/.shared.yml

@@ -49,6 +49,16 @@ nodejs:
     prep_9: 'nvm install 9.11.2 && nvm use 9.11.2'
     prep_10: 'nvm install 10.12.0 && nvm use 10.12.0'
     prep_11: 'nvm install 11.0.0 && nvm use 11.0.0'
+  win:
+    sox: 'wget https://sourceforge.net/projects/sox/files/sox/14.4.2/sox-14.4.2-win32.zip/download -O sox-14.4.2-win32.zip && ""C:\Program Files\7-zip\7z.exe"" x -o$TASKCLUSTER_TASK_DIR/bin/ -tzip -aoa sox-14.4.2-win32.zip && rm sox-*zip && export PATH=$TASKCLUSTER_TASK_DIR/bin/sox-14.4.2/:$PATH'
+    prep_4: 'wget https://nodejs.org/dist/v4.9.1/node-v4.9.1-win-x64.zip && ""C:\Program Files\7-zip\7z.exe"" x -o$TASKCLUSTER_TASK_DIR/bin/ -tzip -aoa node-v4.9.1-win-x64.zip && rm node-*.zip && export PATH=$TASKCLUSTER_TASK_DIR/bin/node-v4.9.1-win-x64/:$PATH'
+    prep_5: 'wget https://nodejs.org/dist/v5.12.0/node-v5.12.0-win-x64.zip && ""C:\Program Files\7-zip\7z.exe"" x -o$TASKCLUSTER_TASK_DIR/bin/ -tzip -aoa node-v5.12.0-win-x64.zip && rm node-*.zip && export PATH=$TASKCLUSTER_TASK_DIR/bin/node-v5.12.0-win-x64/:$PATH'
+    prep_6: 'wget https://nodejs.org/dist/v6.14.4/node-v6.14.4-win-x64.zip && ""C:\Program Files\7-zip\7z.exe"" x -o$TASKCLUSTER_TASK_DIR/bin/ -tzip -aoa node-v6.14.4-win-x64.zip && rm node-*.zip && export PATH=$TASKCLUSTER_TASK_DIR/bin/node-v6.14.4-win-x64/:$PATH'
+    prep_7: 'wget https://nodejs.org/dist/v7.10.1/node-v7.10.1-win-x64.zip && ""C:\Program Files\7-zip\7z.exe"" x -o$TASKCLUSTER_TASK_DIR/bin/ -tzip -aoa node-v7.10.1-win-x64.zip && rm node-*.zip && export PATH=$TASKCLUSTER_TASK_DIR/bin/node-v7.10.1-win-x64/:$PATH'
+    prep_8: 'wget https://nodejs.org/dist/v8.12.0/node-v8.12.0-win-x64.zip && ""C:\Program Files\7-zip\7z.exe"" x -o$TASKCLUSTER_TASK_DIR/bin/ -tzip -aoa node-v8.12.0-win-x64.zip && rm node-*.zip && export PATH=$TASKCLUSTER_TASK_DIR/bin/node-v8.12.0-win-x64/:$PATH'
+    prep_9: 'wget https://nodejs.org/dist/v9.11.2/node-v9.11.2-win-x64.zip && ""C:\Program Files\7-zip\7z.exe"" x -o$TASKCLUSTER_TASK_DIR/bin/ -tzip -aoa node-v9.11.2-win-x64.zip && rm node-*.zip && export PATH=$TASKCLUSTER_TASK_DIR/bin/node-v9.11.2-win-x64/:$PATH'
+    prep_10: 'wget https://nodejs.org/dist/v10.12.0/node-v10.12.0-win-x64.zip && ""C:\Program Files\7-zip\7z.exe"" x -o$TASKCLUSTER_TASK_DIR/bin/ -tzip -aoa node-v10.12.0-win-x64.zip && rm node-*.zip && export PATH=$TASKCLUSTER_TASK_DIR/bin/node-v10.12.0-win-x64/:$PATH'
+    prep_11: 'wget https://nodejs.org/dist/v11.0.0/node-v11.0.0-win-x64.zip && ""C:\Program Files\7-zip\7z.exe"" x -o$TASKCLUSTER_TASK_DIR/bin/ -tzip -aoa node-v11.0.0-win-x64.zip && rm node-*.zip && export PATH=$TASKCLUSTER_TASK_DIR/bin/node-v11.0.0-win-x64/:$PATH'
 ## swig -javascript requires swig >= 3.0.7 (14.04 provides 2.0.11)
 ## force 3.0.10 for nodejs V8 API compatibility
 swig:
@@ -81,6 +91,7 @@ system:
   homedir:
     linux: '/home/build-user'
     osx: '/Users/build-user'
+    win: '/c/builds/tc-workdir'
 notifications:
   irc: '#machinelearning'
 aptEc2Mirrors: 'echo "deb http://archive.ubuntu.com/ubuntu/ trusty-updates main" > /etc/apt/sources.list.d/trusty-updates.list && sed -ri -e "s|archive.ubuntu.com|${TASKCLUSTER_WORKER_GROUP}.ec2.archive.ubuntu.com|g" -e "s|security.ubuntu.com|${TASKCLUSTER_WORKER_GROUP}.ec2.archive.ubuntu.com|g" /etc/apt/sources.list && apt-get -qq update && apt-get -qq -y upgrade'

taskcluster/node-build.sh

@@ -2,8 +2,10 @@
 
 set -xe
 
+cuda=$1
+
 source $(dirname "$0")/../tc-tests-utils.sh
 
 source ${DS_ROOT_TASK}/DeepSpeech/tf/tc-vars.sh
 
-do_deepspeech_npm_package
+do_deepspeech_npm_package "${cuda}"

taskcluster/node-package.yml renamed to taskcluster/node-package-cpu.yml

@@ -5,6 +5,7 @@ build:
     - "linux-amd64-cpu-opt"
     - "linux-rpi3-cpu-opt"
     - "linux-arm64-cpu-opt"
+    - "win-amd64-cpu-opt"
   routes:
     - "notify.irc-channel.${notifications.irc}.on-exception"
     - "notify.irc-channel.${notifications.irc}.on-failed"
@@ -21,5 +22,5 @@ build:
     build: "taskcluster/node-build.sh"
     package: "taskcluster/node-package.sh"
   metadata:
-    name: "DeepSpeech NodeJS package"
-    description: "Packaging DeepSpeech for registry"
+    name: "DeepSpeech NodeJS CPU package"
+    description: "Packaging DeepSpeech CPU for registry"

taskcluster/node-package-gpu.yml

@@ -0,0 +1,23 @@
+build:
+  template_file: linux-opt-base.tyml
+  dependencies:
+    - "linux-amd64-gpu-opt"
+    - "win-amd64-gpu-opt"
+  routes:
+    - "notify.irc-channel.${notifications.irc}.on-exception"
+    - "notify.irc-channel.${notifications.irc}.on-failed"
+  system_setup:
+    >
+      ${nodejs.packages_trusty.prep_6} && ${nodejs.packages_trusty.apt_pinning}
+      && apt-get -qq update && apt-get -qq -y install nodejs python-yaml &&
+      apt-get -qq -y install ${python.packages_trusty.apt} && ${swig.packages.install_script}
+  system_config:
+    >
+      ${swig.patch_nodejs.linux}
+  tensorflow: "https://index.taskcluster.net/v1/task/project.deepspeech.tensorflow.pip.r1.13.17f818896d063427d38ba2ec6662902ea4ae79eb.cpu/artifacts/public/home.tar.xz"
+  scripts:
+    build: "taskcluster/node-build.sh --cuda"
+    package: "taskcluster/node-package.sh"
+  metadata:
+    name: "DeepSpeech NodeJS GPU package"
+    description: "Packaging DeepSpeech GPU for registry"

taskcluster/scriptworker-task-github.yml

@@ -7,7 +7,8 @@ build:
     - "linux-amd64-cpu-opt"
     - "linux-amd64-gpu-opt"
     - "linux-rpi3-cpu-opt"
-    - "node-package"
+    - "node-package-gpu"
+    - "node-package-cpu"
     - "android-arm64-cpu-opt"
     - "android-armv7-cpu-opt"
     - "android-java-opt"
@@ -30,9 +31,9 @@ build:
       - "linux-arm64-cpu-opt"
     javascript:
       # GPU package
-      - "linux-amd64-gpu-opt"
+      - "node-package-gpu"
       # CPU package with all archs
-      - "node-package"
+      - "node-package-cpu"
     cpp:
       - "darwin-amd64-cpu-opt"
       - "linux-amd64-cpu-opt"

taskcluster/scriptworker-task-npm.yml

@@ -2,8 +2,8 @@ build:
   template_file: simple-task.tyml
   dependencies:
     # Make sure builds are ready
-    - "linux-amd64-gpu-opt"
-    - "node-package"
+    - "node-package-gpu"
+    - "node-package-cpu"
   allowed:
     - "tag"
   ref_match: "refs/tags/"
@@ -18,9 +18,9 @@ build:
     java_aar: []
     javascript:
       # GPU package
-      - "linux-amd64-gpu-opt"
+      - "node-package-gpu"
       # CPU package with all archs
-      - "node-package"
+      - "node-package-cpu"
     nuget: []
   metadata:
     name: "DeepSpeech NPM Packages"

taskcluster/test-armbian-opt-base.tyml

@@ -33,10 +33,10 @@ then:
       $let:
         training: { $eval: as_slugid("test-training_upstream-linux-amd64-py27mu-opt") }
         linux_arm64_build: { $eval: as_slugid("linux-arm64-cpu-opt") }
-        node_package: { $eval: as_slugid("node-package") }
+        node_package_cpu: { $eval: as_slugid("node-package-cpu") }
       in:
         DEEPSPEECH_ARTIFACTS_ROOT: https://queue.taskcluster.net/v1/task/${linux_arm64_build}/artifacts/public
-        DEEPSPEECH_NODEJS: https://queue.taskcluster.net/v1/task/${node_package}/artifacts/public
+        DEEPSPEECH_NODEJS: https://queue.taskcluster.net/v1/task/${node_package_cpu}/artifacts/public
         DEEPSPEECH_TEST_MODEL: https://queue.taskcluster.net/v1/task/${training}/artifacts/public/output_graph.pb
         DEEPSPEECH_PROD_MODEL: https://github.com/reuben/DeepSpeech/releases/download/v0.2.0-prod-ctcdecode/output_graph.pb
         DEEPSPEECH_PROD_MODEL_MMAP: https://github.com/reuben/DeepSpeech/releases/download/v0.2.0-prod-ctcdecode/output_graph.pbmm

taskcluster/test-darwin-opt-base.tyml

@@ -34,10 +34,10 @@ then:
       $let:
         training: { $eval: as_slugid("test-training_upstream-linux-amd64-py27mu-opt") }
         darwin_amd64_build: { $eval: as_slugid("darwin-amd64-cpu-opt") }
-        node_package: { $eval: as_slugid("node-package") }
+        node_package_cpu: { $eval: as_slugid("node-package-cpu") }
       in:
         DEEPSPEECH_ARTIFACTS_ROOT: https://queue.taskcluster.net/v1/task/${darwin_amd64_build}/artifacts/public
-        DEEPSPEECH_NODEJS: https://queue.taskcluster.net/v1/task/${node_package}/artifacts/public
+        DEEPSPEECH_NODEJS: https://queue.taskcluster.net/v1/task/${node_package_cpu}/artifacts/public
         DEEPSPEECH_TEST_MODEL: https://queue.taskcluster.net/v1/task/${training}/artifacts/public/output_graph.pb
         DEEPSPEECH_PROD_MODEL: https://github.com/reuben/DeepSpeech/releases/download/v0.2.0-prod-ctcdecode/output_graph.pb
         DEEPSPEECH_PROD_MODEL_MMAP: https://github.com/reuben/DeepSpeech/releases/download/v0.2.0-prod-ctcdecode/output_graph.pbmm