ndav-torch-tensor 0.0.1 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 36132b58b87a1b47538fb26518f86d24142210e817050ab50a26a2de8d7e1ef9
-  data.tar.gz: f628b3933bbda77e839df1631565c6158243a9cb6e7cbbc0bc343de0e19fd758
+  metadata.gz: 51c99b994468de49aacf7b24673dd7cd4e755b1bc1f5ea858d2aa85093aa299c
+  data.tar.gz: 9c0737070ab1b78c0f9ef3908b989060e6693d555380a6c793a3e4f26015dc57
 SHA512:
-  metadata.gz: d703a4c0eae1e1f1452571f62efe455e79bbf429ab430f51c13346bf9a5dafcec65c47d7421890d78a36b012e3771f620b61d20bb82d08060ca380f022f2c391
-  data.tar.gz: 1ad44e898483c80964c2458b8680ab58b7a031f049d2b8b9fed5c61d2bda81b27649b44c6c07bb9525ddbb4245c577b37bf4c4c6865a8328143d0f599c7e8146
+  metadata.gz: 4d03dcd52b4cc3db70cd26222a6c2c0f2ae8ab6f361aa593227860fd93f4a1ff8c1423040e63e37bc929e7a517f7f2210874af71fe030e84b7bf3b74b212a747
+  data.tar.gz: b6cdbdfdac3d49920e23bdbad413d92d97e2343536b9f295d25a5319d1fdf139321e67995f20ac6dec61525e48888c129d351269a36b1d3cea6fcf7cdc6c9a5e

data/.gitignore

@@ -1,2 +1,3 @@
 Gemfile.lock
 .bundle/
+pkg/

data/README.md

@@ -1,11 +1,30 @@
 NDAV::Torch::Tensor
 ===================
 
-MemoryView and pointer support for [Torch]::Tensor.
+[NDAV][] bridge for [Torch][]::Tensor.
+
+SYNOPSIS
+--------
+
+```ruby
+require "ndav/torch/tensor"
+
+torch = Torch.rand(2, 3)     # => Torch::Tensor
+ndav  = torch.to_ndav        # => NDAV
+torch = ndav.to_torch_tensor # => Torch::Tensor
+
+ndav  = NDAV.from_torch_tensor(torch)  # => NDAV
+torch = Torch::Tensor.from_ndav(ndav)  # => Torch::Tensor
+
+include NDAV::Converter
+ndav  = NDAV(torch)       # => NDAV
+torch = TorchTensor(ndav) # => Torch::NArray
+```
 
 LICENSE
 -------
 
 MIT license. See LICENSE.txt file.
 
+[NDAV]: https://kitaitimakoto.gitlab.io/ndav/
 [Torch]: https://github.com/ankane/torch.rb

data/lib/ndav/torch/tensor.rb

@@ -4,6 +4,19 @@ require "torch"
 
 class NDAV
   module Torch
+    module FromNDAV
+      def from_ndav(ndav)
+        dtype = Tensor::FORMAT_TO_TYPE[ndav.format]
+        raise ArgumentError, "unsupported format: #{input.format}, currently supported: #{Tensor::TYPE_TO_FORMAT.values}" unless dtype
+
+        opts = tensor_options(dtype:)
+        tensor = _from_blob_ref(ndav.to_s, [ndav.byte_size / ndav.item_size], opts)
+                   .reshape(ndav.shape)
+        tensor.instance_variable_set(:@ndav, ndav) # keep reference to NDAV to prevent GC
+        tensor
+      end
+    end
+
     module Tensor
       TYPE_TO_FORMAT = {
         int8: "c",
@@ -33,76 +46,45 @@ class NDAV
 
       TYPE_SIZES = TYPE_TO_FORMAT.transform_values {|format| ITEM_SIZES[format]}
 
-      module FromNDAV
-        def from_ndav(ndav)
-          dtype = FORMAT_TO_TYPE[ndav.format]
-          raise ArgumentError, "unsupported format: #{input.format}, currently supported: #{TYPE_TO_FORMAT.values}" unless dtype
-
-          opts = tensor_options(dtype:)
-          tensor = _from_blob_ref(ndav.to_s, [ndav.byte_size / ndav.item_size], opts)
-                     .reshape(ndav.shape)
-          tensor.instance_variable_set(:@ndav, ndav) # keep reference to NDAV to prevent GC
-          tensor
-        end
-      end
-
-      module ToNDAV
-        def to_ndav
+      module MemoryViewable
+        def ndav_descriptor(**)
           format = TYPE_TO_FORMAT[dtype]
-          raise ArgumentError, "unsupported dtype: #{dtype}, currently supported: #{TYPE_TO_FORMAT.keys}" unless format
-
-          ptr = Fiddle::Pointer.new(_data_ptr, numel * element_size)
-          NDAV.new(ptr, shape:, format:, lifetime: self)
-        end
-      end
+          unless format
+            warn "unsupported dtype: #{dtype}, currently supported: #{TYPE_TO_FORMAT.keys}"
+            return false
+          end
 
-      module FromTorchTensor
-        def from_torch_tensor(tensor)
-          tensor.to_ndav
-        end
-      end
+          byte_size = numel * element_size
 
-      module ToTorchTensor
-        def to_torch_tensor
-          ::Torch.from_ndav(self)
+          {
+            data: ::Fiddle::Pointer.new(_data_ptr, byte_size),
+            shape:,
+            strides: stride.collect {|s| s * element_size},
+            format:,
+            byte_size:,
+            readonly?: false,
+            sub_offsets: nil
+          }
         end
       end
 
       module Converter
-        if defined? ::NDAV::Converter::TorchTensor
-          def TorchTensor(array, *, **)
-            if array.kind_of? ::NDAV
-              array.to_torch_tensor
-            elsif array.respond_to? :to_torch_tensor
-              array.to_torch_tensor
-            elsif array.respond_to? :to_ndav
-              array.to_ndav(*, **).to_torch_tensor
-            else
-              super
-            end
-          end
-        else
-          def TorchTensor(array, *, **)
-            if array.kind_of? ::NDAV
-              array.to_torch_tensor
-            elsif array.respond_to? :to_torch_tensor
-              array.to_torch_tensor
-            elsif array.respond_to? :to_ndav
-              array.to_ndav(*, **).to_torch_tensor
-            else
-              ::NDAV.new(array, *, **).to_torch_tensor
-            end
+        def TorchTensor(array, *, **)
+          if array.kind_of? ::NDAV
+            array.to_torch_tensor
+          elsif array.respond_to? :to_torch_tensor
+            array.to_torch_tensor
+          elsif array.respond_to? :to_ndav
+            array.to_ndav(*, **).to_torch_tensor
+          else
+            ::NDAV.new(array, *, **).to_torch_tensor
           end
         end
       end
-
-      ::Torch.extend FromNDAV
-      ::Torch::Tensor.include ToNDAV
-      ::NDAV.extend FromTorchTensor
-      ::NDAV.include ToTorchTensor
-      ::NDAV::Converter.singleton_class.prepend Converter
-      ::NDAV::Converter.prepend Converter
     end
   end
+
+  register ::Torch, Torch, name: :torch_tensor
+  register ::Torch::Tensor, Torch::Tensor, name: :torch_tensor
 end
 

data/ndav-torch-tensor.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "ndav-torch-tensor"
-  s.version = "0.0.1"
+  s.version = "0.0.3"
   s.authors = ["Kitaiti Makoto"]
   s.summary = "N-Dimensional Array View for Torch::Tensors"
   s.licenses = ["MIT"]
@@ -8,7 +8,7 @@ Gem::Specification.new do |s|
 
   s.files = Dir.chdir(__dir__) {`git ls-files -z`.split("\x0")}
 
-  s.add_runtime_dependency "ndav"
+  s.add_runtime_dependency "ndav", ">= 0.0.5"
   s.add_runtime_dependency "torch-rb"
 
   s.add_development_dependency "rake"

data/test/test_torch_tensor.rb

@@ -14,6 +14,15 @@ class TestTorchTensor < Test::Unit::TestCase
     assert_kind_of ::Torch::Tensor, ::Torch.from_ndav(@ndav)
   end
 
+  def test_memory_view
+    Fiddle::MemoryView.export @torch_tensor do |view|
+      assert_equal "s", view.format
+      assert_equal [3], view.shape
+      assert_equal [2], view.strides
+      assert_equal [1, 2, 3].pack("s*"), view.to_s
+    end
+  end
+
   def test_ndav_to_torch_tensor
     assert_kind_of ::Torch::Tensor, @ndav.to_torch_tensor
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ndav-torch-tensor
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.3
 platform: ruby
 authors:
 - Kitaiti Makoto
@@ -15,14 +15,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.5
 - !ruby/object:Gem::Dependency
   name: torch-rb
   requirement: !ruby/object:Gem::Requirement
@@ -166,7 +166,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.6
+rubygems_version: 4.0.16
 specification_version: 4
 summary: N-Dimensional Array View for Torch::Tensors
 test_files: []