Bug fix: Misassigned learning rate (WebAssembly)

DanRuta · Mar 23, 2018 · 374e026 · 374e026
1 parent 86fcdb0
commit 374e026
Show file tree

Hide file tree

Showing 15 changed files with 23 additions and 18 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -12,6 +12,9 @@
 #### Examples
 - Added example project for loading jsNet through Webpack
 
+#### Bug fixes
+- WASM not training on some update functions, due to misassigned learning rate
+
 # 3.3.0 - Misc Improvements
 ---
 #### Network

diff --git a/dev/js-WebAssembly/Network.js b/dev/js-WebAssembly/Network.js
@@ -161,11 +161,11 @@ class Network {
         switch (NetUtil.format(updateFn)) {
 
             case "rmsprop":
-                this.learningRate = this.learningRate==undefined ? 0.001 : this.learningRate
+                this.learningRate = this.learningRate || 0.001
                 break
 
             case "adam":
-                this.learningRate = this.learningRate==undefined ? 0.01 : this.learningRate
+                this.learningRate = this.learningRate || 0.01
                 break
 
             case "adadelta":
@@ -175,6 +175,7 @@ class Network {
 
             case "momentum":
                 NetUtil.defineProperty(this, "momentum", ["number"], [this.netInstance])
+                this.learningRate = this.learningRate || 0.2
                 this.momentum = momentum
                 break
 
@@ -738,7 +739,7 @@ class Network {
     }
 
     static get version () {
-        return "3.3.1"
+        return "3.3.3"
     }
 }
 

diff --git a/dev/js/Network.js b/dev/js/Network.js
@@ -671,7 +671,7 @@ class Network {
     }
 
     static get version () {
-        return "3.3.1"
+        return "3.3.3"
     }
 }
 

diff --git a/dist/jsNetJS.concat.js b/dist/jsNetJS.concat.js
diff --git a/dist/jsNetJS.concat.js.map b/dist/jsNetJS.concat.js.map
diff --git a/dist/jsNetJS.min.js b/dist/jsNetJS.min.js
diff --git a/dist/jsNetJS.min.js.map b/dist/jsNetJS.min.js.map
diff --git a/dist/jsNetWebAssembly.concat.js b/dist/jsNetWebAssembly.concat.js
diff --git a/dist/jsNetWebAssembly.concat.js.map b/dist/jsNetWebAssembly.concat.js.map
diff --git a/dist/jsNetWebAssembly.min.js b/dist/jsNetWebAssembly.min.js
diff --git a/dist/jsNetWebAssembly.min.js.map b/dist/jsNetWebAssembly.min.js.map
diff --git a/examples/mnist/mnist.html b/examples/mnist/mnist.html
@@ -361,7 +361,7 @@
     Module: Module,
     layers: [
         new InputLayer(784),
-        new FCLayer(100),
+        new FCLayer(100, {activation: "sigmoid"}),
         new OutputLayer(10, {activation: false, softmax: true})
     ]
 })

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "jsnet",
-  "version": "3.3.2",
+  "version": "3.3.3",
   "description": "Javascript based deep learning framework for basic and convolutional neural networks.",
   "scripts": {
     "test": "npm run js-tests && npm run wa-tests",

diff --git a/test/js-test.js b/test/js-test.js
@@ -36,7 +36,7 @@ describe("Loading", () => {
     })
 
     it("Statically returns the Network version when accessing via .version", () => {
-        expect(Network.version).to.equal("3.3.1")
+        expect(Network.version).to.equal("3.3.3")
     })
 })
 

diff --git a/test/wa-test.js b/test/wa-test.js
@@ -36,7 +36,7 @@ describe("Loading", () => {
     })
 
     it("Statically returns the Network version when accessing via .version", () => {
-        expect(Network.version).to.equal("3.3.1")
+        expect(Network.version).to.equal("3.3.3")
     })
 })