torch-rb 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cff805041122544d87342923649010da6981fbdb6d47c73da8cc623ba3856af5
-  data.tar.gz: 257c16cbdbc915fe30e7cba5fc0d24ce0337cf88dd420dfaa3a13b8437e04164
+  metadata.gz: 67c5a0cf556399dc32d73e8793e3aa794c181150f0f42dfa810c4b98a5acf6f2
+  data.tar.gz: 0a23f6a42595fb9d599962e88438b964180583ead5b9cce934cc447951b4a389
 SHA512:
-  metadata.gz: 36e2e671f3400fdaa513cfa2dd9d07b839b120cd848dc0e28bf8723570c554e6a96e1d4f29f33a1e995e6eb57e6042299321b8903f657006d2c04c10cecc59c2
-  data.tar.gz: ed1b17bf30ba5b4342350cf41cc5aa19b64c83cef44fe4f0122874805eabe9e91f31e0d3bc046812fa7ef07031de81f442fe18c231be2324d4da6f677325a54a
+  metadata.gz: c0f8e9e3395d196d7ea6fa4b40d128284d768033e02f4ed7d2dc9adc985015fd0a80d601601dd97438b803b6a3bd7b81f5dbda353bb5dee4247503a24cd755d7
+  data.tar.gz: c32a22ebbe1b4dfd77324f62a72d6a128639aac0a99d4c5255b16c606e6f961ae2c8b0dbab5012a9b21faa7409511b79a50676bc8314f181c85f90433433fa8b

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.2.4 (2020-04-29)
+
+- Added `to_i` and `to_f` to tensors
+- Added `shuffle` option to data loader
+- Fixed `modules` and `named_modules` for nested modules
+
 ## 0.2.3 (2020-04-28)
 
 - Added `show_config` and `parallel_info` methods

data/lib/torch/hub.rb

@@ -4,6 +4,14 @@ module Torch
       def list(github, force_reload: false)
         raise NotImplementedYet
       end
+
+      def download_url_to_file(url)
+        raise NotImplementedYet
+      end
+
+      def load_state_dict_from_url(url)
+        raise NotImplementedYet
+      end
     end
   end
 end

data/lib/torch/inspector.rb

@@ -25,7 +25,7 @@ module Torch
             end
 
             if floating_point?
-              sci = max / min.to_f > 1000 || max > 1e8 || min < 1e-4
+              sci = max > 1e8 || max < 1e-4
 
               all_int = values.all? { |v| v.finite? && v == v.to_i }
               decimal = all_int ? 1 : 4

data/lib/torch/nn/batch_norm.rb

@@ -70,6 +70,11 @@ module Torch
           momentum: exponential_average_factor, eps: @eps
         )
       end
+
+      def extra_inspect
+        s = "%{num_features}, eps: %{eps}, momentum: %{momentum}, affine: %{affine}, track_running_stats: %{track_running_stats}"
+        format(s, **dict)
+      end
     end
   end
 end

data/lib/torch/nn/conv2d.rb

@@ -20,7 +20,14 @@ module Torch
 
       # TODO add more parameters
       def extra_inspect
-        format("%s, %s, kernel_size: %s, stride: %s", @in_channels, @out_channels, @kernel_size, @stride)
+        s = String.new("%{in_channels}, %{out_channels}, kernel_size: %{kernel_size}, stride: %{stride}")
+        s += ", padding: %{padding}" if @padding != [0] * @padding.size
+        s += ", dilation: %{dilation}" if @dilation != [1] * @dilation.size
+        s += ", output_padding: %{output_padding}" if @output_padding != [0] * @output_padding.size
+        s += ", groups: %{groups}" if @groups != 1
+        s += ", bias: false" unless @bias
+        s += ", padding_mode: %{padding_mode}" if @padding_mode != "zeros"
+        format(s, **dict)
       end
     end
   end

data/lib/torch/nn/convnd.rb

@@ -23,7 +23,7 @@ module Torch
         if bias
           @bias = Parameter.new(Tensor.new(out_channels))
         else
-          raise NotImplementedError
+          register_parameter("bias", nil)
         end
         reset_parameters
       end

data/lib/torch/nn/max_poolnd.rb

@@ -12,7 +12,8 @@ module Torch
       end
 
       def extra_inspect
-        format("kernel_size: %s", @kernel_size)
+        s = "kernel_size: %{kernel_size}, stride: %{stride}, padding: %{padding}, dilation: %{dilation}, ceil_mode: %{ceil_mode}"
+        format(s, **dict)
       end
     end
   end

data/lib/torch/nn/module.rb

@@ -186,8 +186,22 @@ module Torch
         named_modules.values
       end
 
-      def named_modules
-        {"" => self}.merge(named_children)
+      # TODO return enumerator?
+      def named_modules(memo: nil, prefix: "")
+        ret = {}
+        memo ||= Set.new
+        unless memo.include?(self)
+          memo << self
+          ret[prefix] = self
+          named_children.each do |name, mod|
+            next unless mod.is_a?(Module)
+            submodule_prefix = prefix + (!prefix.empty? ? "." : "") + name
+            mod.named_modules(memo: memo, prefix: submodule_prefix).each do |m|
+              ret[m[0]] = m[1]
+            end
+          end
+        end
+        ret
       end
 
       def train(mode = true)
@@ -230,7 +244,9 @@ module Torch
           str = String.new
           str << "#{name}(\n"
           named_children.each do |name, mod|
-            str << "  (#{name}): #{mod.inspect}\n"
+            mod_str = mod.inspect
+            mod_str = mod_str.lines.join("  ")
+            str << "  (#{name}): #{mod_str}\n"
           end
           str << ")"
         end

data/lib/torch/tensor.rb

@@ -67,6 +67,14 @@ module Torch
       _flat_data.first
     end
 
+    def to_i
+      item.to_i
+    end
+
+    def to_f
+      item.to_f
+    end
+
     # unsure if this is correct
     def new
       Torch.empty(0, dtype: dtype)

data/lib/torch/utils/data/data_loader.rb

@@ -6,9 +6,10 @@ module Torch
 
         attr_reader :dataset
 
-        def initialize(dataset, batch_size: 1)
+        def initialize(dataset, batch_size: 1, shuffle: false)
           @dataset = dataset
           @batch_size = batch_size
+          @shuffle = shuffle
         end
 
         def each
@@ -16,11 +17,15 @@ module Torch
           # this makes it easy to compare results
           base_seed = Torch.empty([], dtype: :int64).random!.item
 
-          max_size = @dataset.size
-          size.times do |i|
-            start_index = i * @batch_size
-            end_index = [start_index + @batch_size, max_size].min
-            batch = (end_index - start_index).times.map { |j| @dataset[start_index + j] }
+          indexes =
+            if @shuffle
+              Torch.randperm(@dataset.size).to_a
+            else
+              @dataset.size.times
+            end
+
+          indexes.each_slice(@batch_size) do |idx|
+            batch = idx.map { |i| @dataset[i] }
             yield collate(batch)
           end
         end

data/lib/torch/utils/data/dataset.rb

@@ -0,0 +1,8 @@
+module Torch
+  module Utils
+    module Data
+      class Dataset
+      end
+    end
+  end
+end

data/lib/torch/utils/data/tensor_dataset.rb

@@ -1,7 +1,7 @@
 module Torch
   module Utils
     module Data
-      class TensorDataset
+      class TensorDataset < Dataset
         def initialize(*tensors)
           unless tensors.all? { |t| t.size(0) == tensors[0].size(0) }
             raise Error, "Tensors must all have same dim 0 size"

data/lib/torch/version.rb

@@ -1,3 +1,3 @@
 module Torch
-  VERSION = "0.2.3"
+  VERSION = "0.2.4"
 end

data/lib/torch.rb

@@ -174,6 +174,7 @@ require "torch/nn/init"
 
 # utils
 require "torch/utils/data/data_loader"
+require "torch/utils/data/dataset"
 require "torch/utils/data/tensor_dataset"
 
 # hub

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: torch-rb
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Andrew Kane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-28 00:00:00.000000000 Z
+date: 2020-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rice
@@ -95,19 +95,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: npy
+  name: torchvision
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.1
 description: 
 email: andrew@chartkick.com
 executables: []
@@ -260,6 +260,7 @@ files:
 - lib/torch/optim/sgd.rb
 - lib/torch/tensor.rb
 - lib/torch/utils/data/data_loader.rb
+- lib/torch/utils/data/dataset.rb
 - lib/torch/utils/data/tensor_dataset.rb
 - lib/torch/version.rb
 homepage: https://github.com/ankane/torch.rb