torch-rb 0.5.3 → 0.6.0

data/ext/torch/tensor_functions.h

@@ -3,4 +3,4 @@
 
 #pragma once
 
-void add_tensor_functions(Module m);
+void add_tensor_functions(Rice::Module& m);

data/ext/torch/torch.cpp

@@ -0,0 +1,86 @@
+#include <torch/torch.h>
+
+#include <rice/Module.hpp>
+
+#include "torch_functions.h"
+#include "templates.h"
+#include "utils.h"
+
+void init_torch(Rice::Module& m) {
+  m.add_handler<torch::Error>(handle_error);
+  add_torch_functions(m);
+  m.define_singleton_method(
+      "grad_enabled?",
+      *[]() {
+        return torch::GradMode::is_enabled();
+      })
+    .define_singleton_method(
+      "_set_grad_enabled",
+      *[](bool enabled) {
+        torch::GradMode::set_enabled(enabled);
+      })
+    .define_singleton_method(
+      "manual_seed",
+      *[](uint64_t seed) {
+        return torch::manual_seed(seed);
+      })
+    // config
+    .define_singleton_method(
+      "show_config",
+      *[] {
+        return torch::show_config();
+      })
+    .define_singleton_method(
+      "parallel_info",
+      *[] {
+        return torch::get_parallel_info();
+      })
+    // begin operations
+    .define_singleton_method(
+      "_save",
+      *[](const torch::IValue &value) {
+        auto v = torch::pickle_save(value);
+        std::string str(v.begin(), v.end());
+        return str;
+      })
+    .define_singleton_method(
+      "_load",
+      *[](const std::string &s) {
+        std::vector<char> v;
+        std::copy(s.begin(), s.end(), std::back_inserter(v));
+        // https://github.com/pytorch/pytorch/issues/20356#issuecomment-567663701
+        return torch::pickle_load(v);
+      })
+    .define_singleton_method(
+      "_from_blob",
+      *[](Rice::String s, 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_method(
+      "_tensor",
+      *[](Rice::Array a, std::vector<int64_t> size, const torch::TensorOptions &options) {
+        auto dtype = options.dtype();
+        torch::Tensor t;
+        if (dtype == torch::kBool) {
+          std::vector<uint8_t> vec;
+          for (long i = 0; i < a.size(); i++) {
+            vec.push_back(from_ruby<bool>(a[i]));
+          }
+          t = torch::tensor(vec, options);
+        } else {
+          std::vector<float> vec;
+          for (long i = 0; i < a.size(); i++) {
+            vec.push_back(from_ruby<float>(a[i]));
+          }
+          // hack for requires_grad error
+          if (options.requires_grad()) {
+            t = torch::tensor(vec, options.requires_grad(c10::nullopt));
+            t.set_requires_grad(true);
+          } else {
+            t = torch::tensor(vec, options);
+          }
+        }
+        return t.reshape(size);
+      });
+}

data/ext/torch/torch_functions.h

@@ -3,4 +3,4 @@
 
 #pragma once
 
-void add_torch_functions(Module m);
+void add_torch_functions(Rice::Module& m);

data/ext/torch/utils.h

@@ -1,13 +1,20 @@
 #pragma once
 
+#include <rice/Exception.hpp>
 #include <rice/Symbol.hpp>
 
+// TODO find better place
+inline void handle_error(torch::Error const & ex)
+{
+  throw Rice::Exception(rb_eRuntimeError, ex.what_without_backtrace());
+}
+
 // keep THP prefix for now to make it easier to compare code
 
 extern VALUE THPVariableClass;
 
 inline VALUE THPUtils_internSymbol(const std::string& str) {
-  return Symbol(str);
+  return Rice::Symbol(str);
 }
 
 inline std::string THPUtils_unpackSymbol(VALUE obj) {

data/lib/torch.rb

@@ -337,25 +337,24 @@ module Torch
       }
     end
 
-    def no_grad
-      previous_value = grad_enabled?
-      begin
-        _set_grad_enabled(false)
-        yield
-      ensure
-        _set_grad_enabled(previous_value)
-      end
+    def no_grad(&block)
+      grad_enabled(false, &block)
+    end
+
+    def enable_grad(&block)
+      grad_enabled(true, &block)
     end
 
-    def enable_grad
+    def grad_enabled(value)
       previous_value = grad_enabled?
       begin
-        _set_grad_enabled(true)
+        _set_grad_enabled(value)
         yield
       ensure
         _set_grad_enabled(previous_value)
       end
     end
+    alias_method :set_grad_enabled, :grad_enabled
 
     def device(str)
       Device.new(str)

data/lib/torch/nn/linear.rb

@@ -1,6 +1,8 @@
 module Torch
   module NN
     class Linear < Module
+      attr_reader :in_features, :out_features
+
       def initialize(in_features, out_features, bias: true)
         super()
         @in_features = in_features

data/lib/torch/nn/module.rb

@@ -286,6 +286,12 @@ module Torch
           named_buffers[name]
         elsif named_modules.key?(name)
           named_modules[name]
+        elsif method.end_with?("=") && named_modules.key?(method[0..-2])
+          if instance_variable_defined?("@#{method[0..-2]}")
+            instance_variable_set("@#{method[0..-2]}", *args)
+          else
+            raise NotImplementedYet
+          end
         else
           super
         end

data/lib/torch/nn/parameter.rb

@@ -3,7 +3,7 @@ module Torch
     class Parameter < Tensor
       def self.new(data = nil, requires_grad: true)
         data = Tensor.new unless data
-        Tensor._make_subclass(data, requires_grad)
+        _make_subclass(data, requires_grad)
       end
 
       def inspect

data/lib/torch/tensor.rb

@@ -135,6 +135,10 @@ module Torch
       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

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

@@ -60,7 +60,7 @@ module Torch
           when Array
             batch.transpose.map { |v| default_convert(v) }
           else
-            raise NotImplementedYet
+            batch
           end
         end
 

data/lib/torch/version.rb

@@ -1,3 +1,3 @@
 module Torch
-  VERSION = "0.5.3"
+  VERSION = "0.6.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: torch-rb
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.6.0
 platform: ruby
 authors:
 - Andrew Kane
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-14 00:00:00.000000000 Z
+date: 2021-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rice
@@ -24,92 +24,8 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '2.2'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rake-compiler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: minitest
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '5'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '5'
-- !ruby/object:Gem::Dependency
-  name: numo-narray
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: torchvision
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.1.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.1.1
 description:
-email: andrew@chartkick.com
+email: andrew@ankane.org
 executables: []
 extensions:
 - ext/torch/extconf.rb
@@ -121,13 +37,20 @@ files:
 - codegen/function.rb
 - codegen/generate_functions.rb
 - codegen/native_functions.yaml
+- ext/torch/cuda.cpp
+- ext/torch/device.cpp
 - ext/torch/ext.cpp
 - ext/torch/extconf.rb
+- ext/torch/ivalue.cpp
+- ext/torch/nn.cpp
 - ext/torch/nn_functions.h
+- ext/torch/random.cpp
 - ext/torch/ruby_arg_parser.cpp
 - ext/torch/ruby_arg_parser.h
 - ext/torch/templates.h
+- ext/torch/tensor.cpp
 - ext/torch/tensor_functions.h
+- ext/torch/torch.cpp
 - ext/torch/torch_functions.h
 - ext/torch/utils.h
 - ext/torch/wrap_outputs.h
@@ -282,7 +205,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.4'
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="