ndav-torch-tensor 0.0.2 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 033bbf192b1235b16c2b5fe0f69ca5505764e1473c9c5b4abdf18d81d4b9ec94
-  data.tar.gz: 02bca7f664f5a1fa8ec84a93202ef117f887a62b172305101c4278fc8c6cfd08
+  metadata.gz: '0680ecfdc12ff8c7439ae719364591beeae64666e91c0cc33b47429222848682'
+  data.tar.gz: 3ee2acec3f638e8918828496250a85f7b531750b9bfaa366c1f2d31b2b126f84
 SHA512:
-  metadata.gz: 1b9360bf3dd2fce2780775dcb03d19554a7f4a67960555bec1b8e88aa3300453ea515dd827efeaf292d63f703f46b692fa6ae381ac2fb7236fc18aab2f01f7a0
-  data.tar.gz: b88c727b786f43319043d874689f8882cbabd4737292d3e663405b1161a1b7b6b904d89b229543f103cad1786310d2ade8a78b930e50c16e82c262e0070ec07b
+  metadata.gz: d0aa2feab3aed3844acaea511a61eda04befd736db3a7009bb4627421cfafe486d21e9300e0bf2ea02483215879c461b555c59857ccbaf8eeaba6944db4b576f
+  data.tar.gz: 94eac20b44cf43b958eb817992e3c11fdb4541b0853fb70c720e5ed0d27affc061f7f528c5688c5c43c7ecf6e4b37dba5273b7958e699ae11b33da8e127f66b5

data/README.md

@@ -1,11 +1,32 @@
 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
+
+memory_view = Fiddle::MemoryView.new(torch) # => Fiddle::MemoryView, now it may export a MemoryView
+
+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

@@ -36,23 +36,46 @@ class NDAV
         type = case format
                when "s!", "c", "s", "l", "q", "i", "i!", "l!", "q!"
                  :"int#{suffix}"
-               when "S!", "C", "S", "L", "Q", "I", "I!", "L!", "Q!", "n", "v", "N", "V"
+               when "S!", "C", "S", "L", "Q", "I", "I!", "L!", "Q!"
                  :"uint#{suffix}"
-               when "f", "e", "g", "d", "E", "G"
+               when "f", "d"
                  :"float#{suffix}"
+               else
+                 case IO::Buffer::HOST_ENDIAN
+                 when IO::Buffer::LITTLE_ENDIAN
+                   if ["v", "V", "e", "E"].include? format
+                     :"float#{suffix}"
+                   end
+                 when IO::Buffer::BIG_ENDIAN
+                   if ["n", "N", "g", "G"].include? format
+                     :"float#{suffix}"
+                   end
+                 end
                end
         [format, type]
       }
 
       TYPE_SIZES = TYPE_TO_FORMAT.transform_values {|format| ITEM_SIZES[format]}
 
-      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
+          unless format
+            warn "unsupported dtype: #{dtype}, currently supported: #{TYPE_TO_FORMAT.keys}"
+            return false
+          end
+
+          byte_size = numel * element_size
 
-          ptr = Fiddle::Pointer.new(_data_ptr, numel * element_size)
-          NDAV.new(ptr, shape:, format:, lifetime: 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
 

data/ndav-torch-tensor.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "ndav-torch-tensor"
-  s.version = "0.0.2"
+  s.version = "0.0.4"
   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", ">= 0.0.3"
+  s.add_runtime_dependency "ndav", ">= 0.0.6"
   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.2
+  version: 0.0.4
 platform: ruby
 authors:
 - Kitaiti Makoto
@@ -15,14 +15,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.3
+        version: 0.0.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.3
+        version: 0.0.6
 - !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: []