torch-rb 0.3.5 → 0.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 93271ffd62be6e35c6ea3a2219a7bc3dccbe8489d6f4aca1a1f00f99bab1a4bb
-  data.tar.gz: df2755ac3e6221502430d780d116a1145c461f97857e7b1b2b809095afaad9e5
+  metadata.gz: f7b85027dfbb5a3d8de3741d00f4256fd13a6b5496a123564472a48d8a084c1b
+  data.tar.gz: 5c684e45ec115ce3b9cc5a3e223ee73cac3dce5fbacae1bd4d4faa7cf49adc5f
 SHA512:
-  metadata.gz: 9e02de90a7a83e5d4421941a0ceea69c6367f42be2e97e4229812f35c27f83475fbace86f42285128da724343dcfd85050b7846d81d43fce100749be0072ad4c
-  data.tar.gz: 884873c3c965f16b0a833087909019ebc6f228511a9b0ecbf4c436cc546e28012e63899651aeab6befddbe7b057676b170cd3eb858b997f42289c103252a2834
+  metadata.gz: acb727d9836709e5db4df21aeb6eec401e10f3c1910f95877493a9b1920cef4a0bd4914b906dab9b2ec18071fe95bf50de91a8a00a0914f3876ecb851e1c19c7
+  data.tar.gz: 7e69bde091825d7dcda81cfcfebd220c8072442322071a73eafd2849d9a899229bbcc2ce2b80f78e4b44e468e7a263ec83fd9a3fb3c1bf3073573596f40ec143

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.3.6 (2020-09-17)
+
+- Added `inplace` option for leaky ReLU
+- Fixed error with methods that return a tensor list (`chunk`, `split`, and `unbind`)
+- Fixed error with buffers on GPU
+
 ## 0.3.5 (2020-09-04)
 
 - Fixed error with data loader (due to `dtype` of `randperm`)

data/ext/torch/ext.cpp

@@ -301,11 +301,6 @@ void Init_ext()
         // https://github.com/pytorch/pytorch/issues/20356#issuecomment-567663701
         return torch::pickle_load(v);
       })
-    .define_singleton_method(
-      "_binary_cross_entropy_with_logits",
-      *[](const Tensor &input, const Tensor &target, OptionalTensor weight, OptionalTensor pos_weight, MyReduction reduction) {
-        return torch::binary_cross_entropy_with_logits(input, target, weight, pos_weight, reduction);
-      })
     .define_singleton_method(
       "_from_blob",
       *[](String s, IntArrayRef size, const torch::TensorOptions &options) {
@@ -379,11 +374,6 @@ void Init_ext()
       *[](Tensor& self, bool requires_grad) {
         return self.set_requires_grad(requires_grad);
       })
-    .define_method(
-      "_backward",
-      *[](Tensor& self, OptionalTensor gradient, bool create_graph, bool retain_graph) {
-        return self.backward(gradient, create_graph, retain_graph);
-      })
     .define_method(
       "grad",
       *[](Tensor& self) {

data/ext/torch/templates.cpp

@@ -53,3 +53,11 @@ Object wrap(std::tuple<torch::Tensor, torch::Tensor, double, int64_t> x) {
   a.push(to_ruby<int64_t>(std::get<3>(x)));
   return Object(a);
 }
+
+Object wrap(std::vector<torch::Tensor> x) {
+  Array a;
+  for (auto& t : x) {
+    a.push(to_ruby<torch::Tensor>(t));
+  }
+  return Object(a);
+}

data/ext/torch/templates.hpp

@@ -10,6 +10,7 @@
 using namespace Rice;
 
 using torch::Device;
+using torch::Scalar;
 using torch::ScalarType;
 using torch::Tensor;
 
@@ -36,30 +37,6 @@ IntArrayRef from_ruby<IntArrayRef>(Object x)
   return IntArrayRef(x);
 }
 
-// for now
-class Scalar {
-  torch::Scalar value;
-  public:
-    Scalar(Object o) {
-      // TODO cast based on Ruby type
-      if (o.rb_type() == T_FIXNUM) {
-        value = torch::Scalar(from_ruby<int64_t>(o));
-      } else {
-        value = torch::Scalar(from_ruby<float>(o));
-      }
-    }
-    operator torch::Scalar() {
-      return value;
-    }
-};
-
-template<>
-inline
-Scalar from_ruby<Scalar>(Object x)
-{
-  return Scalar(x);
-}
-
 class TensorList {
   std::vector<torch::Tensor> vec;
   public:
@@ -192,6 +169,17 @@ class OptionalTensor {
     }
 };
 
+template<>
+inline
+Scalar from_ruby<Scalar>(Object x)
+{
+  if (x.rb_type() == T_FIXNUM) {
+    return torch::Scalar(from_ruby<int64_t>(x));
+  } else {
+    return torch::Scalar(from_ruby<double>(x));
+  }
+}
+
 template<>
 inline
 OptionalTensor from_ruby<OptionalTensor>(Object x)
@@ -221,9 +209,43 @@ torch::optional<int64_t> from_ruby<torch::optional<int64_t>>(Object x)
   }
 }
 
+template<>
+inline
+torch::optional<double> from_ruby<torch::optional<double>>(Object x)
+{
+  if (x.is_nil()) {
+    return torch::nullopt;
+  } else {
+    return torch::optional<double>{from_ruby<double>(x)};
+  }
+}
+
+template<>
+inline
+torch::optional<bool> from_ruby<torch::optional<bool>>(Object x)
+{
+  if (x.is_nil()) {
+    return torch::nullopt;
+  } else {
+    return torch::optional<bool>{from_ruby<bool>(x)};
+  }
+}
+
+template<>
+inline
+torch::optional<Scalar> from_ruby<torch::optional<Scalar>>(Object x)
+{
+  if (x.is_nil()) {
+    return torch::nullopt;
+  } else {
+    return torch::optional<Scalar>{from_ruby<Scalar>(x)};
+  }
+}
+
 Object wrap(std::tuple<torch::Tensor, torch::Tensor> x);
 Object wrap(std::tuple<torch::Tensor, torch::Tensor, torch::Tensor> x);
 Object wrap(std::tuple<torch::Tensor, torch::Tensor, torch::Tensor, torch::Tensor> x);
 Object wrap(std::tuple<torch::Tensor, torch::Tensor, torch::Tensor, torch::Tensor, torch::Tensor> x);
 Object wrap(std::tuple<torch::Tensor, torch::Tensor, torch::Tensor, int64_t> x);
 Object wrap(std::tuple<torch::Tensor, torch::Tensor, double, int64_t> x);
+Object wrap(std::vector<torch::Tensor> x);

data/lib/torch.rb

@@ -239,25 +239,22 @@ module Torch
     cls
   end
 
-  FloatTensor = _make_tensor_class(:float32)
-  DoubleTensor = _make_tensor_class(:float64)
-  HalfTensor = _make_tensor_class(:float16)
-  ByteTensor = _make_tensor_class(:uint8)
-  CharTensor = _make_tensor_class(:int8)
-  ShortTensor = _make_tensor_class(:int16)
-  IntTensor = _make_tensor_class(:int32)
-  LongTensor = _make_tensor_class(:int64)
-  BoolTensor = _make_tensor_class(:bool)
-
-  CUDA::FloatTensor = _make_tensor_class(:float32, true)
-  CUDA::DoubleTensor = _make_tensor_class(:float64, true)
-  CUDA::HalfTensor = _make_tensor_class(:float16, true)
-  CUDA::ByteTensor = _make_tensor_class(:uint8, true)
-  CUDA::CharTensor = _make_tensor_class(:int8, true)
-  CUDA::ShortTensor = _make_tensor_class(:int16, true)
-  CUDA::IntTensor = _make_tensor_class(:int32, true)
-  CUDA::LongTensor = _make_tensor_class(:int64, true)
-  CUDA::BoolTensor = _make_tensor_class(:bool, true)
+  DTYPE_TO_CLASS = {
+    float32: "FloatTensor",
+    float64: "DoubleTensor",
+    float16: "HalfTensor",
+    uint8: "ByteTensor",
+    int8: "CharTensor",
+    int16: "ShortTensor",
+    int32: "IntTensor",
+    int64: "LongTensor",
+    bool: "BoolTensor"
+  }
+
+  DTYPE_TO_CLASS.each do |dtype, class_name|
+    const_set(class_name, _make_tensor_class(dtype))
+    CUDA.const_set(class_name, _make_tensor_class(dtype, true))
+  end
 
   class << self
     # Torch.float, Torch.long, etc

data/lib/torch/native/function.rb

@@ -86,6 +86,10 @@ module Torch
         @ret_size ||= func.split("->").last.split(", ").size
       end
 
+      def ret_array?
+        @ret_array ||= func.split("->").last.include?('[]')
+      end
+
       def out?
         out_size > 0 && base_name[-1] != "_"
       end

data/lib/torch/native/generator.rb

@@ -18,12 +18,12 @@ module Torch
           functions = functions()
 
           # skip functions
-          skip_args = ["bool[3]", "Dimname", "Layout", "Storage", "ConstQuantizerPtr"]
+          skip_args = ["Layout", "Storage", "ConstQuantizerPtr"]
 
           # remove functions
           functions.reject! do |f|
             f.ruby_name.start_with?("_") ||
-            f.ruby_name.end_with?("_backward") ||
+            f.ruby_name.include?("_backward") ||
             f.args.any? { |a| a[:type].include?("Dimname") }
           end
 
@@ -31,7 +31,6 @@ module Torch
           todo_functions, functions =
             functions.partition do |f|
               f.args.any? do |a|
-                a[:type].include?("?") && !["Tensor?", "Generator?", "int?", "ScalarType?", "Tensor?[]"].include?(a[:type]) ||
                 skip_args.any? { |sa| a[:type].include?(sa) } ||
                 # call to 'range' is ambiguous
                 f.cpp_name == "_range" ||
@@ -104,6 +103,12 @@ void add_%{type}_functions(Module m) {
                   "int64_t"
                 when "int?"
                   "torch::optional<int64_t>"
+                when "float?"
+                  "torch::optional<double>"
+                when "bool?"
+                  "torch::optional<bool>"
+                when "Scalar?"
+                  "torch::optional<torch::Scalar>"
                 when "float"
                   "double"
                 when /\Aint\[/
@@ -130,8 +135,8 @@ void add_%{type}_functions(Module m) {
             prefix = def_method == :define_method ? "self." : "torch::"
 
             body = "#{prefix}#{dispatch}(#{args.join(", ")})"
-            # TODO check type as well
-            if func.ret_size > 1
+
+            if func.ret_size > 1 || func.ret_array?
               body = "wrap(#{body})"
             end
 

data/lib/torch/native/parser.rb

@@ -85,6 +85,10 @@ module Torch
                 end
               when "int?"
                 v.is_a?(Integer) || v.nil?
+              when "float?"
+                v.is_a?(Numeric) || v.nil?
+              when "bool?"
+                v == true || v == false || v.nil?
               when "float"
                 v.is_a?(Numeric)
               when /int\[.*\]/
@@ -97,6 +101,10 @@ module Torch
                 v.is_a?(Array) && v.all? { |v2| v2.is_a?(Integer) }
               when "Scalar"
                 v.is_a?(Numeric)
+              when "Scalar?"
+                v.is_a?(Numeric) || v.nil?
+              when "ScalarType"
+                false # not supported yet
               when "ScalarType?"
                 v.nil?
               when "bool"

data/lib/torch/nn/functional.rb

@@ -178,8 +178,12 @@ module Torch
           Torch.hardshrink(input, lambd)
         end
 
-        def leaky_relu(input, negative_slope = 0.01)
-          NN.leaky_relu(input, negative_slope)
+        def leaky_relu(input, negative_slope = 0.01, inplace: false)
+          if inplace
+            NN.leaky_relu!(input, negative_slope)
+          else
+            NN.leaky_relu(input, negative_slope)
+          end
         end
 
         def log_sigmoid(input)

data/lib/torch/nn/leaky_relu.rb

@@ -1,14 +1,14 @@
 module Torch
   module NN
     class LeakyReLU < Module
-      def initialize(negative_slope: 1e-2) #, inplace: false)
+      def initialize(negative_slope: 1e-2, inplace: false)
         super()
         @negative_slope = negative_slope
-        # @inplace = inplace
+        @inplace = inplace
       end
 
       def forward(input)
-        F.leaky_relu(input, @negative_slope) #, inplace: @inplace)
+        F.leaky_relu(input, @negative_slope, inplace: @inplace)
       end
 
       def extra_inspect

data/lib/torch/nn/module.rb

@@ -55,7 +55,12 @@ module Torch
             end
           end
         end
-        # TODO apply to more objects
+
+        @buffers.each_key do |k|
+          buf = @buffers[k]
+          @buffers[k] = fn.call(buf) unless buf.nil?
+        end
+
         self
       end
 

data/lib/torch/tensor.rb

@@ -103,11 +103,6 @@ module Torch
       Torch.empty(0, dtype: dtype)
     end
 
-    def backward(gradient = nil, retain_graph: nil, create_graph: false)
-      retain_graph = create_graph if retain_graph.nil?
-      _backward(gradient, retain_graph, create_graph)
-    end
-
     # TODO read directly from memory
     def numo
       cls = Torch._dtype_to_numo[dtype]
@@ -235,7 +230,7 @@ module Torch
         when Integer
           TensorIndex.integer(index)
         when Range
-          finish = index.end
+          finish = index.end || -1
           if finish == -1 && !index.exclude_end?
             finish = nil
           else

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

@@ -45,6 +45,8 @@ module Torch
         def size
           (@dataset.size / @batch_size.to_f).ceil
         end
+        alias_method :length, :size
+        alias_method :count, :size
 
         private
 

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

@@ -16,6 +16,8 @@ module Torch
         def size
           @tensors[0].size(0)
         end
+        alias_method :length, :size
+        alias_method :count, :size
       end
     end
   end

data/lib/torch/version.rb

@@ -1,3 +1,3 @@
 module Torch
-  VERSION = "0.3.5"
+  VERSION = "0.3.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: torch-rb
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.3.6
 platform: ruby
 authors:
 - Andrew Kane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-04 00:00:00.000000000 Z
+date: 2020-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rice