narray_ffi 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1d1fd3b17183842cb75ec77fef2754c7fc9266a8
-  data.tar.gz: d652418d88d7ce7df105336d628f2a0cdbf6619e
+  metadata.gz: 510a401c952751ea163855b174e72a2f871c25d4
+  data.tar.gz: 9e81c0380bc8e31ec91a82c5f72b4df4344b0516
 SHA512:
-  metadata.gz: 362cab7657d9a7a00a1b84933a1c436395694c68a244904b8eb5fa9af4edb71191852f23578fb13c713554729a21d07b5fb03b061469f1f3aa407dfbd8df7e1f
-  data.tar.gz: 91d3336406830ddee1a4c1c458cd5df888a73666522ea56ac970c40306cfb1a92fa3a5555cc1013dc05fb46284d7953215a5e20b107696b9acb51ce207764d26
+  metadata.gz: 5ef3e44b7ad2999b1cee2146a63d4f34828d27e588d2952bfdff3120e62d17588e7d11dad16801f6c2de80a2db8f96ce5dcef71d759200bba7b0e8083f512282
+  data.tar.gz: 85840bd05ac8574a205185d5a4f2582161b8135df5870d0e6a7a33dfbb0c1fb7c871a7dbf5c852da9a721951f334b6b27f6a02f4c63a927de192f11e4eaa66c2

data/ext/narray_ffi_c/narray_ffi.c

@@ -14,6 +14,31 @@ static VALUE
   return ret;
 }
 
+static VALUE
+ na_to_ptr(VALUE self)
+{
+  struct NARRAY *ary;
+  VALUE mod;
+  VALUE klass;
+  VALUE ret;
+  VALUE address;
+  long length;
+
+  GetNArray(self,ary);
+  mod = rb_const_get(rb_cObject, rb_intern("FFI"));
+  klass = rb_const_get(mod, rb_intern("Pointer"));
+  if ( ary->ref != Qnil ) {
+    if ( rb_funcall(ary->ref, rb_intern("kind_of?"), 1, klass) == Qtrue ) {
+      return ary->ref;
+    }
+  }
+
+  length = na_sizeof[ary->type] * ary->total;
+  ret = rb_funcall(klass, rb_intern("new"), 1, na_address(self));
+  ret = rb_funcall(ret, rb_intern("slice"), 2, LONG2NUM(0), LONG2NUM(length));
+  return ret;
+}
+
 static struct NARRAY*
  na_alloc_struct_empty(int type, int rank, int *shape)
 {
@@ -153,11 +178,9 @@ static VALUE
     rb_raise(rb_eArgError, "Argument is required");
   }
   mod = rb_const_get(rb_cObject, rb_intern("FFI"));
-  if (mod != Qnil) {
-    klass_p = rb_const_get(mod, rb_intern("Pointer"));
-    if ( rb_funcall(argv[0], rb_intern("kind_of?"), 1, klass_p) == Qtrue ){
-      return na_pointer_to_na(argc-1,argv+1,argv[0]);
-    }
+  klass_p = rb_const_get(mod, rb_intern("Pointer"));
+  if ( rb_funcall(argv[0], rb_intern("kind_of?"), 1, klass_p) == Qtrue ){
+    return na_pointer_to_na(argc-1,argv+1,argv[0]);
   }
   rb_funcall2(klass, rb_intern("to_na_old"), argc, argv);
 }
@@ -168,6 +191,8 @@ void Init_narray_ffi_c() {
   id = rb_intern("NArray");
   klass = rb_const_get(rb_cObject, id);
   rb_define_private_method(klass, "address", na_address, 0);
+  rb_define_method(klass, "to_ptr", na_to_ptr, 0);
+  rb_define_alias(rb_singleton_class(klass), "to_na_old", "to_na");
   rb_define_singleton_method(klass, "to_na", na_s_to_na_pointer, -1);
   rb_define_singleton_method(klass, "to_narray", na_s_to_na_pointer, -1);
 }

data/lib/narray_ffi.rb

@@ -1,14 +1,3 @@
 require "narray"
 require "ffi"
-class NArray
-  class << self
-    alias to_na_old to_na
-  end
-end
 require "narray_ffi_c.so"
-
-class NArray
-  def to_ptr
-    return FFI::Pointer::new( address() ).slice(0, size*element_size)
-  end
-end

data/narray_ffi.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'narray_ffi'
-  s.version = "1.1.0"
+  s.version = "1.1.1"
   s.author = "Brice Videau"
   s.email = "brice.videau@imag.fr"
   s.homepage = "https://forge.imag.fr/projects/opencl-ruby/"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: narray_ffi
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Brice Videau
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-18 00:00:00.000000000 Z
+date: 2015-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: narray