@tensorflow/tfjs-node - npm Package Compare versions

Comparing version 0.3.0 to 0.3.1

dist/version.d.ts

 /** @license See the LICENSE file. */
-declare const version = "0.3.0";
+declare const version = "0.3.1";
 export { version };

dist/version.js

@@ -5,3 +5,3 @@ "use strict";
 // This code is auto-generated, do not modify this file!
-var version = '0.3.0';
+var version = '0.3.1';
 exports.version = version;

package.json

 {
   "name": "@tensorflow/tfjs-node",
-  "version": "0.3.0",
+  "version": "0.3.1",
   "main": "dist/index.js",
@@ -45,3 +45,3 @@ "types": "dist/index.d.ts",
   "dependencies": {
-    "@tensorflow/tfjs": "~0.15.1",
+    "@tensorflow/tfjs": "~0.15.3",
     "adm-zip": "^0.4.11",
@@ -48,0 +48,0 @@ "bindings": "~1.3.0",

scripts/deps-constants.js

@@ -31,2 +31,3 @@ /**
 module.exports = {
+  depsLibPath,
   depsLibTensorFlowFrameworkPath,
@@ -33,0 +34,0 @@ depsLibTensorFlowPath,

scripts/install.js

 /**
  * @license
- * Copyright 2018 Google Inc. All Rights Reserved.
+ * Copyright 2019 Google Inc. All Rights Reserved.
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,21 +17,17 @@ * you may not use this file except in compliance with the License.
  */
-const https = require('https');
-const HttpsProxyAgent = require('https-proxy-agent');
-const url = require('url');
 const fs = require('fs');
 let path = require('path');
 const rimraf = require('rimraf');
-const tar = require('tar');
 const util = require('util');
-const zip = require('adm-zip');
 const cp = require('child_process');
 const os = require('os');
-const ProgressBar = require('progress');
-const {depsPath, depsLibTensorFlowPath} = require('./deps-constants.js');
+const {depsPath, depsLibPath, depsLibTensorFlowPath} =
+    require('./deps-constants.js');
+const resources = require('./resources');
 
 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 exec = util.promisify(cp.exec);
 
@@ -46,2 +42,5 @@ const BASE_URI =
 
+const TF_WIN_HEADERS_URI =
+    'https://storage.googleapis.com/tf-builds/tensorflow-headers-1.12.zip';
+
 const platform = os.platform();
@@ -51,5 +50,7 @@ let libType = process.argv[2] === undefined ? 'cpu' : process.argv[2];
 
-let targetUri = BASE_URI;
-
-async function getTargetUri() {
+/**
+ * Returns the libtensorflow hosted path of the current platform.
+ */
+function getPlatformLibtensorflowUri() {
+  let targetUri = BASE_URI;
   if (platform === 'linux') {
@@ -79,2 +80,3 @@ if (os.arch() === 'arm') {
   }
+  return targetUri;
 }
@@ -105,68 +107,51 @@
 async function downloadLibtensorflow(callback) {
-  await getTargetUri();
-  // The deps folder and resources do not exist, download and callback as
-  // needed:
-  console.error('* Downloading libtensorflow');
-
   // Ensure dependencies staged directory is available:
   await ensureDir(depsPath);
 
-  // If HTTPS_PROXY, https_proxy, HTTP_PROXY, or http_proxy is set
-  const proxy = process.env['HTTPS_PROXY'] || process.env['https_proxy'] ||
-      process.env['HTTP_PROXY'] || process.env['http_proxy'] || '';
+  console.warn('* Downloading libtensorflow');
+  resources.downloadAndUnpackResource(
+      getPlatformLibtensorflowUri(), depsPath, async () => {
+        if (platform === 'win32') {
+          // Some windows libtensorflow zip files are missing structure and the
+          // eager headers. Check, restructure, and download resources as
+          // needed.
+          const depsIncludePath = path.join(depsPath, 'include');
+          if (!await exists(depsLibTensorFlowPath)) {
+            // Verify that tensorflow.dll exists
+            const libtensorflowDll = path.join(depsPath, 'tensorflow.dll');
+            if (!await exists(libtensorflowDll)) {
+              throw new Error('Could not find libtensorflow.dll');
+            }
 
-  // Using object destructuring to construct the options object for the
-  // http request.  the '...url.parse(targetUri)' part fills in the host,
-  // path, protocol, etc from the targetUri and then we set the agent to the
-  // default agent which is overridden a few lines down if there is a proxy
-  const options = {...url.parse(targetUri), agent: https.globalAgent};
+            await ensureDir(depsLibPath);
+            await rename(libtensorflowDll, depsLibTensorFlowPath);
+          }
 
-  if (proxy !== '') {
-    options.agent = new HttpsProxyAgent(proxy);
-  }
+          // Next check the structure for the C-library headers. If they don't
+          // exist, download and unzip them.
+          if (!await exists(depsIncludePath)) {
+            // Remove duplicated assets from the original libtensorflow package.
+            // They will be replaced by the download below:
+            await unlink(path.join(depsPath, 'c_api.h'));
+            await unlink(path.join(depsPath, 'LICENSE'));
 
-  const request = https.get(options, response => {
-    const bar = new ProgressBar('[:bar] :rate/bps :percent :etas', {
-      complete: '=',
-      incomplete: ' ',
-      width: 30,
-      total: parseInt(response.headers['content-length'], 10)
-    });
-
-    if (platform === 'win32') {
-      // Windows stores builds in a zip file. Save to disk, extract, and delete
-      // the downloaded archive.
-      const tempFileName = path.join(__dirname, '_libtensorflow.zip');
-      const outputFile = fs.createWriteStream(tempFileName);
-      response
-          .on('data',
-              (chunk) => {
-                bar.tick(chunk.length);
-              })
-          .pipe(outputFile)
-          .on('close', async () => {
-            const zipFile = new zip(tempFileName);
-            zipFile.extractAllTo(depsPath, true /* overwrite */);
-            await unlink(tempFileName);
-
+            // Download the C headers only and unpack:
+            resources.downloadAndUnpackResource(
+                TF_WIN_HEADERS_URI, depsPath, () => {
+                  if (callback !== undefined) {
+                    callback();
+                  }
+                });
+          } else {
             if (callback !== undefined) {
               callback();
             }
-          });
-    } else {
-      // All other platforms use a tarball:
-      response
-          .on('data',
-              (chunk) => {
-                bar.tick(chunk.length);
-              })
-          .pipe(tar.x({C: depsPath, strict: true}))
-          .on('close', () => {
-            if (callback !== undefined) {
-              callback();
-            }
-          });
-    }
-    request.end();
-  });
+          }
+        } else {
+          // No other work is required on other platforms.
+          if (callback !== undefined) {
+            callback();
+          }
+        }
+      });
 }
@@ -173,0 +158,0 @@

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

970110

increased by0.16%

Lines of code

5585

increased by1.18%

Worsened metrics

Number of package files

96

decreased by-3.03%

Number of low supply chain risk alerts

13

increased by8.33%

Dependency changes

• Updated@tensorflow/tfjs@~0.15.3