torch-rb 0.8.0 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fdc46d7eba97851841de58e63b35badbd579ce1bc2a3e311998db03956cb84ad
-  data.tar.gz: 944520049bd683d303e4587d18394eeb13102aa9f4addeca87875ee214806de4
+  metadata.gz: d52cf2bf4770e9166623614f6071e5180e9492b0063757be8bdec73a2c930b38
+  data.tar.gz: 1b650a3277d1aebe28cdd5d75ce54420feba7a1c9a2046335c9271c72eb3f74f
 SHA512:
-  metadata.gz: 9026cbd9b0cdf286e79e7b296f2fae95712bd553c2cd58a34044feeed482f1ed2630b7b1e852a82e87d1011478b7e24d442d634f07de67b2c0a6a8e1cf6ade9a
-  data.tar.gz: 193e25fc5065d42160b0584f3e53512606c1b4329c6d872b90a972d7c4d46a4be81eef8c709e3060339c96758fe504dc8618da9e69ff411d9351d528983da72b
+  metadata.gz: 3afad67c5ca6cedc4925dab1aadc37541daac6752a8b508a8d4bd6cd3b25b71600ed32625a65651bf150d6ddd519ec86ca7b9ccd2f12022366ed692603f65c1a
+  data.tar.gz: 970fa451044ce68d60e13f2da297ea8e20e53f01a1ffee31f152f190baf5d8f709f9be3defcd6b24739499cb400c5448abd43939a451be826e87b2e62eba3cac

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## 0.8.1 (2021-06-15)
+
+- Added `Backends` module
+- Added `FFT` module
+- Added `Linalg` module
+- Added `Special` module
+
 ## 0.8.0 (2021-06-15)
 
 - Updated LibTorch to 1.9.0

data/codegen/generate_functions.rb

@@ -11,6 +11,9 @@ def generate_functions
   generate_files("torch", :define_singleton_method, functions[:torch])
   generate_files("tensor", :define_method, functions[:tensor])
   generate_files("nn", :define_singleton_method, functions[:nn])
+  generate_files("fft", :define_singleton_method, functions[:fft])
+  generate_files("linalg", :define_singleton_method, functions[:linalg])
+  generate_files("special", :define_singleton_method, functions[:special])
 end
 
 def load_functions
@@ -38,10 +41,26 @@ end
 
 def group_functions(functions)
   nn_functions, other_functions = functions.partition { |f| f.python_module == "nn" }
+  linalg_functions, other_functions = other_functions.partition { |f| f.python_module == "linalg" }
+  fft_functions, other_functions = other_functions.partition { |f| f.python_module == "fft" }
+  special_functions, other_functions = other_functions.partition { |f| f.python_module == "special" }
+  unexpected_functions, other_functions = other_functions.partition { |f| f.python_module }
   torch_functions = other_functions.select { |f| f.variants.include?("function") }
   tensor_functions = other_functions.select { |f| f.variants.include?("method") }
 
-  {torch: torch_functions, tensor: tensor_functions, nn: nn_functions}
+  if unexpected_functions.any?
+    unexpected_modules = unexpected_functions.map(&:python_module).uniq
+    raise "Unexpected modules: #{unexpected_modules.join(", ")}"
+  end
+
+  {
+    torch: torch_functions,
+    tensor: tensor_functions,
+    nn: nn_functions,
+    linalg: linalg_functions,
+    fft: fft_functions,
+    special: special_functions
+  }
 end
 
 def generate_files(type, def_method, functions)
@@ -111,11 +130,14 @@ def generate_attach_def(name, type, def_method)
     end
 
   ruby_name = "_#{ruby_name}" if ["size", "stride", "random!", "stft"].include?(ruby_name)
+  ruby_name = ruby_name.sub(/\Afft_/, "") if type == "fft"
+  ruby_name = ruby_name.sub(/\Alinalg_/, "") if type == "linalg"
+  ruby_name = ruby_name.sub(/\Aspecial_/, "") if type == "special"
 
   # cast for Ruby < 2.7 https://github.com/thisMagpie/fftw/issues/22#issuecomment-49508900
   cast = RUBY_VERSION.to_f > 2.7 ? "" : "(VALUE (*)(...)) "
 
-  "rb_#{def_method}(m, \"#{ruby_name}\", #{cast}#{type}_#{name}, -1);"
+  "rb_#{def_method}(m, \"#{ruby_name}\", #{cast}#{full_name(name, type)}, -1);"
 end
 
 def generate_method_def(name, functions, type, def_method)
@@ -128,7 +150,7 @@ def generate_method_def(name, functions, type, def_method)
 
   template = <<~EOS
     // #{name}
-    static VALUE #{type}_#{name}(int argc, VALUE* argv, VALUE self_)
+    static VALUE #{full_name(name, type)}(int argc, VALUE* argv, VALUE self_)
     {
       HANDLE_TH_ERRORS#{assign_self}
       static RubyArgParser parser({
@@ -560,3 +582,11 @@ def signature_type(param)
   type += "?" if param[:optional]
   type
 end
+
+def full_name(name, type)
+  if %w(fft linalg special).include?(type) && name.start_with?("#{type}_")
+    name
+  else
+    "#{type}_#{name}"
+  end
+end

data/ext/torch/backends.cpp

@@ -0,0 +1,17 @@
+#include <torch/torch.h>
+
+#include <rice/rice.hpp>
+
+#include "utils.h"
+
+void init_backends(Rice::Module& m) {
+  auto rb_mBackends = Rice::define_module_under(m, "Backends");
+
+   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")
+    .add_handler<torch::Error>(handle_error)
+    .define_singleton_function("available?", &torch::hasMKL);
+}

data/ext/torch/ext.cpp

@@ -2,10 +2,14 @@
 
 #include <rice/rice.hpp>
 
+void init_fft(Rice::Module& m);
+void init_linalg(Rice::Module& m);
 void init_nn(Rice::Module& m);
+void init_special(Rice::Module& m);
 void init_tensor(Rice::Module& m, Rice::Class& c, Rice::Class& rb_cTensorOptions);
 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_ivalue(Rice::Module& m, Rice::Class& rb_cIValue);
@@ -27,7 +31,11 @@ void Init_ext()
   init_torch(m);
   init_tensor(m, rb_cTensor, rb_cTensorOptions);
   init_nn(m);
+  init_fft(m);
+  init_linalg(m);
+  init_special(m);
 
+  init_backends(m);
   init_cuda(m);
   init_device(m);
   init_ivalue(m, rb_cIValue);

data/ext/torch/fft.cpp

@@ -0,0 +1,13 @@
+#include <torch/torch.h>
+
+#include <rice/rice.hpp>
+
+#include "fft_functions.h"
+#include "templates.h"
+#include "utils.h"
+
+void init_fft(Rice::Module& m) {
+  auto rb_mFFT = Rice::define_module_under(m, "FFT");
+  rb_mFFT.add_handler<torch::Error>(handle_error);
+  add_fft_functions(rb_mFFT);
+}

data/ext/torch/fft_functions.h

@@ -0,0 +1,6 @@
+// generated by rake generate:functions
+// do not edit by hand
+
+#pragma once
+
+void add_fft_functions(Rice::Module& m);

data/ext/torch/linalg.cpp

@@ -0,0 +1,13 @@
+#include <torch/torch.h>
+
+#include <rice/rice.hpp>
+
+#include "linalg_functions.h"
+#include "templates.h"
+#include "utils.h"
+
+void init_linalg(Rice::Module& m) {
+  auto rb_mLinalg = Rice::define_module_under(m, "Linalg");
+  rb_mLinalg.add_handler<torch::Error>(handle_error);
+  add_linalg_functions(rb_mLinalg);
+}

data/ext/torch/linalg_functions.h

@@ -0,0 +1,6 @@
+// generated by rake generate:functions
+// do not edit by hand
+
+#pragma once
+
+void add_linalg_functions(Rice::Module& m);

data/ext/torch/special.cpp

@@ -0,0 +1,13 @@
+#include <torch/torch.h>
+
+#include <rice/rice.hpp>
+
+#include "special_functions.h"
+#include "templates.h"
+#include "utils.h"
+
+void init_special(Rice::Module& m) {
+  auto rb_mSpecial = Rice::define_module_under(m, "Special");
+  rb_mSpecial.add_handler<torch::Error>(handle_error);
+  add_special_functions(rb_mSpecial);
+}

data/ext/torch/special_functions.h

@@ -0,0 +1,6 @@
+// generated by rake generate:functions
+// do not edit by hand
+
+#pragma once
+
+void add_special_functions(Rice::Module& m);

data/lib/torch/version.rb

@@ -1,3 +1,3 @@
 module Torch
-  VERSION = "0.8.0"
+  VERSION = "0.8.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: torch-rb
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.1
 platform: ruby
 authors:
 - Andrew Kane
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-06-15 00:00:00.000000000 Z
+date: 2021-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rice
@@ -37,16 +37,23 @@ files:
 - codegen/function.rb
 - codegen/generate_functions.rb
 - codegen/native_functions.yaml
+- ext/torch/backends.cpp
 - ext/torch/cuda.cpp
 - ext/torch/device.cpp
 - ext/torch/ext.cpp
 - ext/torch/extconf.rb
+- ext/torch/fft.cpp
+- ext/torch/fft_functions.h
 - ext/torch/ivalue.cpp
+- ext/torch/linalg.cpp
+- ext/torch/linalg_functions.h
 - 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/special.cpp
+- ext/torch/special_functions.h
 - ext/torch/templates.h
 - ext/torch/tensor.cpp
 - ext/torch/tensor_functions.h