torch-rb 0.14.1 → 0.16.0

data/ext/torch/extconf.rb

@@ -52,6 +52,9 @@ $INCFLAGS += " -I#{inc}"
 $INCFLAGS += " -I#{inc}/torch/csrc/api/include"
 
 $LDFLAGS += " -Wl,-rpath,#{lib}"
+if RbConfig::CONFIG["host_os"] =~ /darwin/i && RbConfig::CONFIG["host_cpu"] =~ /arm|aarch64/i && Dir.exist?("/opt/homebrew/opt/libomp/lib")
+  $LDFLAGS += ",-rpath,/opt/homebrew/opt/libomp/lib"
+end
 $LDFLAGS += ":#{cuda_lib}/stubs:#{cuda_lib}" if with_cuda
 
 # https://github.com/pytorch/pytorch/blob/v1.5.0/torch/utils/cpp_extension.py#L1232-L1238

data/ext/torch/templates.h

@@ -169,27 +169,4 @@ namespace Rice::detail
       }
     }
   };
-
-  template<typename T>
-  struct Type<torch::optional<T>>
-  {
-    static bool verify()
-    {
-      return true;
-    }
-  };
-
-  template<typename T>
-  class From_Ruby<torch::optional<T>>
-  {
-  public:
-    torch::optional<T> convert(VALUE x)
-    {
-      if (NIL_P(x)) {
-        return torch::nullopt;
-      } else {
-        return torch::optional<T>{From_Ruby<T>().convert(x)};
-      }
-    }
-  };
 }

data/ext/torch/tensor.cpp

@@ -103,6 +103,7 @@ void init_tensor(Rice::Module& m, Rice::Class& c, Rice::Class& rb_cTensorOptions
 
   rb_cTensor
     .define_method("cuda?", [](Tensor& self) { return self.is_cuda(); })
+    .define_method("mps?", [](Tensor& self) { return self.is_mps(); })
     .define_method("sparse?", [](Tensor& self) { return self.is_sparse(); })
     .define_method("quantized?", [](Tensor& self) { return self.is_quantized(); })
     .define_method("dim", [](Tensor& self) { return self.dim(); })

data/ext/torch/utils.h

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

data/lib/torch/inspector.rb

@@ -31,9 +31,9 @@ module Torch
           return if nonzero_finite_vals.numel == 0
 
           # Convert to double for easy calculation. HalfTensor overflows with 1e8, and there's no div() on CPU.
-          nonzero_finite_abs = nonzero_finite_vals.abs.double
-          nonzero_finite_min = nonzero_finite_abs.min.double
-          nonzero_finite_max = nonzero_finite_abs.max.double
+          nonzero_finite_abs = tensor_totype(nonzero_finite_vals.abs)
+          nonzero_finite_min = tensor_totype(nonzero_finite_abs.min)
+          nonzero_finite_max = tensor_totype(nonzero_finite_abs.max)
 
           nonzero_finite_vals.each do |value|
             if value.item != value.item.ceil
@@ -107,6 +107,11 @@ module Torch
         # Ruby throws error when negative, Python doesn't
         " " * [@max_width - ret.size, 0].max + ret
       end
+
+      def tensor_totype(t)
+        dtype = t.mps? ? :float : :double
+        t.to(dtype: dtype)
+      end
     end
 
     def inspect

data/lib/torch/nn/elu.rb

@@ -0,0 +1,20 @@
+module Torch
+  module NN
+    class ELU < Module
+      def initialize(alpha: 1, inplace: false)
+        super()
+        @alpha = alpha
+        @inplace = inplace
+      end
+
+      def forward(input)
+        F.elu(input, alpha: @alpha, inplace: @inplace)
+      end
+
+      def extra_inspect
+        inplace_str = @inplace ? ", inplace: true" : ""
+        format("alpha: %s", @alpha) + inplace_str
+      end
+    end
+  end
+end

data/lib/torch/nn/functional.rb

@@ -174,6 +174,18 @@ module Torch
 
         # activation layers
 
+        def elu(input, alpha: 1, inplace: false)
+          if inplace
+            NN.elu!(input, alpha)
+          else
+            NN.elu(input, alpha)
+          end
+        end
+
+        def gelu(input, approximate: 'none')
+          NN.gelu(input, approximate: approximate)
+        end
+
         def hardshrink(input, lambd = 0.5)
           Torch.hardshrink(input, lambd)
         end

data/lib/torch/nn/gelu.rb

@@ -0,0 +1,18 @@
+module Torch
+  module NN
+    class GELU < Module
+      def initialize(approximate: 'none')
+        super()
+        @approximate = approximate
+      end
+
+      def forward(input)
+        F.gelu(input, approximate: @approximate)
+      end
+
+      def extra_inspect
+        "approximate: #{@approximate.inspect}"
+      end
+    end
+  end
+end

data/lib/torch/nn/leaky_relu.rb

@@ -13,7 +13,7 @@ module Torch
 
       def extra_inspect
         inplace_str = @inplace ? ", inplace: true" : ""
-        format("negative_slope: %s%s", @negative_slope, inplace_str)
+        format("negative_slope: %s", @negative_slope) + inplace_str
       end
     end
   end

data/lib/torch/version.rb

@@ -1,3 +1,3 @@
 module Torch
-  VERSION = "0.14.1"
+  VERSION = "0.16.0"
 end

data/lib/torch.rb

@@ -123,6 +123,8 @@ require_relative "torch/nn/dropout3d"
 require_relative "torch/nn/feature_alpha_dropout"
 
 # nn activations
+require_relative "torch/nn/elu"
+require_relative "torch/nn/gelu"
 require_relative "torch/nn/hardshrink"
 require_relative "torch/nn/leaky_relu"
 require_relative "torch/nn/log_sigmoid"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: torch-rb
 version: !ruby/object:Gem::Version
-  version: 0.14.1
+  version: 0.16.0
 platform: ruby
 authors:
 - Andrew Kane
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-12-27 00:00:00.000000000 Z
+date: 2024-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rice
@@ -43,24 +43,17 @@ files:
 - ext/torch/ext.cpp
 - 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
 - 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/sparse_functions.h
 - ext/torch/special.cpp
-- ext/torch/special_functions.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
 - lib/torch-rb.rb
@@ -103,12 +96,14 @@ files:
 - lib/torch/nn/dropout2d.rb
 - lib/torch/nn/dropout3d.rb
 - lib/torch/nn/dropoutnd.rb
+- lib/torch/nn/elu.rb
 - lib/torch/nn/embedding.rb
 - lib/torch/nn/embedding_bag.rb
 - lib/torch/nn/feature_alpha_dropout.rb
 - lib/torch/nn/fold.rb
 - lib/torch/nn/functional.rb
 - lib/torch/nn/functional_attention.rb
+- lib/torch/nn/gelu.rb
 - lib/torch/nn/group_norm.rb
 - lib/torch/nn/gru.rb
 - lib/torch/nn/hardshrink.rb
@@ -230,14 +225,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '3'
+      version: '3.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.3
+rubygems_version: 3.5.11
 signing_key:
 specification_version: 4
 summary: Deep learning for Ruby, powered by LibTorch

data/ext/torch/fft_functions.h

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

data/ext/torch/linalg_functions.h

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

data/ext/torch/nn_functions.h

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

data/ext/torch/sparse_functions.h

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

data/ext/torch/special_functions.h

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

data/ext/torch/tensor_functions.h

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

data/ext/torch/torch_functions.h

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