torch-rb 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 06e94b492acbbdb71f9e6a11081fb043a03ae0d5c704cc79faa31dd96bde70ef
-  data.tar.gz: 4f38fa52d30ef9bf121204423b4d675f21dbef806b6f137152f2cf9399ddf4bb
+  metadata.gz: 97908e85a67729120f763bb4140323505b77a831d5648e9d2d0961259e3d300c
+  data.tar.gz: f366548f9880dac7dffce6305e192f75a7467526ae55ae13af05d355918375ba
 SHA512:
-  metadata.gz: 2fb2613ca629a70f55009b697b15830d59c0d8fc06c1c5102917b4870cb783427fb56ecc08889c09e15c342381385f258b2a33102dc5adddf2d463d41674994d
-  data.tar.gz: f26a6ba91caa57a92b8b047217a35c39d1e9c4c361df77e2182053b4ab490f20792fc88dba169dae87d4a3d4ee4d69e2c779efb1fa6150b4d3f0d93e3762aec9
+  metadata.gz: cc32ddbc43131175452a8b62df5d1eac6bc8450eea174018affd5cd073f81e2c9825d613014c62c5f8137cf5dddd1ab6ab6de60a4b3a67a757387446dbc1efad
+  data.tar.gz: c322e0b7ec7f03f12311d737034dad45037d2ad7710974e24250e11f4a0db14e221e870ddc52c0f2b723476be6f41fca8a8719068b0d0b7d8974d2080e9be6dc

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+## 0.3.2 (2020-08-24)
+
+- Added `enable_grad` method
+- Added `random_split` method
+- Added `collate_fn` option to `DataLoader`
+- Added `grad=` method to `Tensor`
+- Fixed error with `grad` method when empty
+- Fixed `EmbeddingBag`
+
 ## 0.3.1 (2020-08-17)
 
 - Added `create_graph` and `retain_graph` options to `backward` method

data/ext/torch/ext.cpp

@@ -358,7 +358,13 @@ void Init_ext()
     .define_method(
       "grad",
       *[](Tensor& self) {
-        return self.grad();
+        auto grad = self.grad();
+        return grad.defined() ? to_ruby<torch::Tensor>(grad) : Nil;
+      })
+    .define_method(
+      "grad=",
+      *[](Tensor& self, torch::Tensor& grad) {
+        self.grad() = grad;
       })
     .define_method(
       "_dtype",
@@ -580,6 +586,11 @@ void Init_ext()
       *[](Parameter& self) {
         auto grad = self.grad();
         return grad.defined() ? to_ruby<torch::Tensor>(grad) : Nil;
+      })
+    .define_method(
+      "grad=",
+      *[](Parameter& self, torch::Tensor& grad) {
+        self.grad() = grad;
       });
 
   Class rb_cDevice = define_class_under<torch::Device>(rb_mTorch, "Device")

data/lib/torch.rb

@@ -179,8 +179,10 @@ require "torch/nn/functional"
 require "torch/nn/init"
 
 # utils
+require "torch/utils/data"
 require "torch/utils/data/data_loader"
 require "torch/utils/data/dataset"
+require "torch/utils/data/subset"
 require "torch/utils/data/tensor_dataset"
 
 # hub
@@ -316,6 +318,16 @@ module Torch
       end
     end
 
+    def enable_grad
+      previous_value = grad_enabled?
+      begin
+        _set_grad_enabled(true)
+        yield
+      ensure
+        _set_grad_enabled(previous_value)
+      end
+    end
+
     def device(str)
       Device.new(str)
     end

data/lib/torch/hub.rb

@@ -7,25 +7,26 @@ module Torch
 
       def download_url_to_file(url, dst)
         uri = URI(url)
-        tmp = "#{Dir.tmpdir}/#{Time.now.to_f}" # TODO better name
+        tmp = nil
         location = nil
 
+        puts "Downloading #{url}..."
         Net::HTTP.start(uri.host, uri.port, use_ssl: uri.scheme == "https") do |http|
           request = Net::HTTP::Get.new(uri)
 
-          puts "Downloading #{url}..."
-          File.open(tmp, "wb") do |f|
-            http.request(request) do |response|
-              case response
-              when Net::HTTPRedirection
-                location = response["location"]
-              when Net::HTTPSuccess
+          http.request(request) do |response|
+            case response
+            when Net::HTTPRedirection
+              location = response["location"]
+            when Net::HTTPSuccess
+              tmp = "#{Dir.tmpdir}/#{Time.now.to_f}" # TODO better name
+              File.open(tmp, "wb") do |f|
                 response.read_body do |chunk|
                   f.write(chunk)
                 end
-              else
-                raise Error, "Bad response"
               end
+            else
+              raise Error, "Bad response"
             end
           end
         end

data/lib/torch/nn/functional.rb

@@ -373,7 +373,8 @@ module Torch
             end
 
           # weight and input swapped
-          Torch.embedding_bag(weight, input, offsets, scale_grad_by_freq, mode_enum, sparse, per_sample_weights)
+          ret, _, _, _ = Torch.embedding_bag(weight, input, offsets, scale_grad_by_freq, mode_enum, sparse, per_sample_weights)
+          ret
         end
 
         # distance functions
@@ -426,6 +427,9 @@ module Torch
         end
 
         def mse_loss(input, target, reduction: "mean")
+          if target.size != input.size
+            warn "Using a target size (#{target.size}) that is different to the input size (#{input.size}). This will likely lead to incorrect results due to broadcasting. Please ensure they have the same size."
+          end
           NN.mse_loss(input, target, reduction)
         end
 

data/lib/torch/utils/data.rb

@@ -0,0 +1,23 @@
+module Torch
+  module Utils
+    module Data
+      class << self
+        def random_split(dataset, lengths)
+          if lengths.sum != dataset.length
+            raise ArgumentError, "Sum of input lengths does not equal the length of the input dataset!"
+          end
+
+          indices = Torch.randperm(lengths.sum).to_a
+          _accumulate(lengths).zip(lengths).map { |offset, length| Subset.new(dataset, indices[(offset - length)...offset]) }
+        end
+
+        private
+
+        def _accumulate(iterable)
+          sum = 0
+          iterable.map { |x| sum += x }
+        end
+      end
+    end
+  end
+end

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

@@ -6,10 +6,22 @@ module Torch
 
         attr_reader :dataset
 
-        def initialize(dataset, batch_size: 1, shuffle: false)
+        def initialize(dataset, batch_size: 1, shuffle: false, collate_fn: nil)
           @dataset = dataset
           @batch_size = batch_size
           @shuffle = shuffle
+
+          @batch_sampler = nil
+
+          if collate_fn.nil?
+            if auto_collation?
+              collate_fn = method(:default_collate)
+            else
+              collate_fn = method(:default_convert)
+            end
+          end
+
+          @collate_fn = collate_fn
         end
 
         def each
@@ -25,8 +37,8 @@ module Torch
             end
 
           indexes.each_slice(@batch_size) do |idx|
-            batch = idx.map { |i| @dataset[i] }
-            yield collate(batch)
+            # TODO improve performance
+            yield @collate_fn.call(idx.map { |i| @dataset[i] })
           end
         end
 
@@ -36,7 +48,7 @@ module Torch
 
         private
 
-        def collate(batch)
+        def default_convert(batch)
           elem = batch[0]
           case elem
           when Tensor
@@ -44,11 +56,15 @@ module Torch
           when Integer
             Torch.tensor(batch)
           when Array
-            batch.transpose.map { |v| collate(v) }
+            batch.transpose.map { |v| default_convert(v) }
           else
-            raise NotImpelmentYet
+            raise NotImplementedYet
           end
         end
+
+        def auto_collation?
+          !@batch_sampler.nil?
+        end
       end
     end
   end

data/lib/torch/utils/data/subset.rb

@@ -0,0 +1,25 @@
+module Torch
+  module Utils
+    module Data
+      class Subset < Dataset
+        def initialize(dataset, indices)
+          @dataset = dataset
+          @indices = indices
+        end
+
+        def [](idx)
+          @dataset[@indices[idx]]
+        end
+
+        def length
+          @indices.length
+        end
+        alias_method :size, :length
+
+        def to_a
+          @indices.map { |i| @dataset[i] }
+        end
+      end
+    end
+  end
+end

data/lib/torch/version.rb

@@ -1,3 +1,3 @@
 module Torch
-  VERSION = "0.3.1"
+  VERSION = "0.3.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: torch-rb
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Andrew Kane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-17 00:00:00.000000000 Z
+date: 2020-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rice
@@ -259,8 +259,10 @@ files:
 - lib/torch/optim/rprop.rb
 - lib/torch/optim/sgd.rb
 - lib/torch/tensor.rb
+- lib/torch/utils/data.rb
 - lib/torch/utils/data/data_loader.rb
 - lib/torch/utils/data/dataset.rb
+- lib/torch/utils/data/subset.rb
 - lib/torch/utils/data/tensor_dataset.rb
 - lib/torch/version.rb
 homepage: https://github.com/ankane/torch.rb