A heavy change, step 1

suquark · Mar 4, 2017 · cdc219b · cdc219b
1 parent 6f90052
commit cdc219b
Show file tree

Hide file tree

Showing 38 changed files with 45 additions and 39 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,3 +2,5 @@ test/
 tags
 
 .vscode/launch.json
+
+dataset/mnist.raw
diff --git a/Readme.md b/Readme.md
@@ -1,21 +1,27 @@
-# Modern ConvNetJS
+# InspireNN
 
-It is a project trying to reimplement [ConvNetJS](https://github.com/karpathy/convnetjs) with modern styles (ECMAScript6, functional programming), making it's code shorter, more readable for beginners and easier to extend.
+This project makes neural networks running on browsers. It can be useful in blogging & presentation.
+
+
+It reimplements [ConvNetJS](https://github.com/karpathy/convnetjs) with modern styles (ECMAScript6, functional programming), making it's code shorter, more readable for beginners and easier to extend.
 
 It's sure that we should never expect a neural network training in the browser doing a big deal, but it's useful for presentation and understanding.
 
 It is still under developing. 
 
-Following is a short introduction to ConvNetJS itself:
 
-ConvNetJS is a Javascript implementation of Neural networks, together with nice browser-based demos. It currently supports:
+## Dependency
+
+* transpiler
+
+  `systemjs` + `traceur` is used to load ES6 modules and provide ES6 polyfill for older browsers.
+
+* style
+
+  `jquery`, `materializecss`, `d3js` and `three.js` is included in the project for supporting visualization tasks. Though making use of CDNs may be a better idea, but I prefer to keep them local for offline situations.
+
 
-- Common **Neural Network modules** (fully connected layers, non-linearities)
-- Classification (SVM/Softmax) and Regression (L2) **cost functions**
-- Ability to specify and train **Convolutional Networks** that process images
-- An experimental **Reinforcement Learning** module, based on Deep Q Learning
 
-For much more information, see the main page at [convnetjs.com](http://convnetjs.com)
 
 ## License
 MIT
diff --git a/backend/image.js b/backend/image.js
@@ -1,7 +1,7 @@
 import { Tensor } from 'backend/tensor.js';
 import { assert } from 'util/assert.js';
-import { clip_pixel, scale_shift } from 'backend/ops.js';
-
+import { clip_pixel } from 'backend/ops.js';
+import { prod } from 'util/array.js';
 /**
  * This class provides a more uniform and general way to store and save images with same shape
  */
@@ -21,7 +21,7 @@ class ImageBuffer {
         for (let i of tsArray) {
             let x = i.clone();
             clip_pixel(x);
-            let ba = new Uint8ClampedArray(size); 
+            let ba = new Uint8ClampedArray(size);
             for (let j = 0; j < size; j++) {
                 ba[j] = x.w[j];
             }
@@ -30,15 +30,14 @@ class ImageBuffer {
         return ib;
     }
 
-    get tensors() {
-        return this.images.map(b => {
-            let t = new Tensor(this.shape);
-            let N = t.size;
-            for (let i = 0; i < N; i++) {
-                t.w[i] = (b[i] / 255.0) * 2.0 - 1.0;
-            }
-            return t;
-        });
+    get tensor() {
+        let image = this.images;
+        let t = new Tensor(this.shape);
+        let N = t.size;
+        for (let i = 0; i < N; i++) {
+            t.w[i] = (image[i] / 255.0) * 2.0 - 1.0;
+        }
+        return t;
     }
 
     /**
@@ -50,20 +49,17 @@ class ImageBuffer {
     static load(map, buf) {
         let ib = new ImageBuffer();
         ib.name = map.name;
+        assert(map.shape.length === 4, "Error: images should be tensor with 4 dims")
         ib.shape = map.shape;
-        ib.images = [];
-
-        let size = ib.shape[0] * ib.shape[1] * ib.shape[2];  // FIXME: may a more general way?
+        let size = prod(ib.shape);
         // OK, load values from buffer
-        for (let i = 0; i < map.count; i++) {
-            ib.images.push(buf.read(size, 'Uint8ClampedArray'));
-        }
+        ib.images = buf.read(size, 'Uint8ClampedArray');
         return ib;
     }
 
     __save__(buf) {
         for (let i of this.images) buf.write(i);
-        return {name: this.name, shape: this.shape, count: this.images.length, type: 'images'};
+        return { name: this.name, shape: this.shape, count: this.images.length, type: 'images' };
     }
 }
 

diff --git a/dataset/mnist.json b/dataset/mnist.json
@@ -0,0 +1 @@
+[{"name":"mnist/","nodes":[{"name":"x","shape":[70000,28,28,1],"type":"images"},{"type":"Uint8Array","name":"y","length":70000}]}]
diff --git a/visualize/prism/prism.css → demo/js/prism/prism.css b/visualize/prism/prism.css → demo/js/prism/prism.css
diff --git a/visualize/prism/prism.js → demo/js/prism/prism.js b/visualize/prism/prism.js → demo/js/prism/prism.js
diff --git a/demo/regression/doc.html b/demo/regression/doc.html
@@ -5,13 +5,14 @@
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
     <title>Regression Demo</title>
-    <script src="../../visualize/jquery.min.js"></script>
+    <script src="../../visualize/js/jquery.min.js"></script>
 
-    <link rel="stylesheet" href="../../visualize/materialize/css/materialize.min.css" />
-    <link rel="stylesheet" href="../../visualize/materialize/css/material_icons.css" />
-    <script src="../../visualize/materialize/js/materialize.min.js"></script>
-    <link rel="stylesheet" href="../../visualize/prism/prism.css" />
-    <script src="../../visualize/prism/prism.js"></script>
+    <link rel="stylesheet" href="../../visualize/js/materialize/css/materialize.min.css" />
+    <link rel="stylesheet" href="../../visualize/js/materialize/css/material_icons.css" />
+    <script src="../../visualize/js/materialize/js/materialize.min.js"></script>
+
+    <link rel="stylesheet" href="../js/prism/prism.css" />
+    <script src="../js/prism/prism.js"></script>
     <style>
         section {
             margin-top: 40px;

diff --git a/demo/regression/index.html b/demo/regression/index.html
@@ -9,16 +9,16 @@
     <script src="../../transpiler/system.js"></script>
     <script src="../sysconf.js"></script>
 
-    <script src="../../visualize/jquery.min.js"></script>
+    <script src="../../visualize/foreign/jquery.min.js"></script>
 
     <link rel="stylesheet" href="../../visualize/materialize/css/materialize.min.css" />
     <link rel="stylesheet" href="../../visualize/materialize/css/material_icons.css" />
-    <script src="../../visualize/materialize/js/materialize.min.js"></script>
+    <script src="../../visualize/foreign/materialize/js/materialize.min.js"></script>
 
     <script src="../../visualize/preload-mask.js"></script>
 
-    <script src="../../visualize/d3.min.js"></script>
-    <script src="../../visualize/d3-interpolate-path.js"></script>
+    <script src="../../visualize/foreign/d3.min.js"></script>
+    <script src="../../visualize/foreign/d3-interpolate-path.js"></script>
 
     <style>
         path {

diff --git a/util/array.js b/util/array.js
@@ -206,7 +206,7 @@ function sum(arr) {
 
 // create array
 export { zeros, zeros2d, array2d, one_hot };
-export { prod };
+export { prod, sum };
 // property of array
 export { maxmin, indexOfMax, arrUnique, arrContains };
 // geometry

diff --git a/visualize/TrackballControls.js → visualize/foreign/TrackballControls.js b/visualize/TrackballControls.js → visualize/foreign/TrackballControls.js
diff --git a/visualize/d3-interpolate-path.js → visualize/foreign/d3-interpolate-path.js b/visualize/d3-interpolate-path.js → visualize/foreign/d3-interpolate-path.js
diff --git a/visualize/d3.min.js → visualize/foreign/d3.min.js b/visualize/d3.min.js → visualize/foreign/d3.min.js
diff --git a/visualize/jquery.min.js → visualize/foreign/jquery.min.js b/visualize/jquery.min.js → visualize/foreign/jquery.min.js
diff --git a/visualize/materialize/css/material_icons.css → ...oreign/materialize/css/material_icons.css b/visualize/materialize/css/material_icons.css → ...oreign/materialize/css/material_icons.css
diff --git a/...alize/materialize/css/materialize.min.css → ...reign/materialize/css/materialize.min.css b/...alize/materialize/css/materialize.min.css → ...reign/materialize/css/materialize.min.css
diff --git a/...rialize/fonts/MaterialIcons-Regular.woff2 → ...rialize/fonts/MaterialIcons-Regular.woff2 b/...rialize/fonts/MaterialIcons-Regular.woff2 → ...rialize/fonts/MaterialIcons-Regular.woff2
diff --git a/.../materialize/fonts/roboto/Roboto-Bold.eot → .../materialize/fonts/roboto/Roboto-Bold.eot b/.../materialize/fonts/roboto/Roboto-Bold.eot → .../materialize/fonts/roboto/Roboto-Bold.eot
diff --git a/.../materialize/fonts/roboto/Roboto-Bold.ttf → .../materialize/fonts/roboto/Roboto-Bold.ttf b/.../materialize/fonts/roboto/Roboto-Bold.ttf → .../materialize/fonts/roboto/Roboto-Bold.ttf
diff --git a/...materialize/fonts/roboto/Roboto-Bold.woff → ...materialize/fonts/roboto/Roboto-Bold.woff b/...materialize/fonts/roboto/Roboto-Bold.woff → ...materialize/fonts/roboto/Roboto-Bold.woff
diff --git a/...aterialize/fonts/roboto/Roboto-Bold.woff2 → ...aterialize/fonts/roboto/Roboto-Bold.woff2 b/...aterialize/fonts/roboto/Roboto-Bold.woff2 → ...aterialize/fonts/roboto/Roboto-Bold.woff2
diff --git a/...materialize/fonts/roboto/Roboto-Light.eot → ...materialize/fonts/roboto/Roboto-Light.eot b/...materialize/fonts/roboto/Roboto-Light.eot → ...materialize/fonts/roboto/Roboto-Light.eot
diff --git a/...materialize/fonts/roboto/Roboto-Light.ttf → ...materialize/fonts/roboto/Roboto-Light.ttf b/...materialize/fonts/roboto/Roboto-Light.ttf → ...materialize/fonts/roboto/Roboto-Light.ttf
diff --git a/...aterialize/fonts/roboto/Roboto-Light.woff → ...aterialize/fonts/roboto/Roboto-Light.woff b/...aterialize/fonts/roboto/Roboto-Light.woff → ...aterialize/fonts/roboto/Roboto-Light.woff
diff --git a/...terialize/fonts/roboto/Roboto-Light.woff2 → ...terialize/fonts/roboto/Roboto-Light.woff2 b/...terialize/fonts/roboto/Roboto-Light.woff2 → ...terialize/fonts/roboto/Roboto-Light.woff2
diff --git a/...aterialize/fonts/roboto/Roboto-Medium.eot → ...aterialize/fonts/roboto/Roboto-Medium.eot b/...aterialize/fonts/roboto/Roboto-Medium.eot → ...aterialize/fonts/roboto/Roboto-Medium.eot
diff --git a/...aterialize/fonts/roboto/Roboto-Medium.ttf → ...aterialize/fonts/roboto/Roboto-Medium.ttf b/...aterialize/fonts/roboto/Roboto-Medium.ttf → ...aterialize/fonts/roboto/Roboto-Medium.ttf
diff --git a/...terialize/fonts/roboto/Roboto-Medium.woff → ...terialize/fonts/roboto/Roboto-Medium.woff b/...terialize/fonts/roboto/Roboto-Medium.woff → ...terialize/fonts/roboto/Roboto-Medium.woff
diff --git a/...erialize/fonts/roboto/Roboto-Medium.woff2 → ...erialize/fonts/roboto/Roboto-Medium.woff2 b/...erialize/fonts/roboto/Roboto-Medium.woff2 → ...erialize/fonts/roboto/Roboto-Medium.woff2
diff --git a/...terialize/fonts/roboto/Roboto-Regular.eot → ...terialize/fonts/roboto/Roboto-Regular.eot b/...terialize/fonts/roboto/Roboto-Regular.eot → ...terialize/fonts/roboto/Roboto-Regular.eot
diff --git a/...terialize/fonts/roboto/Roboto-Regular.ttf → ...terialize/fonts/roboto/Roboto-Regular.ttf b/...terialize/fonts/roboto/Roboto-Regular.ttf → ...terialize/fonts/roboto/Roboto-Regular.ttf
diff --git a/...erialize/fonts/roboto/Roboto-Regular.woff → ...erialize/fonts/roboto/Roboto-Regular.woff b/...erialize/fonts/roboto/Roboto-Regular.woff → ...erialize/fonts/roboto/Roboto-Regular.woff
diff --git a/...rialize/fonts/roboto/Roboto-Regular.woff2 → ...rialize/fonts/roboto/Roboto-Regular.woff2 b/...rialize/fonts/roboto/Roboto-Regular.woff2 → ...rialize/fonts/roboto/Roboto-Regular.woff2
diff --git a/.../materialize/fonts/roboto/Roboto-Thin.eot → .../materialize/fonts/roboto/Roboto-Thin.eot b/.../materialize/fonts/roboto/Roboto-Thin.eot → .../materialize/fonts/roboto/Roboto-Thin.eot
diff --git a/.../materialize/fonts/roboto/Roboto-Thin.ttf → .../materialize/fonts/roboto/Roboto-Thin.ttf b/.../materialize/fonts/roboto/Roboto-Thin.ttf → .../materialize/fonts/roboto/Roboto-Thin.ttf
diff --git a/...materialize/fonts/roboto/Roboto-Thin.woff → ...materialize/fonts/roboto/Roboto-Thin.woff b/...materialize/fonts/roboto/Roboto-Thin.woff → ...materialize/fonts/roboto/Roboto-Thin.woff
diff --git a/...aterialize/fonts/roboto/Roboto-Thin.woff2 → ...aterialize/fonts/roboto/Roboto-Thin.woff2 b/...aterialize/fonts/roboto/Roboto-Thin.woff2 → ...aterialize/fonts/roboto/Roboto-Thin.woff2
diff --git a/visualize/materialize/js/materialize.min.js → ...foreign/materialize/js/materialize.min.js b/visualize/materialize/js/materialize.min.js → ...foreign/materialize/js/materialize.min.js
diff --git a/visualize/three.min.js → visualize/foreign/three.min.js b/visualize/three.min.js → visualize/foreign/three.min.js
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2,3 +2,5 @@ test/
		tags

		.vscode/launch.json

		dataset/mnist.raw
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		[{"name":"mnist/","nodes":[{"name":"x","shape":[70000,28,28,1],"type":"images"},{"type":"Uint8Array","name":"y","length":70000}]}]