torch-rb 0.9.0 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '09221364dad232f1b76129fe9dc9407675cc2afbd03bd1339c736d4eec752df7'
-  data.tar.gz: a37a0584aed809009ebd74e7c0da9430481ccabf1ac915d2468ee7511c249588
+  metadata.gz: f5224c74f6e74ed04396dfa0414400af5cb20bc5e654320421116723ffcb8e83
+  data.tar.gz: 6a2881ddacb7610a231ebd5a1c24d0f71a2662f16f360102141dfd0893c13346
 SHA512:
-  metadata.gz: c220d35971b9ce3e5a7a80f6a5d1ae4324f3524d0e0171c680deced66fe2f29342a46eecb1a4447d84a401a677c7bb1ef910a0c7ee6c925ea4b578b7e5712772
-  data.tar.gz: 807fe2907de1caac92da6dddb0154b7971dda3aa0ee2c53f6b3046732f4bf3c02310e59a6441efa0fdf1ad3d0ddb5dcd7a3c1a946adbfbea73b6b30f10a71487
+  metadata.gz: 045432235e1c691ce85fb937a0562d93b1d9bc312fc648d40dafcc24857eeec4f84e6ceab397793171b0046ccfd785a6caeba37902925dcff1f73c760dd57cec
+  data.tar.gz: 2520fa17dcd13be52aaf1256f431d2951f8113f862189b8691f877dcb48ac9f71ac70719600e27d8c8972494c0b7f11c0983c3330fed7ca6aeed552e8500ec22

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.9.1 (2022-02-02)
+
+- Moved `like` methods to C++
+- Fixed memory issue
+
 ## 0.9.0 (2021-10-23)
 
 - Updated LibTorch to 1.10.0

data/README.md

@@ -21,10 +21,10 @@ brew install libtorch
 Add this line to your application’s Gemfile:
 
 ```ruby
-gem 'torch-rb'
+gem "torch-rb"
 ```
 
-It can take a few minutes to compile the extension.
+It can take 5-10 minutes to compile the extension.
 
 ## Getting Started
 
@@ -79,7 +79,7 @@ b = Torch.zeros(2, 3)
 
 Each tensor has four properties
 
-- `dtype` - the data type - `:uint8`, `:int8`, `:int16`, `:int32`, `:int64`, `:float32`, `float64`, or `:bool`
+- `dtype` - the data type - `:uint8`, `:int8`, `:int16`, `:int32`, `:int64`, `:float32`, `:float64`, or `:bool`
 - `layout` - `:strided` (dense) or `:sparse`
 - `device` - the compute device, like CPU or GPU
 - `requires_grad` - whether or not to record gradients

data/ext/torch/backends.cpp

@@ -7,11 +7,11 @@
 void init_backends(Rice::Module& m) {
   auto rb_mBackends = Rice::define_module_under(m, "Backends");
 
-   Rice::define_module_under(rb_mBackends, "OpenMP")
+  Rice::define_module_under(rb_mBackends, "OpenMP")
     .add_handler<torch::Error>(handle_error)
     .define_singleton_function("available?", &torch::hasOpenMP);
 
-   Rice::define_module_under(rb_mBackends, "MKL")
+  Rice::define_module_under(rb_mBackends, "MKL")
     .add_handler<torch::Error>(handle_error)
     .define_singleton_function("available?", &torch::hasMKL);
 }

data/ext/torch/ruby_arg_parser.cpp

@@ -472,12 +472,12 @@ static void extra_kwargs(FunctionSignature& signature, VALUE kwargs, ssize_t num
     auto param_idx = find_param(signature, key);
     if (param_idx < 0) {
       rb_raise(rb_eArgError, "%s() got an unexpected keyword argument '%s'",
-          signature.name.c_str(), THPUtils_unpackSymbol(key).c_str());
+          signature.name.c_str(), rb_id2name(rb_to_id(key)));
     }
 
     if (param_idx < num_pos_args) {
       rb_raise(rb_eArgError, "%s() got multiple values for argument '%s'",
-          signature.name.c_str(), THPUtils_unpackSymbol(key).c_str());
+          signature.name.c_str(), rb_id2name(rb_to_id(key)));
     }
   }
 

data/ext/torch/ruby_arg_parser.h

@@ -235,7 +235,7 @@ inline ScalarType RubyArgs::scalartype(int i) {
 
   auto it = dtype_map.find(args[i]);
   if (it == dtype_map.end()) {
-    rb_raise(rb_eArgError, "invalid dtype: %s", THPUtils_unpackSymbol(args[i]).c_str());
+    rb_raise(rb_eArgError, "invalid dtype: %s", rb_id2name(rb_to_id(args[i])));
   }
   return it->second;
 }
@@ -293,7 +293,7 @@ inline c10::optional<at::Layout> RubyArgs::layoutOptional(int i) {
 
   auto it = layout_map.find(args[i]);
   if (it == layout_map.end()) {
-    rb_raise(rb_eArgError, "invalid layout: %s", THPUtils_unpackSymbol(args[i]).c_str());
+    rb_raise(rb_eArgError, "invalid layout: %s", rb_id2name(rb_to_id(args[i])));
   }
   return it->second;
 }
@@ -325,15 +325,15 @@ inline c10::optional<std::string> RubyArgs::stringOptional(int i) {
   return Rice::detail::From_Ruby<std::string>().convert(args[i]);
 }
 
+// string_view does not own data
 inline c10::string_view RubyArgs::stringView(int i) {
-  auto str = Rice::detail::From_Ruby<std::string>().convert(args[i]);
-  return c10::string_view(str.data(), str.size());
+  return c10::string_view(RSTRING_PTR(args[i]), RSTRING_LEN(args[i]));
 }
 
+// string_view does not own data
 inline c10::optional<c10::string_view> RubyArgs::stringViewOptional(int i) {
   if (NIL_P(args[i])) return c10::nullopt;
-  auto str = Rice::detail::From_Ruby<std::string>().convert(args[i]);
-  return c10::string_view(str.data(), str.size());
+  return c10::string_view(RSTRING_PTR(args[i]), RSTRING_LEN(args[i]));
 }
 
 inline int64_t RubyArgs::toInt64(int i) {

data/ext/torch/utils.h

@@ -16,12 +16,6 @@ inline VALUE THPUtils_internSymbol(const std::string& str) {
   return Rice::Symbol(str);
 }
 
-inline std::string THPUtils_unpackSymbol(VALUE obj) {
-  Check_Type(obj, T_SYMBOL);
-  obj = rb_funcall(obj, rb_intern("to_s"), 0);
-  return std::string(RSTRING_PTR(obj), RSTRING_LEN(obj));
-}
-
 inline std::string THPUtils_unpackString(VALUE obj) {
   Check_Type(obj, T_STRING);
   return std::string(RSTRING_PTR(obj), RSTRING_LEN(obj));

data/lib/torch/inspector.rb

@@ -247,7 +247,7 @@ module Torch
       # length includes spaces and comma between elements
       element_length = formatter.width + 2
       elements_per_line = [1, ((PRINT_OPTS[:linewidth] - indent) / element_length.to_f).floor.to_i].max
-      char_per_line = element_length * elements_per_line
+      _char_per_line = element_length * elements_per_line
 
       if summarize && slf.size(0) > 2 * PRINT_OPTS[:edgeitems]
         data = (

data/lib/torch/nn/functional.rb

@@ -571,7 +571,7 @@ module Torch
         end
 
         def _interp_output_size(closed_over_args)
-          input, size, scale_factor, recompute_scale_factor = closed_over_args
+          input, size, scale_factor, _recompute_scale_factor = closed_over_args
           dim = input.dim - 2
           if size.nil? && scale_factor.nil?
             raise ArgumentError, "either size or scale_factor should be defined"

data/lib/torch/nn/functional_attention.rb

@@ -56,7 +56,7 @@ module Torch
           attn_mask: nil, dropout_p: 0.0
         )
 
-          b, nt, e = q.shape
+          _b, _nt, e = q.shape
 
           q = q / Math.sqrt(e)
 

data/lib/torch/tensor.rb

@@ -106,6 +106,7 @@ module Torch
       size(0)
     end
 
+    remove_method :item
     def item
       if numel != 1
         raise Error, "only one element tensors can be converted to Ruby scalars"
@@ -133,18 +134,10 @@ module Torch
       cls.from_string(_data_str).reshape(*shape)
     end
 
-    def new_ones(*size, **options)
-      Torch.ones_like(Torch.empty(*size), **options)
-    end
-
     def requires_grad=(requires_grad)
       _requires_grad!(requires_grad)
     end
 
-    def requires_grad!(requires_grad = true)
-      _requires_grad!(requires_grad)
-    end
-
     def type(dtype)
       if dtype.is_a?(Class)
         raise Error, "Invalid type: #{dtype}" unless TENSOR_TYPE_CLASSES.include?(dtype)

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

@@ -29,7 +29,7 @@ module Torch
 
           # 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
+          _base_seed = Torch.empty([], dtype: :int64).random!.item
 
           indexes =
             if @shuffle

data/lib/torch/version.rb

@@ -1,3 +1,3 @@
 module Torch
-  VERSION = "0.9.0"
+  VERSION = "0.9.1"
 end

data/lib/torch.rb

@@ -377,8 +377,6 @@ module Torch
       to_ruby(_load(File.binread(f)))
     end
 
-    # --- begin tensor creation: https://pytorch.org/cppdocs/notes/tensor_creation.html ---
-
     def tensor(data, **options)
       if options[:dtype].nil? && defined?(Numo::NArray) && data.is_a?(Numo::NArray)
         numo_to_dtype = _dtype_to_numo.map(&:reverse).to_h
@@ -411,41 +409,6 @@ module Torch
       _tensor(data, size, tensor_options(**options))
     end
 
-    # --- begin like ---
-
-    def ones_like(input, **options)
-      ones(input.size, **like_options(input, options))
-    end
-
-    def empty_like(input, **options)
-      empty(input.size, **like_options(input, options))
-    end
-
-    def full_like(input, fill_value, **options)
-      full(input.size, fill_value, **like_options(input, options))
-    end
-
-    def rand_like(input, **options)
-      rand(input.size, **like_options(input, options))
-    end
-
-    def randint_like(input, low, high = nil, **options)
-      # ruby doesn't support input, low = 0, high, ...
-      if high.nil?
-        high = low
-        low = 0
-      end
-      randint(low, high, input.size, **like_options(input, options))
-    end
-
-    def randn_like(input, **options)
-      randn(input.size, **like_options(input, options))
-    end
-
-    def zeros_like(input, **options)
-      zeros(input.size, **like_options(input, options))
-    end
-
     # center option
     def stft(input, n_fft, hop_length: nil, win_length: nil, window: nil, center: true, pad_mode: "reflect", normalized: false, onesided: true, return_complex: nil)
       if center
@@ -572,13 +535,5 @@ module Torch
       end
       options
     end
-
-    def like_options(input, options)
-      options = options.dup
-      options[:dtype] ||= input.dtype
-      options[:layout] ||= input.layout
-      options[:device] ||= input.device
-      options
-    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: torch-rb
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.1
 platform: ruby
 authors:
 - Andrew Kane
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-23 00:00:00.000000000 Z
+date: 2022-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rice
@@ -227,7 +227,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.3.3
 signing_key:
 specification_version: 4
 summary: Deep learning for Ruby, powered by LibTorch