torch-rb 0.1.5 → 0.1.6

data/lib/torch/nn/max_unpool3d.rb

@@ -0,0 +1,16 @@
+module Torch
+  module NN
+    class MaxUnpool3d < MaxUnpoolNd
+      def initialize(kernel_size, stride: nil, padding: 0)
+        super()
+        @kernel_size = _triple(kernel_size)
+        @stride = _triple(stride || kernel_size)
+        @padding = _triple(padding)
+      end
+
+      def forward(input, indices, output_size: nil)
+        F.max_unpool3d(input, indices, @kernel_size, @stride, @padding, output_size)
+      end
+    end
+  end
+end

data/lib/torch/nn/max_unpoolnd.rb

@@ -0,0 +1,9 @@
+module Torch
+  module NN
+    class MaxUnpoolNd < Module
+      def extra_inspect
+        format("kernel_size: %s, stride: %s, padding: %s", @kernel_size, @stride, @padding)
+      end
+    end
+  end
+end

data/lib/torch/nn/module.rb

@@ -1,6 +1,8 @@
 module Torch
   module NN
     class Module
+      include Utils
+
       def initialize
         @training = true
         @parameters = {}
@@ -15,6 +17,7 @@ module Torch
       def register_buffer(name, tensor)
         # TODO add checks
         @buffers[name] = tensor
+        instance_variable_set("@#{name}", tensor)
       end
 
       def register_parameter(name, param)
@@ -216,6 +219,10 @@ module Torch
           end
         str % vars
       end
+
+      def dict
+        instance_variables.map { |k| [k[1..-1].to_sym, instance_variable_get(k)] }.to_h
+      end
     end
   end
 end

data/lib/torch/nn/reflection_pad1d.rb

@@ -0,0 +1,10 @@
+module Torch
+  module NN
+    class ReflectionPad1d < ReflectionPadNd
+      def initialize(padding)
+        super()
+        @padding = _pair(padding)
+      end
+    end
+  end
+end

data/lib/torch/nn/reflection_pad2d.rb

@@ -0,0 +1,10 @@
+module Torch
+  module NN
+    class ReflectionPad2d < ReflectionPadNd
+      def initialize(padding)
+        super()
+        @padding = _quadrupal(padding)
+      end
+    end
+  end
+end

data/lib/torch/nn/reflection_padnd.rb

@@ -0,0 +1,13 @@
+module Torch
+  module NN
+    class ReflectionPadNd < Module
+      def forward(input)
+        F.pad(input, @padding, mode: "reflect")
+      end
+
+      def extra_inspect
+        @padding.inspect
+      end
+    end
+  end
+end

data/lib/torch/nn/replication_pad1d.rb

@@ -0,0 +1,10 @@
+module Torch
+  module NN
+    class ReplicationPad1d < ReplicationPadNd
+      def initialize(padding)
+        super()
+        @padding = _pair(padding)
+      end
+    end
+  end
+end

data/lib/torch/nn/replication_pad2d.rb

@@ -0,0 +1,10 @@
+module Torch
+  module NN
+    class ReplicationPad2d < ReplicationPadNd
+      def initialize(padding)
+        super()
+        @padding = _quadrupal(padding)
+      end
+    end
+  end
+end

data/lib/torch/nn/replication_pad3d.rb

@@ -0,0 +1,10 @@
+module Torch
+  module NN
+    class ReplicationPad3d < ReplicationPadNd
+      def initialize(padding)
+        super()
+        @padding = _ntuple(6, padding)
+      end
+    end
+  end
+end

data/lib/torch/nn/replication_padnd.rb

@@ -0,0 +1,13 @@
+module Torch
+  module NN
+    class ReplicationPadNd < Module
+      def forward(input)
+        F.pad(input, @padding, mode: "replicate")
+      end
+
+      def extra_inspect
+        @padding.inspect
+      end
+    end
+  end
+end

data/lib/torch/nn/rnn_base.rb

@@ -90,12 +90,13 @@ module Torch
       end
 
       def permute_hidden(hx, permutation)
+        if permutation.nil?
+          return hx
+        end
         raise NotImplementedYet
       end
 
       def forward(input, hx: nil)
-        raise NotImplementedYet
-
         is_packed = false # TODO isinstance(input, PackedSequence)
         if is_packed
           input, batch_sizes, sorted_indices, unsorted_indices = input
@@ -120,8 +121,8 @@ module Torch
 
         check_forward_args(input, hx, batch_sizes)
         _rnn_impls = {
-          "RNN_TANH" => Torch.method(:_rnn_tanh),
-          "RNN_RELU" => Torch.method(:_rnn_relu)
+          "RNN_TANH" => Torch.method(:rnn_tanh),
+          "RNN_RELU" => Torch.method(:rnn_relu)
         }
         _impl = _rnn_impls[@mode]
         if batch_sizes.nil?
@@ -149,6 +150,49 @@ module Torch
         end
         format(s, input_size: @input_size, hidden_size: @hidden_size, num_layers: @num_layers)
       end
+
+      private
+
+      def _flat_weights
+        @all_weights.flatten.map { |v| instance_variable_get("@#{v}") }.compact
+      end
+
+      def _get_flat_weights
+        _flat_weights
+      end
+
+      def check_input(input, batch_sizes)
+        expected_input_dim = !batch_sizes.nil? ? 2 : 3
+        if input.dim != expected_input_dim
+          raise ArgumentError, "input must have #{expected_input_dim} dimensions, got #{input.dim}"
+        end
+        if @input_size != input.size(-1)
+          raise ArgumentError, "input.size(-1) must be equal to input_size. Expected #{@input_size}, got #{input.size(-1)}"
+        end
+      end
+
+      def get_expected_hidden_size(input, batch_sizes)
+        if !batch_sizes.nil?
+          mini_batch = batch_sizes[0]
+          mini_batch = mini_batch.to_i
+        else
+          mini_batch = @batch_first ? input.size(0) : input.size(1)
+        end
+        num_directions = @bidirectional ? 2 : 1
+        [@num_layers * num_directions, mini_batch, @hidden_size]
+      end
+
+      def check_hidden_size(hx, expected_hidden_size)
+        if hx.size != expected_hidden_size
+          raise ArgumentError, "Expected hidden size #{expected_hidden_size.inspect}, got #{hx.size.inspect}"
+        end
+      end
+
+      def check_forward_args(input, hidden, batch_sizes)
+        check_input(input, batch_sizes)
+        expected_hidden_size = get_expected_hidden_size(input, batch_sizes)
+        check_hidden_size(hidden, expected_hidden_size)
+      end
     end
   end
 end

data/lib/torch/nn/softshrink.rb

@@ -0,0 +1,18 @@
+module Torch
+  module NN
+    class Softshrink < Module
+      def initialize(lambd: 0.5)
+        super()
+        @lambd = lambd
+      end
+
+      def forward(input)
+        F.softshrink(input, @lambd)
+      end
+
+      def extra_inspect
+        @lambd.to_s
+      end
+    end
+  end
+end

data/lib/torch/nn/softsign.rb

@@ -0,0 +1,9 @@
+module Torch
+  module NN
+    class Softsign < Module
+      def forward(input)
+        F.softsign(input)
+      end
+    end
+  end
+end

data/lib/torch/nn/tanh.rb

@@ -0,0 +1,9 @@
+module Torch
+  module NN
+    class Tanh < Module
+      def forward(input)
+        Torch.tanh(input)
+      end
+    end
+  end
+end

data/lib/torch/nn/tanhshrink.rb

@@ -0,0 +1,9 @@
+module Torch
+  module NN
+    class Tanhshrink < Module
+      def forward(input)
+        F.tanhshrink(input)
+      end
+    end
+  end
+end

data/lib/torch/nn/unfold.rb

@@ -0,0 +1,19 @@
+module Torch
+  module NN
+    class Unfold < Module
+      def initialize(kernel_size, dilation: 1, padding: 0, stride: 1)
+        super()
+        @kernel_size = kernel_size
+        @dilation = dilation
+        @padding = padding
+        @stride = stride
+      end
+
+      def forward(input)
+        F.unfold(input, @kernel_size, dilation: @dilation, padding: @padding, stride: @stride)
+      end
+
+      # TODO add extra_inspect
+    end
+  end
+end

data/lib/torch/nn/utils.rb

@@ -0,0 +1,25 @@
+module Torch
+  module NN
+    module Utils
+      def _single(value)
+        _ntuple(1, value)
+      end
+
+      def _pair(value)
+        _ntuple(2, value)
+      end
+
+      def _triple(value)
+        _ntuple(3, value)
+      end
+
+      def _quadrupal(value)
+        _ntuple(4, value)
+      end
+
+      def _ntuple(n, value)
+        value.is_a?(Array) ? value : [value] * n
+      end
+    end
+  end
+end

data/lib/torch/nn/zero_pad2d.rb

@@ -0,0 +1,9 @@
+module Torch
+  module NN
+    class ZeroPad2d < ConstantPad2d
+      def initialize(padding)
+        super(padding, 0.0)
+      end
+    end
+  end
+end

data/lib/torch/tensor.rb

@@ -45,8 +45,9 @@ module Torch
       dim.times.map { |i| size(i) }
     end
 
-    def view(*size)
-      _view(size)
+    # mirror Python len()
+    def length
+      size(0)
     end
 
     def item
@@ -86,38 +87,26 @@ module Torch
       _type(enum)
     end
 
-    # start temp operations
+    def reshape(*size)
+      # Python doesn't check if size == 1, just ignores later arguments
+      size = size.first if size.size == 1 && size.first.is_a?(Array)
+      _reshape(size)
+    end
 
+    def view(*size)
+      size = size.first if size.size == 1 && size.first.is_a?(Array)
+      _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
-        # need to use alpha for sparse tensors instead of multiplying
         _add__tensor(other, value)
       end
     end
 
-    def mul!(other)
-      if other.is_a?(Numeric)
-        _mul__scalar(other)
-      else
-        _mul__tensor(other)
-      end
-    end
-
-    # operations
-    %w(log_softmax mean softmax sum topk).each do |op|
-      define_method(op) do |*args, **options, &block|
-        if options.any?
-          Torch.send(op, self, *args, **options, &block)
-        else
-          Torch.send(op, self, *args, &block)
-        end
-      end
-    end
-
-    # end temp operations
-
     def +(other)
       add(other)
     end

data/lib/torch/version.rb

@@ -1,3 +1,3 @@
 module Torch
-  VERSION = "0.1.5"
+  VERSION = "0.1.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: torch-rb
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Andrew Kane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-07 00:00:00.000000000 Z
+date: 2019-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rice
@@ -108,6 +108,7 @@ files:
 - ext/torch/extconf.rb
 - ext/torch/nn_functions.cpp
 - ext/torch/nn_functions.hpp
+- ext/torch/templates.cpp
 - ext/torch/templates.hpp
 - ext/torch/tensor_functions.cpp
 - ext/torch/tensor_functions.hpp
@@ -123,12 +124,24 @@ files:
 - lib/torch/native/native_functions.yaml
 - lib/torch/native/parser.rb
 - lib/torch/nn/alpha_dropout.rb
+- lib/torch/nn/avg_pool1d.rb
 - lib/torch/nn/avg_pool2d.rb
+- lib/torch/nn/avg_pool3d.rb
 - lib/torch/nn/avg_poolnd.rb
+- lib/torch/nn/batch_norm.rb
+- lib/torch/nn/batch_norm1d.rb
+- lib/torch/nn/batch_norm2d.rb
+- lib/torch/nn/batch_norm3d.rb
 - lib/torch/nn/bce_loss.rb
 - lib/torch/nn/bce_with_logits_loss.rb
 - lib/torch/nn/bilinear.rb
+- lib/torch/nn/constant_pad1d.rb
+- lib/torch/nn/constant_pad2d.rb
+- lib/torch/nn/constant_pad3d.rb
+- lib/torch/nn/constant_padnd.rb
+- lib/torch/nn/conv1d.rb
 - lib/torch/nn/conv2d.rb
+- lib/torch/nn/conv3d.rb
 - lib/torch/nn/convnd.rb
 - lib/torch/nn/cosine_embedding_loss.rb
 - lib/torch/nn/cosine_similarity.rb
@@ -141,19 +154,40 @@ files:
 - lib/torch/nn/embedding.rb
 - lib/torch/nn/embedding_bag.rb
 - lib/torch/nn/feature_alpha_dropout.rb
+- lib/torch/nn/fold.rb
 - lib/torch/nn/functional.rb
+- lib/torch/nn/group_norm.rb
+- lib/torch/nn/gru.rb
+- lib/torch/nn/hardshrink.rb
 - lib/torch/nn/hinge_embedding_loss.rb
 - lib/torch/nn/identity.rb
 - lib/torch/nn/init.rb
+- lib/torch/nn/instance_norm.rb
+- lib/torch/nn/instance_norm1d.rb
+- lib/torch/nn/instance_norm2d.rb
+- lib/torch/nn/instance_norm3d.rb
 - lib/torch/nn/kl_div_loss.rb
 - lib/torch/nn/l1_loss.rb
+- lib/torch/nn/layer_norm.rb
 - lib/torch/nn/leaky_relu.rb
 - lib/torch/nn/linear.rb
+- lib/torch/nn/local_response_norm.rb
+- lib/torch/nn/log_sigmoid.rb
 - lib/torch/nn/log_softmax.rb
 - lib/torch/nn/loss.rb
+- lib/torch/nn/lp_pool1d.rb
+- lib/torch/nn/lp_pool2d.rb
+- lib/torch/nn/lp_poolnd.rb
+- lib/torch/nn/lstm.rb
 - lib/torch/nn/margin_ranking_loss.rb
+- lib/torch/nn/max_pool1d.rb
 - lib/torch/nn/max_pool2d.rb
+- lib/torch/nn/max_pool3d.rb
 - lib/torch/nn/max_poolnd.rb
+- lib/torch/nn/max_unpool1d.rb
+- lib/torch/nn/max_unpool2d.rb
+- lib/torch/nn/max_unpool3d.rb
+- lib/torch/nn/max_unpoolnd.rb
 - lib/torch/nn/module.rb
 - lib/torch/nn/mse_loss.rb
 - lib/torch/nn/multi_label_margin_loss.rb
@@ -164,7 +198,14 @@ files:
 - lib/torch/nn/parameter.rb
 - lib/torch/nn/poisson_nll_loss.rb
 - lib/torch/nn/prelu.rb
+- lib/torch/nn/reflection_pad1d.rb
+- lib/torch/nn/reflection_pad2d.rb
+- lib/torch/nn/reflection_padnd.rb
 - lib/torch/nn/relu.rb
+- lib/torch/nn/replication_pad1d.rb
+- lib/torch/nn/replication_pad2d.rb
+- lib/torch/nn/replication_pad3d.rb
+- lib/torch/nn/replication_padnd.rb
 - lib/torch/nn/rnn.rb
 - lib/torch/nn/rnn_base.rb
 - lib/torch/nn/sequential.rb
@@ -175,8 +216,15 @@ files:
 - lib/torch/nn/softmax2d.rb
 - lib/torch/nn/softmin.rb
 - lib/torch/nn/softplus.rb
+- lib/torch/nn/softshrink.rb
+- lib/torch/nn/softsign.rb
+- lib/torch/nn/tanh.rb
+- lib/torch/nn/tanhshrink.rb
 - lib/torch/nn/triplet_margin_loss.rb
+- lib/torch/nn/unfold.rb
+- lib/torch/nn/utils.rb
 - lib/torch/nn/weighted_loss.rb
+- lib/torch/nn/zero_pad2d.rb
 - lib/torch/optim/adadelta.rb
 - lib/torch/optim/adagrad.rb
 - lib/torch/optim/adam.rb