ndav-numo-narray 0.0.1 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bdab89f32a1dc5913ae3c0df46237d9dac3e1c5eb49da215409a34e0ca504e7b
-  data.tar.gz: 1a23f2a704bbd19a6c27648ae663b8b32c9b3977f893f48888baf92f7fadb50e
+  metadata.gz: 190876a415d35546ac7c0d2d9f40f1a38b8e7caa183fac3b8785b69c3ed52fb6
+  data.tar.gz: 2821b6cff34294cf2720a2323ac6ee4b6df69f579beb61ab6d45421051117c72
 SHA512:
-  metadata.gz: 49afc07a7c360770f17109277b99a77daa68ba3bfa944e981525214668a777171ae2a9661fcdf1d2412008c4bb5cfb6aaa4694e23482b2f7f22686e41bb82f0f
-  data.tar.gz: eb25644d06ec6f69f639f847897ccfefad78563faf3f1e1106c3db6e094bcea286fa6214004a240de4566f18e83acbb3b379d959bec0cff5f9e1158f9d51c875
+  metadata.gz: c80b97550700626dcaf02917f9c8bfe381aa179fbd1582fd86a8f671648111ea471a99752dff6344fde16243014915fdccfb708aead4649aa82def93e9329077
+  data.tar.gz: b1684caf9670469949ce16dbf2171660416bf67e866a12f0280058d74445604f51b4413f7b9e2fdd1f70db5934f63a90f097dd8d6a4217661f008d0e1e0da070

data/README.md

@@ -1,12 +1,32 @@
 NDAV::Numo::NArray
 ==================
 
-MemoryView and pointer support for [Numo::NArray][] ([numo-narray-alt][]).
+[NDAV][] bridge for [Numo::NArray][] ([numo-narray-alt][]).
+
+SYNOPSIS
+--------
+
+```ruby
+require "ndav/numo/narray"
+
+numo = Numo::DFloat.new(2, 3).seq # => Numo::DFloat
+ndav = numo.to_ndav               # => NDAV
+numo = ndav.to_numo_narray        # => Numo::DFloat
+
+ndav = NDAV.from_numo_narray(numo)   # => NDAV
+numo = Numo::DFloat.from_ndav(ndav)  # => Numo::DFloat
+numo = Numo::NDarray.from_ndav(ndav) # => Numo::DFloat
+
+include NDAV::Converter
+ndav = NDAV(numo)       # => NDAV
+numo = NumoNArray(ndav) # => Numo::NArray
+```
 
 LICENSE
 -------
 
 3-Clause BSD License. See LICENSE.txt file.
 
+[NDAV]: https://kitaitimakoto.gitlab.io/ndav/
 [Numo::NArray]: https://ruby-numo.github.io/narray/
 [numo-narray-alt]: https://github.com/yoshoku/numo-narray-alt

data/ext/extconf.rb

@@ -2,8 +2,8 @@ require "mkmf"
 
 dependency = "numo-narray-alt"
 header = "numo/narray.h"
-header_path = File.join(Gem::Specification.find_by_name(dependency).full_gem_path, "lib/numo", header)
-$INCFLAGS = "-I#{File.dirname(File.dirname(header_path))} #{$INCFLAGS}"
-have_header(header) || abort "#{header} not found in #{dependency}"
+lib_dir = File.join(Gem::Specification.find_by_name(dependency).full_gem_path, "lib/numo")
+$INCFLAGS = "-I#{lib_dir} #{$INCFLAGS}"
+have_header(header) || abort("#{header} not found in #{dependency}")
 
 create_makefile "ndav/numo/narray"

data/ext/narray.c

@@ -6,23 +6,60 @@
 #include <numo/narray.h>
 
 static VALUE
-ndav_numo_narray_s_address(VALUE self, VALUE obj)
+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_strides(VALUE self, VALUE obj)
+{
+  narray_t *na;
+  GetNArray(obj, na);
+  int ndim = NA_NDIM(na);
+  size_t *shape = NA_SHAPE(na);
+  VALUE strides = rb_ary_new_capa(ndim);
+  unsigned char type = NA_TYPE(na);
+  bool is_row_major = TEST_ROW_MAJOR(obj);
+  ssize_t stride;
+
+  if (type == NARRAY_DATA_T) {
+    stride = na_get_elmsz(obj);
+  }
+
+  for (int i = ndim; i > 0; --i) {
+    int axis = is_row_major ? i - 1 : ndim - i;
+
+    switch (type) {
+    case NARRAY_DATA_T:
+      rb_ary_store(strides, axis, SSIZET2NUM(stride));
+      stride *= shape[i - 1];
+      break;
+    case NARRAY_VIEW_T:
+      if (NA_IS_INDEX_AT(na, i - 1)) {
+        return Qnil;
+      }
+      rb_ary_store(strides, axis, SSIZET2NUM(NA_STRIDE_AT(na, i - 1)));
+      break;
+    default:
+      return Qnil;
+    }
+  }
+
+  return strides;
+}
+
 void
 Init_narray(void)
 {
   rb_require("numo/narray/alt");
 
-  VALUE cNDAV = rb_define_class("NDAV", rb_cObject);
-  VALUE mNumo = rb_define_module_under(cNDAV, "Numo");
-  VALUE mNArray = rb_define_module_under(mNumo, "NArray");
+  VALUE mNArray = rb_path2class("NDAV::Numo::NArray");
 
-  rb_define_singleton_method(mNArray, "address", ndav_numo_narray_s_address, 1);
+  rb_define_singleton_method(mNArray, "address_for_read",ndav_numo_narray_s_address_for_read, 1);
+  rb_define_singleton_method(mNArray, "strides", ndav_numo_narray_s_strides, 1);
 }
 
 #endif /* NDAV_NUMO_NARRAY_H */

data/lib/ndav/numo/narray.rb

@@ -1,6 +1,5 @@
 require "ndav"
 require "numo/narray/alt"
-require "ndav/numo/narray.so"
 
 class NDAV
   module Numo
@@ -24,22 +23,34 @@ class NDAV
         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
 
-          array = cls.zeros(ndav.shape)
-          address = ::NDAV::Numo::NArray.address(array)
-          ::Fiddle::Pointer.write address, ndav.to_s
-          array.instance_variable_set(:@ndav, ndav) # keep reference to NDAV to prevent GC
-          array
+          cls.from_binary(ndav.to_s, ndav.shape)
         end
       end
 
-      module ToNDAV
-        def to_ndav
+      module MemoryViewable
+        def ndav_descriptor(flags = ::NDAV::Flags::FLAGS[:simple])
+          unless contiguous?
+            warn "only contiguous NArray is supported"
+            return false
+          end
+
           format = CLASS_TO_FORMAT[self.class]
-          raise ArgumentError, "unsupported class: #{self.class}, currently supported: #{CLASS_TO_FORMAT.keys}" unless format
+          unless format
+            warn "unsupported class: #{self.class}, currently supported: #{CLASS_TO_FORMAT.keys}"
+            return false
+          end
 
-          ptr = ::Fiddle::Pointer.new(::NDAV::Numo::NArray.address(self), byte_size)
-          NDAV.new(ptr, shape:, format:, lifetime: self)
+          {
+            data: ::Fiddle::Pointer.new(::NDAV::Numo::NArray.address_for_read(self), byte_size),
+            shape:,
+            strides: ::NDAV::Numo::NArray.strides(self),
+            format:,
+            byte_size:,
+            readonly?: true, # TODO: Consier to define #readonly? at C layer
+            sub_offsets: nil
+          }
         end
       end
 
@@ -65,3 +76,5 @@ class NDAV
 
   register ::Numo::NArray, Numo::NArray, name: :numo_narray
 end
+
+require "ndav/numo/narray.so"

data/ndav-numo-narray.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "ndav-numo-narray"
-  s.version = "0.0.1"
+  s.version = "0.0.3"
   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.3"
+  s.add_runtime_dependency "ndav", ">= 0.0.5"
   s.add_runtime_dependency "numo-narray-alt"
 
   s.add_development_dependency "rake"

data/test/test_address.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ndav-numo-narray
 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.0.3
+        version: 0.0.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.3
+        version: 0.0.5
 - !ruby/object:Gem::Dependency
   name: numo-narray-alt
   requirement: !ruby/object:Gem::Requirement
@@ -185,7 +185,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 Numo::NArray
 test_files: []