torch-rb 0.2.5 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8f6ab78fb5cff27d0d60ddb9c08fb2f526bd60e241dd1011554b21716bdd2f43
-  data.tar.gz: 5568f53d8d5d688e3f29fb55ddbe9457e0b933dc69f59b422035c0cee249e396
+  metadata.gz: da5c88539a2890933e44859af7c1acfe835405c89e82bc6a6fb2df37fdee141a
+  data.tar.gz: 747ab48ba1b0ba16077ed31cf505f622a4120d18be9c0942ded39810095aa68e
 SHA512:
-  metadata.gz: 9c5dcfbf35382b37678662690677b2b90d0d544e8802703cf83dba6e10483a4df487f9687e4e898c9cc449c568f4e02f9d831daa982b5b3135af6f9ce176ec88
-  data.tar.gz: 34f142d874606e140661ae992a9f8cd4779f95c93c11d9a89a1864dd0bd53c5480c30d9aec5897f1955e2450bd0a3bc56ed0868e3b54d82ff4cdba40af379840
+  metadata.gz: d2bccf16e7af54d53affbc12030fd89f417fd060afa7057e97765bca00c24b7089f74b9e8aa4bab9180045e466649676f481425dc24ab29533b74138bb03e786
+  data.tar.gz: 8eb49a743fedb220df4edc39d7d0c492c1827ce63f2c5d9a8d73495da63da5f6055674ca0bd60bb0b81be68db6e5c9300357de2c417e82e7af4fafd1ab6c7ca2

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.2.6 (2020-06-29)
+
+- Added support for indexing with tensors
+- Added `contiguous` methods
+- Fixed named parameters for nested parameters
+
 ## 0.2.5 (2020-06-07)
 
 - Added `download_url_to_file` and `load_state_dict_from_url` to `Torch::Hub`

data/README.md

@@ -409,7 +409,7 @@ Here’s the list of compatible versions.
 
 Torch.rb | LibTorch
 --- | ---
-0.2.0 | 1.5.0
+0.2.0+ | 1.5.0+
 0.1.8 | 1.4.0
 0.1.0-0.1.7 | 1.3.1
 

data/ext/torch/ext.cpp

@@ -329,6 +329,11 @@ void Init_ext()
     .define_method("numel", &torch::Tensor::numel)
     .define_method("element_size", &torch::Tensor::element_size)
     .define_method("requires_grad", &torch::Tensor::requires_grad)
+    .define_method(
+      "contiguous?",
+      *[](Tensor& self) {
+        return self.is_contiguous();
+      })
     .define_method(
       "addcmul!",
       *[](Tensor& self, Scalar value, const Tensor & tensor1, const Tensor & tensor2) {

data/lib/torch/native/function.rb

@@ -66,6 +66,7 @@ module Torch
             end
 
             next if t == "Generator?"
+            next if t == "MemoryFormat"
             next if t == "MemoryFormat?"
             args << {name: k, type: t, default: d, pos: pos, has_default: has_default}
           end

data/lib/torch/native/generator.rb

@@ -18,7 +18,7 @@ module Torch
           functions = functions()
 
           # skip functions
-          skip_args = ["bool[3]", "Dimname", "MemoryFormat", "Layout", "Storage", "ConstQuantizerPtr"]
+          skip_args = ["bool[3]", "Dimname", "Layout", "Storage", "ConstQuantizerPtr"]
 
           # remove functions
           functions.reject! do |f|
@@ -31,7 +31,7 @@ module Torch
           todo_functions, functions =
             functions.partition do |f|
               f.args.any? do |a|
-                a[:type].include?("?") && !["Tensor?", "Generator?", "int?", "ScalarType?"].include?(a[:type]) ||
+                a[:type].include?("?") && !["Tensor?", "Generator?", "int?", "ScalarType?", "Tensor?[]"].include?(a[:type]) ||
                 skip_args.any? { |sa| a[:type].include?(sa) } ||
                 # native_functions.yaml is missing size argument for normal
                 # https://pytorch.org/cppdocs/api/function_namespacetorch_1a80253fe5a3ded4716ec929a348adb4b9.html
@@ -112,6 +112,9 @@ void add_%{type}_functions(Module m) {
                   "OptionalScalarType"
                 when "Tensor[]"
                   "TensorList"
+                when "Tensor?[]"
+                  # TODO make optional
+                  "TensorList"
                 when "int"
                   "int64_t"
                 when "float"

data/lib/torch/native/parser.rb

@@ -75,7 +75,7 @@ module Torch
                 v.is_a?(Tensor)
               when "Tensor?"
                 v.nil? || v.is_a?(Tensor)
-              when "Tensor[]"
+              when "Tensor[]", "Tensor?[]"
                 v.is_a?(Array) && v.all? { |v2| v2.is_a?(Tensor) }
               when "int"
                 if k == "reduction"

data/lib/torch/nn/module.rb

@@ -145,7 +145,7 @@ module Torch
         params = {}
         if recurse
           named_children.each do |name, mod|
-            params.merge!(mod.named_parameters(prefix: "#{name}.", recurse: recurse))
+            params.merge!(mod.named_parameters(prefix: "#{prefix}#{name}.", recurse: recurse))
           end
         end
         instance_variables.each do |name|

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

@@ -158,7 +158,8 @@ module Torch
       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
@@ -170,6 +171,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
@@ -183,12 +186,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)
@@ -196,6 +199,8 @@ 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
@@ -224,6 +229,11 @@ module Torch
       end
     end
 
+    def clamp!(min, max)
+      _clamp_min_(min)
+      _clamp_max_(max)
+    end
+
     private
 
     def copy_to(dst, src)

data/lib/torch/version.rb

@@ -1,3 +1,3 @@
 module Torch
-  VERSION = "0.2.5"
+  VERSION = "0.2.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: torch-rb
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
 platform: ruby
 authors:
 - Andrew Kane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-07 00:00:00.000000000 Z
+date: 2020-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rice