rann 0.2.4 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 671da77af2c018b9391e64bc6d6a3bdcd3267648
-  data.tar.gz: edeb0b1f7c6c59b5afb692872efc1c1e80492971
+  metadata.gz: 81b3a045a8873df309575045595a2379a7e4b28c
+  data.tar.gz: 5cab5e7a20030b091341ff9dc9a1d6acb3279ea7
 SHA512:
-  metadata.gz: 6527cce72e2d732c2efee6e1acf1ca9c01187e5dbc69f27600842de1d2685766e6631183abab171a1dabb029ce45d64486a62af6b69c40f656d9dc4afe58fca8
-  data.tar.gz: 617ea35293d0a34f40f4e613124e73d6771bad29f47cb5860786a0e03564cd798619b51b84f0397624f5f3100a7b15a3e0ba2db0d1bef143f9e7c5e07e37bb0e
+  metadata.gz: f223e733f0eed2cc347050d6dc6b48eb64a1705ee0208da4eccb25d644c09cfa7bbd08313d427b0990dfb10ff136a27dcf3ecb39a4a9d81183423c181a724879
+  data.tar.gz: aca9f044286fd055e6868098375c084574162102e2e0d40a1e17c92c8f0795e1d9a7ca13216ec54010192b3f75d354166fbe32dde1804dc712a27a2accf16b35

data/CHANGES.md

@@ -1,3 +1,7 @@
+- Add save and restore methods to backprop.
+
+  *Michael Campbell*
+
 - Fix alias error.
 
   *Michael Campbell*

data/lib/rann/backprop.rb

@@ -20,10 +20,10 @@ module RANN
 
     attr_accessor :network
 
-    def initialize network, opts = {}, restore = {}
+    def initialize network, opts = {}
       @network          = network
       @connections_hash = network.connections.each.with_object({}){ |c, h| h[c.id] = c }
-      @optimiser        = RANN::Optimisers.const_get(opts[:optimiser] || 'RMSProp').new opts, restore
+      @optimiser        = RANN::Optimisers.const_get(opts[:optimiser] || 'RMSProp').new opts
       @batch_count      = 0.to_d
     end
 
@@ -182,8 +182,31 @@ module RANN
       [gradients, error]
     end
 
-    def state
-      { historical_gradient: @historical_gradient }
+    def save filepath = nil
+      filepath ||= "rann_savepoint_#{DateTime.now.strftime('%Y-%m-%d-%H-%M-%S')}.yml"
+
+      weights  = @network.params
+      opt_vars = @optimiser.state
+
+      File.open filepath, "w" do |f|
+        f.write YAML.dump [weights, opt_vars]
+      end
+    end
+
+    def restore filepath
+      unless filepath
+        filepath = Dir['*'].select{ |f| f =~ /rann_savepoint_.*/ }.sort.last
+
+        unless filepath
+          @network.init_normalised!
+          puts "No savepoints found—initialised normalised weights"
+          return
+        end
+      end
+
+      weights, opt_vars = YAML.load_file(filepath)
+      @network.impose(weights)
+      @network.optimiser.load_state(opt_vars)
     end
 
     def self.reset! network

data/lib/rann/optimisers/adagrad.rb

@@ -5,10 +5,10 @@ require "bigdecimal/util"
 module RANN
   module Optimisers
     class AdaGrad
-      def initialize opts = {}, restore = {}
+      def initialize opts = {}
         @fudge_factor        = opts[:fudge_factor] || 0.00000001.to_d
         @learning_rate       = opts[:learning_rate] || 0.1.to_d
-        @historical_gradient = (restore[:historical_gradient] || {}).tap{ |h| h.default = 0.to_d }
+        @historical_gradient = {}.tap{ |h| h.default = 0.to_d }
       end
 
       def update grad, cid
@@ -16,6 +16,19 @@ module RANN
 
         grad.mult(- @learning_rate.div(@fudge_factor + @historical_gradient[cid].sqrt(10), 10), 10)
       end
+
+      # anything that gets modified over the course of training
+      def state
+        {
+          historical_gradient: @historical_gradient,
+        }
+      end
+
+      def load_state state
+        state.each do |name, value|
+          instance_variable_set("@#{name}", value)
+        end
+      end
     end
   end
 end

data/lib/rann/optimisers/rmsprop.rb

@@ -5,11 +5,11 @@ require "bigdecimal/util"
 module RANN
   module Optimisers
     class RMSProp
-      def initialize opts = {}, restore = {}
+      def initialize opts = {}
         @decay               = opts[:decay] || 0.9.to_d
         @fudge_factor        = opts[:fudge_factor] || 0.00000001.to_d
         @learning_rate       = opts[:learning_rate] || 0.01.to_d
-        @historical_gradient = (restore[:historical_gradient] || {}).tap{ |h| h.default = 0.to_d }
+        @historical_gradient = {}.tap{ |h| h.default = 0.to_d }
       end
 
       def update grad, cid
@@ -17,6 +17,19 @@ module RANN
 
         grad.mult(- @learning_rate.div(@fudge_factor + @historical_gradient[cid].sqrt(10), 10), 10)
       end
+
+      # anything that gets modified over the course of training
+      def state
+        {
+          historical_gradient: @historical_gradient,
+        }
+      end
+
+      def load_state state
+        state.each do |name, value|
+          instance_variable_set("@#{name}", value)
+        end
+      end
     end
   end
 end

data/lib/rann/version.rb

@@ -1,3 +1,3 @@
 module RANN
-  VERSION = "0.2.4"
+  VERSION = "0.2.5"
 end

data/rann.gemspec

@@ -12,6 +12,7 @@ Gem::Specification.new do |spec|
   spec.summary       = %q{Ruby Artificial Neural Networks}
   spec.description   = %q{Libary for working with neural networks in Ruby.}
   spec.homepage      = "https://github.com/mikecmpbll/rann"
+  spec.licenses      = 'Apache-2.0'
 
   spec.files         = `git ls-files -z`.split("\x0").reject do |f|
     f.match(%r{^(test|spec|features)/})
@@ -20,8 +21,8 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}){ |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency "parallel", "~> 1.12.0"
-  spec.add_runtime_dependency "ruby-graphviz", "~> 1.2.3"
+  spec.add_runtime_dependency 'parallel', '~> 1.12', '>= 1.12.0'
+  spec.add_runtime_dependency 'ruby-graphviz', '~> 1.2', '>= 1.2.3'
 
   spec.add_development_dependency "bundler", "~> 1.16"
   spec.add_development_dependency "rake", "~> 10.0"

metadata

@@ -1,20 +1,23 @@
 --- !ruby/object:Gem::Specification
 name: rann
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors:
 - Michael Campbell
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-11-28 00:00:00.000000000 Z
+date: 2017-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parallel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.12'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.12.0
   type: :runtime
@@ -22,6 +25,9 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.12'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.12.0
 - !ruby/object:Gem::Dependency
@@ -29,6 +35,9 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.2.3
   type: :runtime
@@ -36,6 +45,9 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.2.3
 - !ruby/object:Gem::Dependency
@@ -114,7 +126,8 @@ files:
 - lib/rann/version.rb
 - rann.gemspec
 homepage: https://github.com/mikecmpbll/rann
-licenses: []
+licenses:
+- Apache-2.0
 metadata: {}
 post_install_message: 
 rdoc_options: []