misc: fix build on Linux (#23)

microsoft · Dec 3, 2018 · e7a9b70 · e7a9b70
1 parent fbc9d57
commit e7a9b70
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git a/src/wasm-ops/conv.cpp b/src/wasm-ops/conv.cpp
@@ -4,8 +4,8 @@
 #include "conv.h"
 #include "common.h"
 #include "gemm.h"
-#include <Eigen\Core>
-#include <Eigen\Dense>
+#include <Eigen/Core>
+#include <Eigen/Dense>
 #include <vector>
 
 // Wasm interop method

diff --git a/src/wasm-ops/gemm.cpp b/src/wasm-ops/gemm.cpp
@@ -3,8 +3,8 @@
 
 #include "gemm.h"
 #include "common.h"
-#include <Eigen\Core>
-#include <Eigen\Dense>
+#include <Eigen/Core>
+#include <Eigen/Dense>
 
 // Wasm interop method
 void gemm_f32(void *data) {

diff --git a/test/test-types.ts b/test/test-types.ts
@@ -3,7 +3,7 @@
 
 import {Attribute} from '../lib/attribute';
 import {Logger} from '../lib/instrument';
-import {Tensor} from '../lib/Tensor';
+import {Tensor} from '../lib/tensor';
 
 export declare namespace Test {
   export interface NamedTensor extends Tensor {

diff --git a/tools/build.ts b/tools/build.ts
@@ -24,6 +24,7 @@ const DEPS = path.join(ROOT, 'deps');
 const DEPS_EIGEN = path.join(DEPS, 'eigen');
 const DEPS_EMSDK = path.join(DEPS, 'emsdk');
 const DEPS_EMSDK_EMSCRIPTEN = path.join(DEPS_EMSDK, 'emscripten');
+const EMSDK_BIN = path.join(DEPS_EMSDK, 'emsdk');
 const SRC = path.join(ROOT, 'src');
 const SRC_WASM_BUILD_CONFIG = path.join(SRC, 'wasm-build-config.json');
 const OUT = path.join(ROOT, 'dist');
@@ -91,7 +92,7 @@ if (!buildWasm) {
   logger.info('Build.Wasm', '(1/4) Setting up emsdk...');
   if (!fs.existsSync(DEPS_EMSDK_EMSCRIPTEN)) {
     logger.info('Build.Wasm', 'Installing emsdk...');
-    const install = spawnSync('emsdk install latest', {shell: true, stdio: 'inherit', cwd: DEPS_EMSDK});
+    const install = spawnSync(`${EMSDK_BIN} install latest`, {shell: true, stdio: 'inherit', cwd: DEPS_EMSDK});
     if (install.status !== 0) {
       if (install.error) {
         console.error(install.error);
@@ -101,7 +102,7 @@ if (!buildWasm) {
     logger.info('Build.Wasm', 'Installing emsdk... DONE');
 
     logger.info('Build.Wasm', 'Activating emsdk...');
-    const activate = spawnSync('emsdk activate latest', {shell: true, stdio: 'inherit', cwd: DEPS_EMSDK});
+    const activate = spawnSync(`${EMSDK_BIN} activate latest`, {shell: true, stdio: 'inherit', cwd: DEPS_EMSDK});
     if (activate.status !== 0) {
       if (activate.error) {
         console.error(activate.error);