updated to latest

sygops · Mar 1, 2018 · 0e70c77 · 0e70c77
1 parent e79b3d8
commit 0e70c77
Show file tree

Hide file tree

Showing 9 changed files with 98 additions and 91 deletions.
diff --git a/browser.js b/browser.js
@@ -424,10 +424,6 @@ var _gpu = require('gpu.js');
 
 var _gpu2 = _interopRequireDefault(_gpu);
 
-var _thaw = require('thaw.js');
-
-var _thaw2 = _interopRequireDefault(_thaw);
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
@@ -503,9 +499,6 @@ var NeuralNetworkGPU = function (_NeuralNetwork) {
         return null;
       }
     }
-  }, {
-    key: 'train',
-    value: function train() {}
   }, {
     key: 'trainAsync',
     value: function trainAsync(data, options) {
@@ -521,14 +514,16 @@ var NeuralNetworkGPU = function (_NeuralNetwork) {
       endTime = _prepTraining.endTime;
 
 
-      var train = function train() {
-        if (_this2._trainingTick(data, status, endTime)) {
-          options.done();
-        } else {
-          requestAnimationFrame(train);
-        }
-      };
-      train();
+      return new Promise(function (resolve, reject) {
+        var train = function train() {
+          if (_this2._trainingTick(data, status, endTime)) {
+            requestAnimationFrame(train);
+          } else {
+            resolve(status);
+          }
+        };
+        train();
+      });
     }
   }, {
     key: 'buildRunInput',
@@ -560,7 +555,8 @@ var NeuralNetworkGPU = function (_NeuralNetwork) {
           hardcodeConstants: true,
           constants: {
             size: this.sizes[layer - 1]
-          }
+          },
+          floatTextures: true
         });
       }
     }
@@ -617,7 +613,8 @@ var NeuralNetworkGPU = function (_NeuralNetwork) {
             output: [this.sizes[layer]],
             outputToTexture: true,
             outputImmutable: true,
-            hardcodeConstants: true
+            hardcodeConstants: true,
+            floatTextures: true
           });
         } else {
           this.backwardPropagate[layer] = this.gpu.createKernelMap({
@@ -633,7 +630,8 @@ var NeuralNetworkGPU = function (_NeuralNetwork) {
             hardcodeConstants: true,
             constants: {
               size: this.deltas[layer + 1].length
-            }
+            },
+            floatTextures: true
           });
         }
       }
@@ -673,7 +671,8 @@ var NeuralNetworkGPU = function (_NeuralNetwork) {
             size: this.outputs[layer - 1].length,
             learningRate: this.trainOpts.learningRate,
             momentum: this.trainOpts.momentum
-          }
+          },
+          floatTextures: true
         });
       }
     }
@@ -697,7 +696,8 @@ var NeuralNetworkGPU = function (_NeuralNetwork) {
           hardcodeConstants: true,
           constants: {
             learningRate: this.trainOpts.learningRate
-          }
+          },
+          floatTextures: true
         });
       }
     }
@@ -715,7 +715,8 @@ var NeuralNetworkGPU = function (_NeuralNetwork) {
         output: [1],
         constants: {
           size: this.sizes[this.outputLayer]
-        }
+        },
+        floatTextures: true
       });
     }
 
@@ -912,7 +913,7 @@ function mse(errors) {
   return sum / this.constants.size;
 }
 
-},{"./lookup":3,"./neural-network":5,"gpu.js":75,"thaw.js":100}],5:[function(require,module,exports){
+},{"./lookup":3,"./neural-network":5,"gpu.js":75}],5:[function(require,module,exports){
 'use strict';
 
 Object.defineProperty(exports, "__esModule", {
@@ -1349,14 +1350,14 @@ var NeuralNetwork = function () {
       status.iterations++;
 
       if (this.trainOpts.log && status.iterations % this.trainOpts.logPeriod === 0) {
-        status.error = this._calculateTrainingError(data);
+        // status.error = this._calculateTrainingError(data);
         this.trainOpts.log('iterations: ' + status.iterations + ', training error: ' + status.error);
       } else {
-        if (status.iterations % 100 === 0) {
-          status.error = this._calculateTrainingError(data);
-        } else {
-          this._trainPatterns(data);
-        }
+        // if (status.iterations % 100 === 0) {
+        //   status.error = this._calculateTrainingError(data);
+        // } else {
+        this._trainPatterns(data);
+        // }
       }
 
       if (this.trainOpts.callback && status.iterations % this.trainOpts.callbackPeriod === 0) {

diff --git a/browser.min.js b/browser.min.js
diff --git a/dist/neural-network-gpu.js b/dist/neural-network-gpu.js
diff --git a/dist/neural-network-gpu.js.map b/dist/neural-network-gpu.js.map
diff --git a/dist/neural-network.js b/dist/neural-network.js
diff --git a/dist/neural-network.js.map b/dist/neural-network.js.map
diff --git a/src/neural-network-gpu.js b/src/neural-network-gpu.js
@@ -1,7 +1,6 @@
 import NeuralNetwork from './neural-network';
 import lookup from './lookup';
 import GPU from 'gpu.js';
-import Thaw from "thaw.js";
 
 /**
  *
@@ -55,20 +54,20 @@ export default class NeuralNetworkGPU extends NeuralNetwork {
     }
   }
 
-  train() {}
-
   trainAsync(data, options) {
     let status, endTime;
     ({ data, status, endTime } = this._prepTraining(data, options));
 
-    const train = () => {
-      if (this._trainingTick(data, status, endTime)) {
-        options.done();
-      } else {
-        requestAnimationFrame(train);
-      }
-    };
-    train();
+    return new Promise((resolve, reject) => {
+      const train = () => {
+        if (this._trainingTick(data, status, endTime)) {
+          requestAnimationFrame(train);
+        } else {
+          resolve(status);
+        }
+      };
+      train();
+    });
   }
 
   buildRunInput() {
@@ -99,7 +98,8 @@ export default class NeuralNetworkGPU extends NeuralNetwork {
         hardcodeConstants: true,
         constants: {
           size: this.sizes[layer - 1]
-        }
+        },
+        floatTextures: true
       });
     }
   }
@@ -156,7 +156,8 @@ export default class NeuralNetworkGPU extends NeuralNetwork {
             output: [this.sizes[layer]],
             outputToTexture: true,
             outputImmutable: true,
-            hardcodeConstants: true
+            hardcodeConstants: true,
+            floatTextures: true
           });
       } else {
         this.backwardPropagate[layer] = this.gpu.createKernelMap({
@@ -172,7 +173,8 @@ export default class NeuralNetworkGPU extends NeuralNetwork {
             hardcodeConstants: true,
             constants: {
               size: this.deltas[layer + 1].length
-            }
+            },
+            floatTextures: true
           });
       }
     }
@@ -220,7 +222,8 @@ export default class NeuralNetworkGPU extends NeuralNetwork {
             size: this.outputs[layer - 1].length,
             learningRate: this.trainOpts.learningRate,
             momentum: this.trainOpts.momentum
-          }
+          },
+          floatTextures: true
         });
     }    
   }
@@ -247,7 +250,8 @@ export default class NeuralNetworkGPU extends NeuralNetwork {
         hardcodeConstants: true,
         constants: {
           learningRate: this.trainOpts.learningRate
-        }
+        },
+        floatTextures: true
       });
     }
   }
@@ -266,7 +270,8 @@ export default class NeuralNetworkGPU extends NeuralNetwork {
       output: [1],
       constants: {
         size: this.sizes[this.outputLayer]
-      }
+      },
+      floatTextures: true
     });
   }
 

diff --git a/src/neural-network.js b/src/neural-network.js
@@ -365,14 +365,14 @@ export default class NeuralNetwork {
     status.iterations++;
 
     if (this.trainOpts.log && (status.iterations % this.trainOpts.logPeriod === 0)) {
-      status.error = this._calculateTrainingError(data);
+      // status.error = this._calculateTrainingError(data);
       this.trainOpts.log(`iterations: ${status.iterations}, training error: ${status.error}`);
     } else {
-      if (status.iterations % 100 === 0) {
-        status.error = this._calculateTrainingError(data);
-      } else {
+      // if (status.iterations % 100 === 0) {
+      //   status.error = this._calculateTrainingError(data);
+      // } else {
         this._trainPatterns(data);
-      }
+      // }
     }
 
     if (this.trainOpts.callback && (status.iterations % this.trainOpts.callbackPeriod === 0)) {