narray_ffi 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 24dc8afd919a97d1e88cb9b78e6dcc4ed75216a6
-  data.tar.gz: 557a19fb76f957c21c1fc64dd13297bb3eb0b727
+  metadata.gz: 1d1fd3b17183842cb75ec77fef2754c7fc9266a8
+  data.tar.gz: d652418d88d7ce7df105336d628f2a0cdbf6619e
 SHA512:
-  metadata.gz: 32b05125aea7dffe69f1256ce0f517496db5d4b71853bb01f7b9e16e0634bba38d081482b7e6cc3b04bb7f8c1ae10b91752f85f31734e1ea01028035d30ee115
-  data.tar.gz: bafb2f7a636c78f9ef9d0707a516ce73aed295839ef5ce262e204858a632ad0ef57186386c2c30494d4478119989377c0d7db993e192626c3c18dd5335a3db2f
+  metadata.gz: 362cab7657d9a7a00a1b84933a1c436395694c68a244904b8eb5fa9af4edb71191852f23578fb13c713554729a21d07b5fb03b061469f1f3aa407dfbd8df7e1f
+  data.tar.gz: 91d3336406830ddee1a4c1c458cd5df888a73666522ea56ac970c40306cfb1a92fa3a5555cc1013dc05fb46284d7953215a5e20b107696b9acb51ce207764d26

data/ext/narray_ffi_c/narray_ffi.c

@@ -1,7 +1,9 @@
 #include "ruby.h"
 #include "narray.h"
 
-VALUE na_address(VALUE self) {
+static VALUE
+ na_address(VALUE self)
+{
   struct NARRAY *ary;
   void * ptr;
   VALUE ret;
@@ -12,11 +14,161 @@ VALUE na_address(VALUE self) {
   return ret;
 }
 
+static struct NARRAY*
+ na_alloc_struct_empty(int type, int rank, int *shape)
+{
+  int total=1, total_bak;
+  int i, memsz;
+  struct NARRAY *ary;
+
+  for (i=0; i<rank; ++i) {
+    if (shape[i] < 0) {
+      rb_raise(rb_eArgError, "negative array size");
+    } else if (shape[i] == 0) {
+      total = 0;
+      break;
+    }
+    total_bak = total;
+    total *= shape[i];
+    if (total < 1 || total > 2147483647 || total/shape[i] != total_bak) {
+      rb_raise(rb_eArgError, "array size is too large");
+    }
+  }
+
+  if (rank<=0 || total<=0) {
+    /* empty array */
+    ary = ALLOC(struct NARRAY);
+    ary->rank  =
+    ary->total = 0;
+    ary->shape = NULL;
+    ary->ptr   = NULL;
+    ary->type  = type;
+  }
+  else {
+    memsz = na_sizeof[type] * total;
+
+    if (memsz < 1 || memsz > 2147483647 || memsz/na_sizeof[type] != total) {
+      rb_raise(rb_eArgError, "allocation size is too large");
+    }
+
+    /* Garbage Collection */
+#ifdef NARRAY_GC
+    mem_count += memsz;
+    if ( mem_count > na_gc_freq ) { rb_gc(); mem_count=0; }
+#endif
+
+    ary        = ALLOC(struct NARRAY);
+    ary->shape = ALLOC_N(int,  rank);
+
+    ary->rank  = rank;
+    ary->total = total;
+    ary->type  = type;
+    for (i=0; i<rank; ++i)
+      ary->shape[i] = shape[i];
+  }
+  ary->ref = Qtrue;
+  return ary;
+}
+
+static void
+ na_free_empty(struct NARRAY* ary)
+{
+  if ( ary->total > 0 ) {
+    xfree(ary->shape);
+  }
+  xfree(ary);
+}
+
+static void
+ na_mark_ref_empty(struct NARRAY *ary)
+{
+  struct NARRAY *a2;
+
+  rb_gc_mark( ary->ref );
+
+}
+
+static VALUE
+ na_make_object_empty(int type, int rank, int *shape, VALUE klass, VALUE pointer)
+{
+  struct NARRAY *na;
+
+  na = na_alloc_struct_empty(type, rank, shape);
+  na->ref = pointer;
+
+  return Data_Wrap_Struct(klass, na_mark_ref_empty, na_free_empty, na);
+}
+
+
+static VALUE
+ na_pointer_to_na(int argc, VALUE *argv, VALUE pointer)
+{
+  struct NARRAY *ary;
+  VALUE v;
+  void * ptr;
+  VALUE address;
+  int i, type, len=1, pointer_len, *shape, rank=argc-1;
+
+  if (argc < 1)
+    rb_raise(rb_eArgError, "Type and Size Arguments required");
+
+  type = na_get_typecode(argv[0]);
+  if (type==NA_ROBJ)
+    rb_raise(rb_eArgError, "Invalid type");
+
+  address = rb_funcall(pointer, rb_intern("address"), 0);
+  ptr = sizeof(ptr) == 4 ? (void *) NUM2ULONG(address) : (void *) NUM2ULL(address);
+
+  pointer_len = NUM2INT(rb_funcall(pointer, rb_intern("size"), 0));
+
+  if (argc == 1) {
+    rank = 1;
+    shape = ALLOCA_N(int,rank);
+    if ( pointer_len % na_sizeof[type] != 0 )
+      rb_raise(rb_eArgError, "pointer size mismatch");
+    shape[0] = pointer_len / na_sizeof[type];
+  }
+  else {
+    shape = ALLOCA_N(int,rank);
+    for (i=0; i<rank; i++)
+      len *= shape[i] = NUM2INT(argv[i+1]);
+    len *= na_sizeof[type];
+    if ( len != pointer_len )
+      rb_raise(rb_eArgError, "pointer size mismatch");
+  }
+
+  v = na_make_object_empty( type, rank, shape, cNArray, pointer );
+  GetNArray(v,ary);
+  ary->ptr = ptr;
+
+  return v;
+}
+
+static VALUE
+ na_s_to_na_pointer(int argc, VALUE *argv, VALUE klass)
+{
+  VALUE mod;
+  VALUE klass_p;
+  if (argc < 1){
+    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]);
+    }
+  }
+  rb_funcall2(klass, rb_intern("to_na_old"), argc, argv);
+}
+
 void Init_narray_ffi_c() {
   ID id;
   VALUE klass;
   id = rb_intern("NArray");
   klass = rb_const_get(rb_cObject, id);
   rb_define_private_method(klass, "address", na_address, 0);
+  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,9 +1,14 @@
 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() )
+    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.0.0"
+  s.version = "1.1.0"
   s.author = "Brice Videau"
   s.email = "brice.videau@imag.fr"
   s.homepage = "https://forge.imag.fr/projects/opencl-ruby/"
@@ -11,6 +11,6 @@ Gem::Specification.new do |s|
   s.has_rdoc = false
   s.license = 'BSD'
   s.required_ruby_version = '>= 1.8.7'
-  s.add_dependency 'narray', '~> 0.6.0', '>=0.6.0.8'
+  s.add_dependency 'narray', '~> 0.6', '>=0.6.0.8'
   s.add_dependency 'ffi', '~> 1.9', '>=1.9.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: narray_ffi
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Brice Videau
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-21 00:00:00.000000000 Z
+date: 2015-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: narray
@@ -16,7 +16,7 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: '0.6'
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.6.0.8
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: '0.6'
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.6.0.8