torch-rb 0.12.0 → 0.12.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 24617a6191c4d1e42ff0d5885c0762db75d034ee52817d70004ddc52025890dd
-  data.tar.gz: 7036f3c7fac8a1aac22914ec2811b8771464baeb847052e417b069f3897b3977
+  metadata.gz: ce853372191c85509a65417abeaa05c484976f24681246babf9bd00f8db16df1
+  data.tar.gz: 3327004180566a194c7de8288c260b8fe9487d80c25493d82e041cf4fc0062e2
 SHA512:
-  metadata.gz: 044166f526bea5fea0c4314abc55dfaf2410cdd5d7bce764ccb78329754fe284675dc0ecb55cf5a4546587221cf2361c8e215f1e9e067668ea5833c445bea961
-  data.tar.gz: e086d0dcc731fb3e810f8fb91d04d95bf3c5efd9cd35f053238be60479d8a47f2126ddad7ab2705d18a26175c6c4126f12be3f19962c2a69f24ad3ee551252b1
+  metadata.gz: d8b6b0f7bd8b79963931b6b28b6a6cee59be18b8f185e2acadc22487a27b5793edabf0fb8b80857c5dfc0eb036a27b67a55750b8dd3c8eb1d199f06323e2b919
+  data.tar.gz: ffcafd2e9e99d6654f9689dd021c874cf53847833e26207853b0051056ae7cfe0b5ff202036e9a38264198facfa2c66f83b6ee51815131b63aa350415139b614

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.12.1 (2023-01-29)
+
+- Added `Generator` class
+
 ## 0.12.0 (2022-11-05)
 
 - Updated LibTorch to 1.13.0

data/ext/torch/ext.cpp

@@ -12,6 +12,7 @@ void init_torch(Rice::Module& m);
 void init_backends(Rice::Module& m);
 void init_cuda(Rice::Module& m);
 void init_device(Rice::Module& m);
+void init_generator(Rice::Module& m, Rice::Class& rb_cGenerator);
 void init_ivalue(Rice::Module& m, Rice::Class& rb_cIValue);
 void init_random(Rice::Module& m);
 
@@ -23,6 +24,7 @@ void Init_ext()
   // need to define certain classes up front to keep Rice happy
   auto rb_cIValue = Rice::define_class_under<torch::IValue>(m, "IValue")
     .define_constructor(Rice::Constructor<torch::IValue>());
+  auto rb_cGenerator = Rice::define_class_under<torch::Generator>(m, "Generator");
   auto rb_cTensor = Rice::define_class_under<torch::Tensor>(m, "Tensor");
   auto rb_cTensorOptions = Rice::define_class_under<torch::TensorOptions>(m, "TensorOptions")
     .define_constructor(Rice::Constructor<torch::TensorOptions>());
@@ -38,6 +40,7 @@ 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/generator.cpp

@@ -0,0 +1,50 @@
+#include <torch/torch.h>
+
+#include <rice/rice.hpp>
+
+#include "utils.h"
+
+void init_generator(Rice::Module& m, Rice::Class& rb_cGenerator) {
+  // https://github.com/pytorch/pytorch/blob/master/torch/csrc/Generator.cpp
+  rb_cGenerator
+    .add_handler<torch::Error>(handle_error)
+    .define_singleton_function(
+      "new",
+      []() {
+        // TODO support more devices
+        return torch::make_generator<torch::CPUGeneratorImpl>();
+      })
+    .define_method(
+      "device",
+      [](torch::Generator& self) {
+        return self.device();
+      })
+    .define_method(
+      "initial_seed",
+      [](torch::Generator& self) {
+        return self.current_seed();
+      })
+    .define_method(
+      "manual_seed",
+      [](torch::Generator& self, uint64_t seed) {
+        self.set_current_seed(seed);
+        return self;
+      })
+    .define_method(
+      "seed",
+      [](torch::Generator& self) {
+        return self.seed();
+      })
+    .define_method(
+      "state",
+      [](torch::Generator& self) {
+        return self.get_state();
+      })
+    .define_method(
+      "state=",
+      [](torch::Generator& self, const torch::Tensor& state) {
+        self.set_state(state);
+      });
+
+  THPGeneratorClass = rb_cGenerator.value();
+}

data/ext/torch/ruby_arg_parser.cpp

@@ -2,6 +2,7 @@
 
 #include "ruby_arg_parser.h"
 
+VALUE THPGeneratorClass = Qnil;
 VALUE THPVariableClass = Qnil;
 
 static std::unordered_map<std::string, ParameterType> type_map = {
@@ -244,7 +245,7 @@ auto FunctionParameter::check(VALUE obj, int argnum) -> bool
       return size > 0 && FIXNUM_P(obj);
     }
     case ParameterType::FLOAT_LIST: return (RB_TYPE_P(obj, T_ARRAY));
-    case ParameterType::GENERATOR: return false; // return THPGenerator_Check(obj);
+    case ParameterType::GENERATOR: return THPGenerator_Check(obj);
     case ParameterType::BOOL: return obj == Qtrue || obj == Qfalse;
     case ParameterType::STORAGE: return false; // return isStorage(obj);
     // case ParameterType::PYOBJECT: return true;

data/ext/torch/ruby_arg_parser.h

@@ -223,7 +223,7 @@ inline c10::OptionalArray<c10::SymInt> RubyArgs::symintlistOptional(int i) {
 
 inline c10::optional<at::Generator> RubyArgs::generator(int i) {
   if (NIL_P(args[i])) return c10::nullopt;
-  throw std::runtime_error("generator not supported yet");
+  return Rice::detail::From_Ruby<torch::Generator>().convert(args[i]);
 }
 
 inline at::Storage RubyArgs::storage(int i) {

data/ext/torch/utils.h

@@ -17,6 +17,7 @@ inline void handle_error(torch::Error const & ex) {
 
 // keep THP prefix for now to make it easier to compare code
 
+extern VALUE THPGeneratorClass;
 extern VALUE THPVariableClass;
 
 inline VALUE THPUtils_internSymbol(const std::string& str) {
@@ -44,6 +45,10 @@ inline bool THPUtils_checkScalar(VALUE obj) {
   return FIXNUM_P(obj) || RB_FLOAT_TYPE_P(obj) || RB_TYPE_P(obj, T_COMPLEX);
 }
 
+inline bool THPGenerator_Check(VALUE obj) {
+  return rb_obj_is_kind_of(obj, THPGeneratorClass);
+}
+
 inline bool THPVariable_Check(VALUE obj) {
   return rb_obj_is_kind_of(obj, THPVariableClass);
 }

data/lib/torch/version.rb

@@ -1,3 +1,3 @@
 module Torch
-  VERSION = "0.12.0"
+  VERSION = "0.12.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: torch-rb
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.12.1
 platform: ruby
 authors:
 - Andrew Kane
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-11-05 00:00:00.000000000 Z
+date: 2023-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rice
@@ -44,6 +44,7 @@ files:
 - ext/torch/extconf.rb
 - ext/torch/fft.cpp
 - ext/torch/fft_functions.h
+- ext/torch/generator.cpp
 - ext/torch/ivalue.cpp
 - ext/torch/linalg.cpp
 - ext/torch/linalg_functions.h
@@ -229,7 +230,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.4.1
 signing_key:
 specification_version: 4
 summary: Deep learning for Ruby, powered by LibTorch