jl4rb 0.2.6 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 994b5475b648747803c998adf29256d8142e40197a0a2880b2f5c2ef309045f6
-  data.tar.gz: 73a77f6ccc7a6c5ffa2bf86179ddf4efaa3c8d5b30abde28c0563b59a0fee1df
+  metadata.gz: b5dfcf11641758e08d73345c51fce1f7f34286746cc0559566b2344479169ea4
+  data.tar.gz: 917e248ff6e0444a15c4307f44a9b7299455d0776927ecadeeea5887c5cd11a5
 SHA512:
-  metadata.gz: 21394963d68c946891f10d9eb71613f170f0e5c78130126ad7fafcc98fe8e3558d787e39f7f451136e11d5c85a0635ea7531361a126f50eafbf73849120e4d6e
-  data.tar.gz: 2924a03b95e4860482d6227565dbc83e88e33ce17318c33221d3b47d3bfaa860a7a2f851d25fcddc9d27a8fa6ebb2b4a13ac53092c4e5313848e022e57d95d96
+  metadata.gz: bc9bcbd2c1fdef4421a6ec44bcc12f6139dda57784a12574f2396aba1419e77751be7f2fe77e678ea0ce391df9351adfefa983fc98ed95fbe730f987761ef455
+  data.tar.gz: 9dcb4bda5973938c76161d1a25613be1ebbfe9354745741bb14c12759915e50e8538af07039bc4f3927339fe2f12f9a6ae4ffd1e4ced65e8849e0e042e823959

data/Rakefile

@@ -62,8 +62,8 @@ end
 ## clean task
 desc "Remove #{File.join(PKGDIR,PKG_NAME+'-'+PKG_VERSION+'.gem')}"
 task :clean do |t|
-  rm File.join(PKGDIR,PKG_NAME+'-'+PKG_VERSION+'.gem') if File.exists? File.join(PKGDIR,PKG_NAME+'-'+PKG_VERSION+'.gem')
-  rm_rf File.join(PKGDIR,PKG_NAME+'-'+PKG_VERSION) if File.exists? File.join(PKGDIR,PKG_NAME+'-'+PKG_VERSION)
+  rm File.join(PKGDIR,PKG_NAME+'-'+PKG_VERSION+'.gem') if File.exist? File.join(PKGDIR,PKG_NAME+'-'+PKG_VERSION+'.gem')
+  rm_rf File.join(PKGDIR,PKG_NAME+'-'+PKG_VERSION) if File.exist? File.join(PKGDIR,PKG_NAME+'-'+PKG_VERSION)
 end
 
 
@@ -77,13 +77,13 @@ end
 desc "Quick install #{File.join(PKGDIR,PKG_NAME+'-'+PKG_VERSION+'.gem')}"
 task :install do |t|
   `gem install #{File.join(PKGDIR,PKG_NAME+'-'+PKG_VERSION+'.gem')} --local --no-rdoc --no-ri`
-  rm_rf File.join(PKGDIR,PKG_NAME+'-'+PKG_VERSION) if File.exists? File.join(PKGDIR,PKG_NAME+'-'+PKG_VERSION)
+  rm_rf File.join(PKGDIR,PKG_NAME+'-'+PKG_VERSION) if File.exist? File.join(PKGDIR,PKG_NAME+'-'+PKG_VERSION)
 end
 
 desc "Docker install #{File.join(PKGDIR,PKG_NAME+'-'+PKG_VERSION+'.gem')}"
 task :docker => :package do |t|
   `gem install #{File.join(PKGDIR,PKG_NAME+'-'+PKG_VERSION+'.gem')} --local --no-rdoc --no-ri`
-  rm_rf File.join(PKGDIR,PKG_NAME+'-'+PKG_VERSION) if File.exists? File.join(PKGDIR,PKG_NAME+'-'+PKG_VERSION)
+  rm_rf File.join(PKGDIR,PKG_NAME+'-'+PKG_VERSION) if File.exist? File.join(PKGDIR,PKG_NAME+'-'+PKG_VERSION)
 end
 
 

data/ext/jl4rb/extconf.rb

@@ -5,11 +5,11 @@ $prefix_include,$prefix_lib=[],[]
 $prefix= File.dirname(`julia -e 'print(Sys.BINDIR)'`)
 
 [$prefix+"/include/julia",$prefix+"/usr/include",$prefix+"/src",$prefix+"/src/support"].each do |incl|
-    $prefix_include << incl if File.exists? incl
+    $prefix_include << incl if File.exist? incl
 end
 
 ([$prefix+"/lib/julia",$prefix+"/usr/lib",$prefix+"/lib"]+(RUBY_PLATFORM=~/(?:mingw|msys)/ ? [$prefix+"/bin"] : [])).each do |lib|
-    $prefix_lib << lib if File.exists? lib
+    $prefix_lib << lib if File.exist? lib
 end
 
 def jl4rb_makefile(incs,libs)

data/ext/jl4rb/jl4rb.c

@@ -23,7 +23,7 @@
 #undef NOINLINE
 #include "julia.h"
 
-#define length(a) jl_array_size(a,0)
+#define length(a) jl_array_dim(a,0)
 
 /************* INIT *********************/
 
@@ -42,13 +42,29 @@ VALUE Julia_exit(VALUE obj, VALUE exitcode) {
   return Qtrue;
 }
 
+// int Rulia_subtype(jl_value_t *jlv, char* typ) {
+//   jl_value_t *jl_typ=NULL;
+//   int res;
+
+//   JL_GC_PUSH1(&jl_typ);
+//   jl_typ = jl_eval_string(typ);
+//   res = jl_subtype(jlv,jl_typ);
+//   JL_GC_POP();
+//   return res;
+// }
+
 //Maybe try to use cpp stuff to get the output inside julia system (ccall,cgen and cgutils)
 //-| TODO: after adding in the jlapi.c jl_is_<C_type> functions replace the strcmp!
 VALUE jl_value_to_VALUE(jl_value_t *res) {
   size_t i=0,k,nd,d;
   VALUE resRb;
-  jl_value_t *tmp;
-  jl_function_t *call;
+  jl_value_t *tmp, *res_elt;
+  jl_function_t *call, *getindex;
+  // double* xDataD;
+  // int* xDataL;
+  // uint8_t* xDataB;
+  // jl_value_t** xData;
+
 
   if(res!=NULL) { //=> get a result
     //printf("typeof=%s\n",jl_typeof_str(res));
@@ -117,14 +133,17 @@ VALUE jl_value_to_VALUE(jl_value_t *res) {
     if(strcmp(jl_typeof_str(res),"Array")==0 )
     //if(jl_is_array(res))
     {
+      getindex = jl_get_function(jl_main_module, "getindex");
       nd = jl_array_rank(res);
       //printf("array_ndims=%d\n",(int)nd);
       if(nd==1) {//Vector
-        d = jl_array_size(res, 0);
+        d = jl_array_dim(res, 0);
         //printf("array_dim[1]=%d\n",(int)d);
         resRb = rb_ary_new2(d);
         for(i=0;i<d;i++) {
-          rb_ary_store(resRb,i,jl_value_to_VALUE(jl_arrayref((jl_array_t *)res,i)));
+          res_elt = jl_call2(getindex, res, jl_box_long(i+1));
+          rb_ary_store(resRb,i,jl_value_to_VALUE(res_elt));
+          // rb_ary_store(resRb,i,jl_value_to_VALUE(jl_arrayref((jl_array_t *)res,i)));
         }
         return resRb;
       }
@@ -285,6 +304,7 @@ jl_value_t* util_VALUE_to_jl_value(VALUE arr)
   jl_value_t *ans,*elt,*array_type;
   VALUE res,class,tmp;
   int i,n=0,vect=1;
+  jl_function_t *setindex;
 
   if(!rb_obj_is_kind_of(arr,rb_cArray)) {
     n=1;
@@ -297,14 +317,15 @@ jl_value_t* util_VALUE_to_jl_value(VALUE arr)
   }
 
   class=rb_class_of(rb_ary_entry(arr,0));
-  
+  setindex = jl_get_function(jl_main_module, "setindex!");
   if(class==rb_cFloat) {
     //-| This is maybe faster and can be developped in julia-api as jl_vector_float64(n) for example.
     array_type=jl_apply_array_type((jl_value_t*)jl_float64_type, 1);
     ans=(jl_value_t*)jl_alloc_array_1d(array_type,n);
     for(i=0;i<n;i++) {
       elt=jl_box_float64(NUM2DBL(rb_ary_entry(arr,i)));
-      jl_arrayset((jl_array_t*)ans,elt,i);
+      jl_call3(setindex, ans, elt, jl_box_long(i+1));
+      //jl_arrayset((jl_array_t*)ans,elt,i);
     }
 #if RUBY_API_VERSION_CODE >= 20400
   } else if(class==rb_cInteger) {
@@ -315,14 +336,16 @@ jl_value_t* util_VALUE_to_jl_value(VALUE arr)
     ans=(jl_value_t*)jl_alloc_array_1d(array_type,n);
     for(i=0;i<n;i++) {
       elt=jl_box_long(NUM2INT(rb_ary_entry(arr,i)));
-      jl_arrayset((jl_array_t*)ans,elt,i);
+      jl_call3(setindex, ans, elt, jl_box_long(i+1));
+      //jl_arrayset((jl_array_t*)ans,elt,i);
     }
   } else if(class==rb_cTrueClass || class==rb_cFalseClass) {
     array_type=jl_apply_array_type((jl_value_t*)jl_bool_type, 1);
     ans=(jl_value_t*)jl_alloc_array_1d(array_type,n);
     for(i=0;i<n;i++) {
       elt=jl_box_bool(rb_class_of(rb_ary_entry(arr,i))==rb_cFalseClass ? 0 : 1);
-      jl_arrayset((jl_array_t*)ans,elt,i);
+      jl_call3(setindex, ans, elt, jl_box_long(i+1));
+      //jl_arrayset((jl_array_t*)ans,elt,i);
     }
   } else if(class==rb_cString) {
     array_type=jl_apply_array_type((jl_value_t*)jl_string_type, 1);
@@ -330,10 +353,11 @@ jl_value_t* util_VALUE_to_jl_value(VALUE arr)
     for(i=0;i<n;i++) {
       tmp=rb_ary_entry(arr,i);
       elt=jl_cstr_to_string(StringValuePtr(tmp));
-      jl_arrayset((jl_array_t*)ans,elt,i);
+      jl_call3(setindex, ans, elt, jl_box_long(i+1));
+      //jl_arrayset((jl_array_t*)ans,elt,i);
     }
   } else ans=NULL;
-  if(!vect && ans) ans=jl_arrayref((jl_array_t*)ans,0);
+  if(!vect && ans) ans=NULL;//jl_arrayref((jl_array_t*)ans,0);
   return ans;
 }
 

data/jl4rb.gemspec

@@ -2,7 +2,7 @@ require 'rubygems'
 require 'rubygems/package_task'
 
 PKG_NAME='jl4rb'
-PKG_VERSION='0.2.6'
+PKG_VERSION='0.3.0'
 PKG_FILES=FileList[
     'Rakefile','jl4rb.gemspec',
     'ext/jl4rb/*.c',
@@ -22,7 +22,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib","ext/jl4rb"]
   s.files = PKG_FILES.to_a
   s.extensions = ["ext/jl4rb/extconf.rb"]
-  s.licenses = ['MIT', 'GPL-2.0']
+  s.licenses = ['MIT']
   s.description = <<-EOF
 R is embedded in ruby with some communication support .
 EOF

data/lib/jl4rb.rb

@@ -1,5 +1,5 @@
-require 'jl4rb.bundle' if File.exists? File.join(File.dirname(__FILE__),'jl4rb.bundle') 
-require 'jl4rb.so' if File.exists? File.join(File.dirname(__FILE__),'jl4rb.so')
+require 'jl4rb.bundle' if File.exist? File.join(File.dirname(__FILE__),'jl4rb.bundle') 
+require 'jl4rb.so' if File.exist? File.join(File.dirname(__FILE__),'jl4rb.so')
 
 p [:dl, "jl4rb.DLL loaded" ]
 # loading ruby files

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jl4rb
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.3.0
 platform: ruby
 authors:
 - CQLS
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-10-29 00:00:00.000000000 Z
+date: 2024-10-22 00:00:00.000000000 Z
 dependencies: []
 description: 'R is embedded in ruby with some communication support .
 
@@ -33,7 +33,6 @@ files:
 homepage: http://cqls.upmf-grenoble.fr
 licenses:
 - MIT
-- GPL-2.0
 metadata: {}
 post_install_message:
 rdoc_options: []
@@ -52,7 +51,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements:
 - none
-rubygems_version: 3.3.11
+rubygems_version: 3.5.20
 signing_key:
 specification_version: 4
 summary: Julia for ruby