Skip to content

Commit 8bf1f7f

Browse files
committed
With some of the changes pushed up recently, NeuralNetworkGPU lagged behind. This was mainly the prepending of "_" to internal-only methods, as well as moving things to a trainOpts object. This meant that the GPU was not able to work at all. This catches things up.
1 parent 9d957e6 commit 8bf1f7f

File tree

7 files changed

+32
-32
lines changed

7 files changed

+32
-32
lines changed

browser.js

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -464,9 +464,9 @@ var NeuralNetworkGPU = function (_NeuralNetwork) {
464464

465465

466466
_createClass(NeuralNetworkGPU, [{
467-
key: 'initialize',
468-
value: function initialize(sizes) {
469-
_get(NeuralNetworkGPU.prototype.__proto__ || Object.getPrototypeOf(NeuralNetworkGPU.prototype), 'initialize', this).call(this, sizes);
467+
key: '_initialize',
468+
value: function _initialize(sizes) {
469+
_get(NeuralNetworkGPU.prototype.__proto__ || Object.getPrototypeOf(NeuralNetworkGPU.prototype), '_initialize', this).call(this, sizes);
470470
this.buildRunInput();
471471
this.buildCalculateDeltas();
472472
this.buildGetChanges();
@@ -485,9 +485,9 @@ var NeuralNetworkGPU = function (_NeuralNetwork) {
485485
*/
486486

487487
}, {
488-
key: 'trainPattern',
489-
value: function trainPattern(input, target, learningRate) {
490-
learningRate = learningRate || this.learningRate;
488+
key: '_trainPattern',
489+
value: function _trainPattern(input, target, learningRate) {
490+
learningRate = learningRate || this.trainOpts.learningRate;
491491
// forward propagate
492492
this.runInput(input);
493493

@@ -639,7 +639,7 @@ var NeuralNetworkGPU = function (_NeuralNetwork) {
639639
key: 'getChanges',
640640
value: function getChanges(learningRate) {
641641
for (var layer = 1; layer <= this.outputLayer; layer++) {
642-
var output = this.changesPropagate[layer](this.outputs[layer - 1], this.deltas[layer], this.weights[layer], this.changes[layer], learningRate, this.momentum);
642+
var output = this.changesPropagate[layer](this.outputs[layer - 1], this.deltas[layer], this.weights[layer], this.changes[layer], learningRate, this.trainOpts.momentum);
643643

644644
this.changes[layer] = output.changes;
645645
this.weights[layer] = output.weights;
@@ -701,8 +701,8 @@ var NeuralNetworkGPU = function (_NeuralNetwork) {
701701
*/
702702

703703
}, {
704-
key: 'formatData',
705-
value: function formatData(data) {
704+
key: '_formatData',
705+
value: function _formatData(data) {
706706
var _this2 = this;
707707

708708
if (!Array.isArray(data)) {
@@ -1286,7 +1286,7 @@ var NeuralNetwork = function () {
12861286
}, {
12871287
key: '_prepTraining',
12881288
value: function _prepTraining(data, options) {
1289-
this.updateTrainingOptions(options);
1289+
this._updateTrainingOptions(options);
12901290
data = this._formatData(data);
12911291
var endTime = Date.now() + this.trainOpts.timeout;
12921292

browser.min.js

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/neural-network-gpu.js

Lines changed: 9 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/neural-network-gpu.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/neural-network.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/neural-network.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/neural-network-gpu.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ export default class NeuralNetworkGPU extends NeuralNetwork {
2222
*
2323
* @param {Number[]} sizes
2424
*/
25-
initialize(sizes) {
26-
super.initialize(sizes);
25+
_initialize(sizes) {
26+
super._initialize(sizes);
2727
this.buildRunInput();
2828
this.buildCalculateDeltas();
2929
this.buildGetChanges();
@@ -39,8 +39,8 @@ export default class NeuralNetworkGPU extends NeuralNetwork {
3939
* @param target
4040
* @param learningRate
4141
*/
42-
trainPattern(input, target, learningRate) {
43-
learningRate = learningRate || this.learningRate;
42+
_trainPattern(input, target, learningRate) {
43+
learningRate = learningRate || this.trainOpts.learningRate;
4444
// forward propagate
4545
this.runInput(input);
4646

@@ -205,7 +205,7 @@ export default class NeuralNetworkGPU extends NeuralNetwork {
205205
this.weights[layer],
206206
this.changes[layer],
207207
learningRate,
208-
this.momentum
208+
this.trainOpts.momentum
209209
);
210210

211211
this.changes[layer] = output.changes;
@@ -264,7 +264,7 @@ export default class NeuralNetworkGPU extends NeuralNetwork {
264264
* @param data
265265
* @returns {*}
266266
*/
267-
formatData(data) {
267+
_formatData(data) {
268268
if (!Array.isArray(data)) { // turn stream datum into array
269269
let tmp = [];
270270
tmp.push(data);

0 commit comments

Comments
 (0)