torch-rb 0.17.1 → 0.19.0

data/ext/torch/device.cpp

@@ -8,7 +8,7 @@ void init_device(Rice::Module& m) {
   Rice::define_class_under<torch::Device>(m, "Device")
     .define_constructor(Rice::Constructor<torch::Device, const std::string&>())
     .define_method(
-      "index",
+      "_index",
       [](torch::Device& self) {
         return self.index();
       })
@@ -23,5 +23,10 @@ void init_device(Rice::Module& m) {
         std::stringstream s;
         s << self.type();
         return s.str();
+      })
+    .define_method(
+      "_str",
+      [](torch::Device& self) {
+        return self.str();
       });
 }

data/ext/torch/ext.cpp

@@ -31,6 +31,7 @@ void Init_ext()
 
   // keep this order
   init_torch(m);
+  init_device(m);
   init_tensor(m, rb_cTensor, rb_cTensorOptions);
   init_nn(m);
   init_fft(m);
@@ -39,7 +40,6 @@ void Init_ext()
 
   init_backends(m);
   init_cuda(m);
-  init_device(m);
   init_generator(m, rb_cGenerator);
   init_ivalue(m, rb_cIValue);
   init_random(m);

data/ext/torch/tensor.cpp

@@ -212,11 +212,9 @@ void init_tensor(Rice::Module& m, Rice::Class& c, Rice::Class& rb_cTensorOptions
         return s.str();
       })
     .define_method(
-      "device",
+      "_device",
       [](Tensor& self) {
-        std::stringstream s;
-        s << self.device();
-        return s.str();
+        return self.device();
       })
     .define_method(
       "_data_str",

data/ext/torch/torch.cpp

@@ -9,19 +9,14 @@
 #include "utils.h"
 
 template<typename T>
-torch::Tensor make_tensor(Rice::Array a, std::vector<int64_t> size, const torch::TensorOptions &options) {
+torch::Tensor make_tensor(Rice::Array a, const std::vector<int64_t> &size, const torch::TensorOptions &options) {
   std::vector<T> vec;
+  vec.reserve(a.size());
   for (long i = 0; i < a.size(); i++) {
     vec.push_back(Rice::detail::From_Ruby<T>().convert(a[i].value()));
   }
 
-  // hack for requires_grad error
-  auto requires_grad = options.requires_grad();
-  torch::Tensor t = torch::tensor(vec, options.requires_grad(c10::nullopt));
-  if (requires_grad) {
-    t.set_requires_grad(true);
-  }
-
+  torch::Tensor t = torch::tensor(vec, options);
   return t.reshape(size);
 }
 
@@ -46,12 +41,12 @@ void init_torch(Rice::Module& m) {
     // config
     .define_singleton_function(
       "show_config",
-      [] {
+      []() {
         return torch::show_config();
       })
     .define_singleton_function(
       "parallel_info",
-      [] {
+      []() {
         return torch::get_parallel_info();
       })
     // begin operations
@@ -74,13 +69,13 @@ void init_torch(Rice::Module& m) {
       })
     .define_singleton_function(
       "_from_blob",
-      [](Rice::String s, std::vector<int64_t> size, const torch::TensorOptions &options) {
+      [](Rice::String s, const std::vector<int64_t> &size, const torch::TensorOptions &options) {
         void *data = const_cast<char *>(s.c_str());
         return torch::from_blob(data, size, options);
       })
     .define_singleton_function(
       "_tensor",
-      [](Rice::Array a, std::vector<int64_t> size, const torch::TensorOptions &options) {
+      [](Rice::Array a, const std::vector<int64_t> &size, const torch::TensorOptions &options) {
         auto dtype = options.dtype();
         if (dtype == torch::kByte) {
           return make_tensor<uint8_t>(a, size, options);

data/ext/torch/utils.h

@@ -6,7 +6,7 @@
 #include <rice/stl.hpp>
 
 static_assert(
-  TORCH_VERSION_MAJOR == 2 && TORCH_VERSION_MINOR == 4,
+  TORCH_VERSION_MAJOR == 2 && TORCH_VERSION_MINOR == 6,
   "Incompatible LibTorch version"
 );
 

data/lib/torch/device.rb

@@ -0,0 +1,25 @@
+module Torch
+  class Device
+    def index
+      index? ? _index : nil
+    end
+
+    def inspect
+      extra = ", index: #{index.inspect}" if index?
+      "device(type: #{type.inspect}#{extra})"
+    end
+    alias_method :to_s, :inspect
+
+    def ==(other)
+      eql?(other)
+    end
+
+    def eql?(other)
+      other.is_a?(Device) && other.type == type && other.index == index
+    end
+
+    def hash
+      [type, index].hash
+    end
+  end
+end

data/lib/torch/tensor.rb

@@ -24,6 +24,7 @@ module Torch
     alias_method :^, :logical_xor
     alias_method :<<, :__lshift__
     alias_method :>>, :__rshift__
+    alias_method :~, :bitwise_not
 
     def self.new(*args)
       FloatTensor.new(*args)
@@ -208,5 +209,10 @@ module Torch
         raise TypeError, "#{self.class} can't be coerced into #{other.class}"
       end
     end
+
+    # TODO return Device instead of String in 0.19.0
+    def device
+      _device._str
+    end
   end
 end

data/lib/torch/version.rb

@@ -1,3 +1,3 @@
 module Torch
-  VERSION = "0.17.1"
+  VERSION = "0.19.0"
 end

data/lib/torch.rb

@@ -8,6 +8,7 @@ require "set"
 require "tmpdir"
 
 # modules
+require_relative "torch/device"
 require_relative "torch/inspector"
 require_relative "torch/tensor"
 require_relative "torch/version"
@@ -382,7 +383,11 @@ module Torch
     alias_method :set_grad_enabled, :grad_enabled
 
     def device(str)
-      Device.new(str)
+      if str.is_a?(Device)
+        str
+      else
+        Device.new(str)
+      end
     end
 
     def save(obj, f)

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: torch-rb
 version: !ruby/object:Gem::Version
-  version: 0.17.1
+  version: 0.19.0
 platform: ruby
 authors:
 - Andrew Kane
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-08-19 00:00:00.000000000 Z
+date: 2025-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rice
@@ -16,15 +15,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: 4.3.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.1'
-description:
+        version: 4.3.3
 email: andrew@ankane.org
 executables: []
 extensions:
@@ -65,6 +63,7 @@ files:
 - ext/torch/wrap_outputs.h
 - lib/torch-rb.rb
 - lib/torch.rb
+- lib/torch/device.rb
 - lib/torch/hub.rb
 - lib/torch/inspector.rb
 - lib/torch/nn/adaptive_avg_pool1d.rb
@@ -224,7 +223,6 @@ homepage: https://github.com/ankane/torch.rb
 licenses:
 - BSD-3-Clause
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -239,8 +237,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.11
-signing_key:
+rubygems_version: 3.6.2
 specification_version: 4
 summary: Deep learning for Ruby, powered by LibTorch
 test_files: []