ndav-numo-narray 0.0.4 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2135df02ca3fdb6ae9d00cf77a06bace0030e763301ba4091b87c55fd1ef322c
-  data.tar.gz: f5492ab0c71b22d7c6c71b22263ff50b1a0dbd108154fbc209cf233ad945794f
+  metadata.gz: 027ca1006dbe7107f356ed21e6e5f0e2ea2c1c4388a96707b00ae0fe02c3b113
+  data.tar.gz: b13b224ddde18cc20dc0b28086575b4208004fecc6e81d7658e66a66c5473de4
 SHA512:
-  metadata.gz: 6cdbd33861621ec5da3f79ef825303152cf339b3149cbae1eaf0437af155ed70175fd3c84e3b34d42bb6bd7f458c7384a1c68f61794a2ba2abf21e8eef3f9e15
-  data.tar.gz: e96eb5572368af47f2fba8b40f3573fe4a9ef4b2951c4b42d82fbcb6699cc58a7d6205cffa8f1cd5572f04c5f26082a10516eac1d97ed3d6b4f77e432940c078
+  metadata.gz: 3b13d07e24b6f66d7f65a88f7f019147527fc11bb6b1bdf7d04cc8a8b0f6347ecdaa25cf21534d909e3b9a7c78e3ba4f018ea99872206a95500d2ad12c564527
+  data.tar.gz: f9d15da6cc2a660508d266015211735a7498c1926b75936132b8bb2e19ae0c5fa44f48822a79dcb0d142986ac577ec4f1993c2745fea3c5e8843e87ec42e38c1

data/ext/narray.c

@@ -5,27 +5,6 @@
 #include <ruby/memory_view.h>
 #include <numo/narray.h>
 
-static VALUE
-ndav_numo_narray_s_address_for_read(VALUE self, VALUE obj)
-{
-  void* ptr = na_get_pointer_for_read(obj);
-
-  return PTR2NUM(ptr);
-}
-
-static VALUE
-ndav_numo_narray_s_readonly_p(VALUE self, VALUE obj)
-{
-  if (OBJ_FROZEN(obj)) {
-    return Qtrue;
-  }
-
-  narray_t *na;
-  GetNArray(obj, na);
-
-  return NA_TYPE(na) == NARRAY_VIEW_T && OBJ_FROZEN(NA_VIEW_DATA(na)) ? Qtrue : Qfalse;
-}
-
 static VALUE
 ndav_numo_narray_s_strides(VALUE self, VALUE obj)
 {
@@ -52,7 +31,7 @@ ndav_numo_narray_s_strides(VALUE self, VALUE obj)
       break;
     case NARRAY_VIEW_T:
       if (NA_IS_INDEX_AT(na, i - 1)) {
-        return Qnil;
+        rb_raise(rb_eArgError, "strides not defined for index-backed array");
       }
       rb_ary_store(strides, axis, SSIZET2NUM(NA_STRIDE_AT(na, i - 1)));
       break;
@@ -71,8 +50,6 @@ Init_narray(void)
 
   VALUE mNArray = rb_path2class("NDAV::Numo::NArray");
 
-  rb_define_singleton_method(mNArray, "address_for_read",ndav_numo_narray_s_address_for_read, 1);
-  rb_define_singleton_method(mNArray, "readonly?", ndav_numo_narray_s_readonly_p, 1);
   rb_define_singleton_method(mNArray, "strides", ndav_numo_narray_s_strides, 1);
 }
 

data/lib/ndav/numo/narray.rb

@@ -1,5 +1,7 @@
 require "ndav"
-require "numo/narray/alt"
+numo_name = "numo/narray/alt"
+require numo_name
+require "fiddle/import"
 
 class NDAV
   module Numo
@@ -17,38 +19,121 @@ class NDAV
         ::Numo::DFloat => "d"
       }
 
-      FORMAT_TO_CLASS = CLASS_TO_FORMAT.invert
+      FORMAT_TO_CLASS = Hash.new {|classes, format| classes[format] = class_from_format(format)}
+
+      class << self
+        def na_get_pointer_for_read(numo)
+          FFI.nary_get_pointer_for_read(Fiddle.dlwrap(numo))
+        end
+
+        def na_get_pointer_for_read_write(numo)
+          FFI.nary_get_pointer_for_read_write(Fiddle.dlwrap(numo))
+        end
+
+        def na_get_offset(numo)
+          FFI.nary_get_offset(Fiddle.dlwrap(numo))
+        end
+
+        def pointer_for_read(numo)
+          ptr = na_get_pointer_for_read(numo) + na_get_offset(numo)
+          ptr.size = numo.byte_size
+          ptr
+        end
+
+        def pointer_for_write(numo)
+          ptr = na_get_pointer_for_read_write(numo) + na_get_offset(numo)
+          ptr.size = numo.byte_size
+          ptr
+        end
+
+        FORMAT_TO_CLASS = CLASS_TO_FORMAT.invert
+        def class_from_format(format)
+          item_desc = ITEM_DESCS[format]
+          return unless item_desc.length == 1
+
+          component = item_desc[0]
+          return unless component.repeat == 1
+
+          klass = FORMAT_TO_CLASS[component.format]
+          return klass if klass
+
+          prefix = case component.format
+                   when "i", "j" then "Int"
+                   when "I", "J" then "UInt"
+                   end
+          return ::Numo.const_get("#{prefix}#{component.size * 8}") if prefix
+
+          case IO::Buffer::HOST_ENDIAN
+          in IO::Buffer::LITTLE_ENDIAN
+            return unless component.little_endian?
+
+            klass = case component.format
+                    when "v" then ::Numo::UInt16
+                    when "V" then ::Numo::UInt32
+                    when "e" then ::Numo::SFloat
+                    when "E" then ::Numo::DFloat
+                    end
+            return klass if klass
+          in IO::Buffer::BIG_ENDIAN
+            return if component.little_endian?
+
+            klass = case component.format
+                    when "n" then ::Numo::UInt16
+                    when "N" then ::Numo::UInt32
+                    when "g" then ::Numo::SFloat
+                    when "G" then ::Numo::DFloat
+                    end
+            return klass if klass
+          end
+        end
+      end
+
+      module FFI
+        extend Fiddle::Importer
+
+        numo_dl = $LOADED_FEATURES.find {|feature| feature.end_with?("numo/narray/narray.#{RbConfig::CONFIG['DLEXT']}")}
+        dlload numo_dl
+        typealias "VALUE", "uintptr_t"
+        extern "char* nary_get_pointer_for_read(VALUE)"
+        extern "char* nary_get_pointer_for_read_write(VALUE)"
+        extern "size_t nary_get_offset(VALUE self)"
+      end
 
       module FromNDAV
         def from_ndav(ndav)
-          cls = FORMAT_TO_CLASS[ndav.format]
-          raise ArgumentError, "unsupported format: #{ndav.format}, currently supported: #{FORMAT_TO_CLASS.keys}" unless cls
-          raise ArgumentError, "class and format mismatch: #{cls} and #{ndav.format}" unless CLASS_TO_FORMAT[cls] == ndav.format
+          format = ndav.format
+          cls = FORMAT_TO_CLASS[format]
+          raise ArgumentError, "unsupported format: #{format}" unless cls
 
-          cls.from_binary(ndav.to_s, ndav.shape)
+          shape = ndav.shape
+          if ndav.row_major_contiguous?
+            cls.from_binary(ndav.to_s, shape)
+          elsif ndav.column_major_contiguous?
+            cls.from_binary(ndav.to_s, shape.reverse).transpose
+          else
+            # TODO: Allocate enough memory, know that size, pass binary to from_binary, and reshape and restrides
+            raise "Currently, non-contiguous NDAV not supported"
+          end
         end
       end
 
       module MemoryViewable
-        def ndav_descriptor(**)
-          unless contiguous?
-            warn "only contiguous NArray is supported"
-            return false
-          end
-
+        def ndav_descriptor(writable:, column_major:, **)
           format = CLASS_TO_FORMAT[self.class]
           unless format
             warn "unsupported class: #{self.class}, currently supported: #{CLASS_TO_FORMAT.keys}"
             return false
           end
 
+          ptr = writable ? ::NDAV::Numo::NArray.pointer_for_write(self) :
+                           ::NDAV::Numo::NArray.pointer_for_read(self)
           {
-            data: ::Fiddle::Pointer.new(::NDAV::Numo::NArray.address_for_read(self), byte_size),
+            data: ptr,
             shape:,
-            strides: ::NDAV::Numo::NArray.strides(self),
+            strides: ::NDAV::Numo::NArray.strides(self) || ::NDAV.default_strides(shape:, item_size: ITEM_SIZES[format], row_major: !column_major),
             format:,
             byte_size:,
-            readonly?: ::NDAV::Numo::NArray.readonly?(self),
+            readonly?: !writable,
             sub_offsets: nil
           }
         end

data/ndav-numo-narray.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "ndav-numo-narray"
-  s.version = "0.0.4"
+  s.version = "0.0.6"
   s.authors = ["Kitaiti Makoto"]
   s.summary = "N-Dimensional Array View for Numo::NArray"
   s.licenses = ["BSD-3-Clause"]
@@ -9,7 +9,7 @@ Gem::Specification.new do |s|
   s.files = Dir.chdir(__dir__) {`git ls-files -z`.split("\x0")}
   s.extensions << "ext/extconf.rb"
 
-  s.add_runtime_dependency "ndav", ">= 0.0.5"
+  s.add_runtime_dependency "ndav", ">= 0.0.7"
   s.add_runtime_dependency "numo-narray-alt"
 
   s.add_development_dependency "rake"

data/test/test_converter.rb

@@ -22,6 +22,14 @@ class TestConverter < Test::Unit::TestCase
     assert_kind_of ::NDAV, @numo_narray.to_ndav
   end
 
+  def test_non_contiguous_numo_narray_to_ndav
+    pend
+
+    numo_narray = ::Numo::Int16[1, 2, 3, 4, 5, 6][(0...6).step(2)]
+
+    assert_equal [1, 2, 3], numo_narray.to_ndav.to_numo_narray.to_a
+  end
+
   def test_NDAV
     assert_kind_of ::NDAV, ::NDAV::Converter::NDAV(@numo_narray)
   end

data/test/test_pointer.rb

@@ -0,0 +1,49 @@
+require_relative "helper"
+
+class TestPointer < Test::Unit::TestCase
+  def test_pointer_for_read
+    numo = ::Numo::Int16[1, 2, 3]
+
+    assert_raise TypeError do
+      ::NDAV::Numo::NArray.pointer_for_read(Object.new)
+    end
+
+    ptr = ::NDAV::Numo::NArray.pointer_for_read(numo)
+    assert_instance_of ::Fiddle::Pointer, ptr
+    assert_equal [1, 2, 3].pack("s*"), ptr.to_s(numo.byte_size)
+  end
+
+  def test_pointer_for_write
+    numo = ::Numo::Int16[1, 2, 3]
+
+    assert_raise TypeError do
+      ::NDAV::Numo::NArray.pointer_for_write(Object.new)
+    end
+
+    ptr = ::NDAV::Numo::NArray.pointer_for_write(numo)
+    assert_instance_of ::Fiddle::Pointer, ptr
+
+    numo[0] = 4
+    assert_equal [4, 2, 3].pack("s*"), ptr.to_s(numo.byte_size)
+
+    ::Fiddle::Pointer.write(ptr, [7, 8, 9].pack("s*"))
+    assert_equal ::Numo::Int16[7, 8, 9], numo
+  end
+
+  def test_pointer_for_read_view
+    numo = ::Numo::Int16[0, 1, 2, 3]
+    view = numo[1..]
+    ptr = ::NDAV::Numo::NArray.pointer_for_read(view)
+
+    assert_equal [1, 2, 3].pack("s*"), ptr.to_s(view.byte_size)
+  end
+
+  def test_pointer_for_write_view
+    numo = ::Numo::Int16[0, 1, 2, 3]
+    view = numo[1..]
+    ptr = ::NDAV::Numo::NArray.pointer_for_write(view)
+
+    view[0] = 4
+    assert_equal [4, 2, 3].pack("s*"), ptr.to_s(view.byte_size)
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ndav-numo-narray
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.6
 platform: ruby
 authors:
 - Kitaiti Makoto
@@ -15,14 +15,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.5
+        version: 0.0.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.5
+        version: 0.0.7
 - !ruby/object:Gem::Dependency
   name: numo-narray-alt
   requirement: !ruby/object:Gem::Requirement
@@ -164,9 +164,9 @@ files:
 - lib/ndav/numo/narray.rb
 - ndav-numo-narray.gemspec
 - test/helper.rb
-- test/test_address.rb
 - test/test_converter.rb
 - test/test_package.rb
+- test/test_pointer.rb
 homepage: https://gitlab.com/KitaitiMakoto/ndav-numo-narray
 licenses:
 - BSD-3-Clause

data/test/test_address.rb

@@ -1,27 +0,0 @@
-require_relative "helper"
-
-class TestAddress < Test::Unit::TestCase
-  def test_address_for_read
-    numo = ::Numo::Int16[1, 2, 3]
-
-    assert_raise TypeError do
-      ::NDAV::Numo::NArray.address_for_read(Object.new)
-    end
-
-    assert_instance_of Integer, ::NDAV::Numo::NArray.address_for_read(numo)
-  end
-
-  def test_pointer_for_read
-    numo = ::Numo::Int16[1, 2, 3]
-    address = ::NDAV::Numo::NArray.address_for_read(numo)
-
-    ptr = ::Fiddle::Pointer.new(address, numo.byte_size)
-    assert_equal [1, 2, 3].pack("s*"), ptr.to_s(numo.byte_size)
-
-    numo[0] = 4
-    assert_equal [4, 2, 3].pack("s*"), ptr.to_s(numo.byte_size)
-
-    ::Fiddle::Pointer.write(address, [7, 8, 9].pack("s*"))
-    assert_equal ::Numo::Int16[7, 8, 9], numo
-  end
-end