tensorflow · nkreeger · Jun 26, 2019 · Jun 25, 2019 · Jun 25, 2019 · Jun 25, 2019
diff --git a/binding.gyp b/binding.gyp
@@ -39,24 +39,7 @@
             '-ltensorflow',
             '-ltensorflow_framework',
           ],
-          'library_dirs' : ['<(PRODUCT_DIR)'],
-          'actions': [
-            {
-              'action_name': 'deps-stage',
-              'inputs': [
-                '<(module_root_dir)/scripts/deps-stage.js'
-              ],
-              'outputs': [
-                '<(PRODUCT_DIR)/libtensorflow.so',
-              ],
-              'action': [
-                'node',
-                '<@(_inputs)',
-                '<@(tensorflow-library-action)',
-                '<(PRODUCT_DIR)'
-              ]
-            }
-          ],
+          'library_dirs' : ['<(module_root_dir)/deps/lib'],
         }
       ],
       [
@@ -93,7 +76,7 @@
         'OS=="win"', {
           'defines': ['COMPILER_MSVC'],
           'libraries': ['tensorflow'],
-          'library_dirs' : ['<(INTERMEDIATE_DIR)'],
+          'library_dirs' : ['<(module_root_dir)/deps/lib'],
           'variables': {
             'tensorflow-library-target': 'windows'
           },
@@ -119,36 +102,6 @@
                 '<(PRODUCT_DIR)'
               ]
             },
-            {
-              'action_name': 'generate_def',
-              'inputs': [
-                '<(module_root_dir)/scripts/generate_defs.js',
-                '<@(tensorflow_headers)',
-                "<(PRODUCT_DIR)/tensorflow.dll"
-              ],
-              'outputs': [
-                '<(INTERMEDIATE_DIR)/tensorflow.def'
-              ],
-              'action': [
-                'cmd',
-                '/c node --max-old-space-size=4096 <@(_inputs) > <@(_outputs)'
-              ]
-            },
-            {
-              'action_name': 'build-tensorflow-lib',
-              'inputs': [
-                '<(INTERMEDIATE_DIR)/tensorflow.def'
-              ],
-              'outputs': [
-                '<(INTERMEDIATE_DIR)/tensorflow.lib'
-              ],
-              'action': [
-                'lib',
-                '/def:<@(_inputs)',
-                '/out:<@(_outputs)',
-                '/machine:<@(target_arch)'
-              ]
-            },
           ],
         },
       ]

diff --git a/integration/typescript/package.json b/integration/typescript/package.json
@@ -4,7 +4,7 @@
   "description": "",
   "main": "index.js",
   "scripts": {
-    "prep": "cd node_modules/@tensorflow/tfjs-node && node scripts/install.js",
+    "prep": "cd node_modules/@tensorflow/tfjs-node && yarn clean-deps && node scripts/install.js",
     "test": "ts-node src/test.ts && tsc && node dist/test.js"
   },
   "dependencies": {

diff --git a/scripts/deps-constants.js b/scripts/deps-constants.js
@@ -17,31 +17,50 @@
 const os = require('os');
 const path = require('path');
 
-let libName = 'libtensorflow';
-let frameworkLibName = 'libtensorflow_framework';
+// Determine constants for deps folder names and destination (build) path names.
+let depsLibTensorFlowName = 'libtensorflow';
+let depsLibTensorFlowFrameworkName = 'libtensorflow_framework';
+
+let destLibTensorFlowName = depsLibTensorFlowName;
+let destLibTensorFlowFrameworkName = depsLibTensorFlowFrameworkName;
+
 if (os.platform() === 'win32') {
-  libName = 'tensorflow.dll';
-  frameworkLibName = '';  // Not supported on Windows
+  depsLibTensorFlowName = 'tensorflow.dll';
+  depsLibTensorFlowFrameworkName = '';  // Not supported on Windows
+
+  destLibTensorFlowName = depsLibTensorFlowName;
+  destLibTensorFlowFrameworkName = '';  // Not supported on Windows
 } else if (os.platform() === 'darwin') {
-  libName += '.dylib';
-  frameworkLibName += '.dylib';
+  depsLibTensorFlowName += '.dylib';
+  depsLibTensorFlowFrameworkName += '.dylib';
+
+  destLibTensorFlowName = depsLibTensorFlowName;
+  destLibTensorFlowFrameworkName = depsLibTensorFlowFrameworkName;
 } else if (os.platform() === 'linux') {
-  libName += '.so';
-  frameworkLibName += '.so';
+  // Linux has a hard-coded version number, make the destination name simpler:
+  depsLibTensorFlowName += '.so.1.14.0';
+  depsLibTensorFlowFrameworkName += '.so.1.14.0';
+
+  destLibTensorFlowName += '.so';
+  destLibTensorFlowFrameworkName += '.so';
 } else {
   throw Exception('Unsupported platform: ' + os.platform());
 }
 
 const depsPath = path.join(__dirname, '..', 'deps');
 const depsLibPath = path.join(depsPath, 'lib');
-const depsLibTensorFlowPath = path.join(depsLibPath, libName);
-const depsLibTensorFlowFrameworkPath = path.join(depsLibPath, frameworkLibName);
+
+const depsLibTensorFlowPath = path.join(depsLibPath, depsLibTensorFlowName);
+const depsLibTensorFlowFrameworkPath =
+    path.join(depsLibPath, depsLibTensorFlowFrameworkName);
 
 module.exports = {
+  depsPath,
   depsLibPath,
+  depsLibTensorFlowFrameworkName,
   depsLibTensorFlowFrameworkPath,
+  depsLibTensorFlowName,
   depsLibTensorFlowPath,
-  depsPath,
-  frameworkLibName,
-  libName
+  destLibTensorFlowFrameworkName,
+  destLibTensorFlowName
 };
diff --git a/scripts/deps-stage.js b/scripts/deps-stage.js
@@ -25,57 +25,57 @@ const symlink = util.promisify(fs.symlink);
 const {
   depsLibTensorFlowFrameworkPath,
   depsLibTensorFlowPath,
-  frameworkLibName,
-  libName
+  destLibTensorFlowFrameworkName,
+  destLibTensorFlowName
 } = require('./deps-constants.js');
 
 const action = process.argv[2];
 let targetDir = process.argv[3];
 
+// This file is Windows only - the libraries must be placed in the correct
+// directory to work.
+if (os.platform() !== 'win32') {
+  throw new Exception('Dep staging is only supported on Windows');
+}
+
 // Some windows machines contain a trailing " char:
 if (targetDir != undefined && targetDir.endsWith('"')) {
   targetDir = targetDir.substr(0, targetDir.length - 1);
 }
 
-const destFrameworkLibPath = path.join(targetDir, frameworkLibName);
-const destLibPath = path.join(targetDir, libName);
+// Setup dest binary paths:
+const destLibTensorFlowPath = path.join(targetDir, destLibTensorFlowName);
+const destLibTensorFlowFrameworkPath =
+    path.join(targetDir, destLibTensorFlowFrameworkName);
 
 /**
  * Symlinks the extracted libtensorflow library to the destination path. If the
  * symlink fails, a copy is made.
  */
 async function symlinkDepsLib() {
-  if (destLibPath === undefined) {
+  if (destLibTensorFlowPath === undefined) {
     throw new Error('Destination path not supplied!');
   }
   try {
     await symlink(
-      path.relative(path.dirname(destLibPath), depsLibTensorFlowPath),
-      destLibPath);
-    if (os.platform() !== 'win32') {
-      await symlink(
         path.relative(
-          path.dirname(destFrameworkLibPath),
-          depsLibTensorFlowFrameworkPath),
-        destFrameworkLibPath);
-    }
+            path.dirname(destLibTensorFlowPath), depsLibTensorFlowPath),
+        destLibTensorFlowPath);
   } catch (e) {
-    console.error(
-      `  * Symlink of ${destLibPath} failed, creating a copy on disk.`);
-    await copy(depsLibTensorFlowPath, destLibPath);
-    if (os.platform() !== 'win32') {
-      await copy(depsLibTensorFlowFrameworkPath, destFrameworkLibPath);
-    }
+    console.error(`  * Symlink of ${
+        destLibTensorFlowPath} failed, creating a copy on disk.`);
+    await copy(depsLibTensorFlowPath, destLibTensorFlowPath);
   }
 }
 
 /**
  * Moves the deps library path to the destination path.
  */
 async function moveDepsLib() {
-  await rename(depsLibTensorFlowPath, destLibPath);
+  await rename(depsLibTensorFlowPath, destLibTensorFlowPath);
   if (os.platform() !== 'win32') {
-    await rename(depsLibTensorFlowFrameworkPath, destFrameworkLibPath);
+    await rename(
+        depsLibTensorFlowFrameworkPath, destLibTensorFlowFrameworkPath);
   }
 }
 

diff --git a/scripts/generate_defs.js b/scripts/generate_defs.js
diff --git a/scripts/install.js b/scripts/install.js
@@ -28,7 +28,6 @@ const exists = util.promisify(fs.exists);
 const mkdir = util.promisify(fs.mkdir);
 const rename = util.promisify(fs.rename);
 const rimrafPromise = util.promisify(rimraf);
-const unlink = util.promisify(fs.unlink);
 
 const BASE_URI =
     'https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-';