torch-rb 0.2.2 → 0.2.7

data/lib/torch/optim/rprop.rb

@@ -11,9 +11,6 @@ module Torch
       end
 
       def step(closure = nil)
-        # TODO implement []=
-        raise NotImplementedYet
-
         loss = nil
         if closure
           loss = closure.call

data/lib/torch/tensor.rb

@@ -1,6 +1,7 @@
 module Torch
   class Tensor
     include Comparable
+    include Enumerable
     include Inspector
 
     alias_method :requires_grad?, :requires_grad
@@ -25,8 +26,25 @@ module Torch
       inspect
     end
 
+    def each
+      return enum_for(:each) unless block_given?
+
+      size(0).times do |i|
+        yield self[i]
+      end
+    end
+
+    # TODO make more performant
     def to_a
-      reshape_arr(_flat_data, shape)
+      arr = _flat_data
+      if shape.empty?
+        arr
+      else
+        shape[1..-1].reverse.each do |dim|
+          arr = arr.each_slice(dim)
+        end
+        arr.to_a
+      end
     end
 
     # TODO support dtype
@@ -64,7 +82,15 @@ module Torch
       if numel != 1
         raise Error, "only one element tensors can be converted to Ruby scalars"
       end
-      _flat_data.first
+      to_a.first
+    end
+
+    def to_i
+      item.to_i
+    end
+
+    def to_f
+      item.to_f
     end
 
     # unsure if this is correct
@@ -80,7 +106,7 @@ module Torch
     def numo
       cls = Torch._dtype_to_numo[dtype]
       raise Error, "Cannot convert #{dtype} to Numo" unless cls
-      cls.cast(_flat_data).reshape(*shape)
+      cls.from_string(_data_str).reshape(*shape)
     end
 
     def new_ones(*size, **options)
@@ -108,15 +134,6 @@ module Torch
       _view(size)
     end
 
-    # value and other are swapped for some methods
-    def add!(value = 1, other)
-      if other.is_a?(Numeric)
-        _add__scalar(other, value)
-      else
-        _add__tensor(other, value)
-      end
-    end
-
     def +(other)
       add(other)
     end
@@ -145,12 +162,25 @@ module Torch
       neg
     end
 
+    def &(other)
+      logical_and(other)
+    end
+
+    def |(other)
+      logical_or(other)
+    end
+
+    def ^(other)
+      logical_xor(other)
+    end
+
     # TODO better compare?
     def <=>(other)
       item <=> other
     end
 
-    # based on python_variable_indexing.cpp
+    # based on python_variable_indexing.cpp and
+    # https://pytorch.org/cppdocs/notes/tensor_indexing.html
     def [](*indexes)
       result = self
       dim = 0
@@ -162,6 +192,8 @@ module Torch
           finish += 1 unless index.exclude_end?
           result = result._slice_tensor(dim, index.begin, finish, 1)
           dim += 1
+        elsif index.is_a?(Tensor)
+          result = result.index([index])
         elsif index.nil?
           result = result.unsqueeze(dim)
           dim += 1
@@ -175,12 +207,12 @@ module Torch
       result
     end
 
-    # TODO
-    # based on python_variable_indexing.cpp
+    # based on python_variable_indexing.cpp and
+    # https://pytorch.org/cppdocs/notes/tensor_indexing.html
     def []=(index, value)
       raise ArgumentError, "Tensor does not support deleting items" if value.nil?
 
-      value = Torch.tensor(value) unless value.is_a?(Tensor)
+      value = Torch.tensor(value, dtype: dtype) unless value.is_a?(Tensor)
 
       if index.is_a?(Numeric)
         copy_to(_select_int(0, index), value)
@@ -188,13 +220,39 @@ module Torch
         finish = index.end
         finish += 1 unless index.exclude_end?
         copy_to(_slice_tensor(0, index.begin, finish, 1), value)
+      elsif index.is_a?(Tensor)
+        index_put!([index], value)
       else
         raise Error, "Unsupported index type: #{index.class.name}"
       end
     end
 
-    def random!(from = 0, to)
-      _random__from_to(from, to)
+    # native functions that need manually defined
+
+    # value and other are swapped for some methods
+    def add!(value = 1, other)
+      if other.is_a?(Numeric)
+        _add__scalar(other, value)
+      else
+        _add__tensor(other, value)
+      end
+    end
+
+    # native functions overlap, so need to handle manually
+    def random!(*args)
+      case args.size
+      when 1
+        _random__to(*args)
+      when 2
+        _random__from_to(*args)
+      else
+        _random_(*args)
+      end
+    end
+
+    def clamp!(min, max)
+      _clamp_min_(min)
+      _clamp_max_(max)
     end
 
     private
@@ -202,17 +260,5 @@ module Torch
     def copy_to(dst, src)
       dst.copy!(src)
     end
-
-    def reshape_arr(arr, dims)
-      if dims.empty?
-        arr
-      else
-        arr = arr.flatten
-        dims[1..-1].reverse.each do |dim|
-          arr = arr.each_slice(dim)
-        end
-        arr.to_a
-      end
-    end
   end
 end

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

@@ -6,21 +6,49 @@ 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
-          size.times do |i|
-            start_index = i * @batch_size
-            yield @dataset[start_index...(start_index + @batch_size)]
+          # try to keep the random number generator in sync with Python
+          # this makes it easy to compare results
+          base_seed = Torch.empty([], dtype: :int64).random!.item
+
+          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
 
         def size
           (@dataset.size / @batch_size.to_f).ceil
         end
+
+        private
+
+        def collate(batch)
+          elem = batch[0]
+          case elem
+          when Tensor
+            Torch.stack(batch, 0)
+          when Integer
+            Torch.tensor(batch)
+          when Array
+            batch.transpose.map { |v| collate(v) }
+          else
+            raise NotImpelmentYet
+          end
+        end
       end
     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.2"
+  VERSION = "0.2.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: torch-rb
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.7
 platform: ruby
 authors:
 - Andrew Kane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-27 00:00:00.000000000 Z
+date: 2020-06-30 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: []
@@ -258,9 +258,9 @@ files:
 - lib/torch/optim/rmsprop.rb
 - lib/torch/optim/rprop.rb
 - lib/torch/optim/sgd.rb
-- lib/torch/random.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

data/lib/torch/random.rb

@@ -1,10 +0,0 @@
-module Torch
-  module Random
-    class << self
-      # not available through LibTorch
-      def initial_seed
-        raise NotImplementedYet
-      end
-    end
-  end
-end