jl4rb 0.2.2 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cee2b9429514424e01c99dcec41acf6066b5c399937723649159f411e714abfb
-  data.tar.gz: 623f3df43750d4f369cd9b221f4d68df83e6d87739d98b48136479e532ecece1
+  metadata.gz: b8b8aade7e2cc0fc2991e6352b94f47a56c7683f818373036afe32b83bb52e28
+  data.tar.gz: 781b45f9522acb27f4422e7f6f1cc6879dda966b7f5fee0cd505d21891fd0e2a
 SHA512:
-  metadata.gz: a440ce035beee6f21b263870cc3292fcc7ac54dd36778c743cdd30086d6952b1aae36e91bc1380734e63186bd90a81c6509115206292ca0111f79ed4a6d00215
-  data.tar.gz: cc61b73afa390b9b189f0454b73de020c9614c7bdd382c01ea6d218f1ddca10f47b5b1c3a41b09789847d41978476ca7be515e526c408e0041b98c9180c57c64
+  metadata.gz: daabc722567025b44d986a6f033b1de3ccd31dc16059b889b987eb6fa272d752a6b258eccbb5ce484110e06c2692522c7a7a6c68950da7590eed0bc49dd349e2
+  data.tar.gz: a4e322987a2d7f31c9bbb29353aecd0d5acdcda4ceaf11c7170b2aee892f3ec8e39d0265d93ffe345bd047d7c4cc754d3125cdfe43d71b880e401f8bf524314f

data/ext/jl4rb/extconf.rb

@@ -15,19 +15,21 @@ end
 def jl4rb_makefile(incs,libs)
 
     jl_share=`julia -e 'print(joinpath(Sys.BINDIR, Base.DATAROOTDIR, "julia"))'`
-    $CFLAGS     =`julia #{jl_share}/julia-config.jl --cflags`.strip
+    $CFLAGS     =`julia #{jl_share}/julia-config.jl --cflags`.strip + " -fdeclspec"
     $LDFLAGS    =`julia #{jl_share}/julia-config.jl --ldflags`.strip
-    $libs    =`julia #{jl_share}/julia-config.jl --ldlibs`.strip
+    $LIBS    = `julia #{jl_share}/julia-config.jl --ldlibs`.strip
 
+    puts [$CFLAGS, $LDFLAGS, $LIBS]
 
     header = nil
 
-    rb4r_name="jl4rb"
-    $objs = [rb4r_name+".o"]
+    jl4r_name="jl4rb"
+    $objs = [jl4r_name+".o"]
 
-    dir_config("R4rb")
-    p ( {:CFLAGS => $CFLAGS, :LDFLAGS => $LDFLAGS, :libs => $libs })
-    create_makefile(rb4r_name)
+    dir_config("jl4rb")
+    # 
+    p ( {:CFLAGS => $CFLAGS, :LDFLAGS => $LDFLAGS, :LIBS => $LIBS })
+    create_makefile(jl4r_name)
 end
-
+#p [$prefix_include,$prefix_lib]
 jl4rb_makefile($prefix_include,$prefix_lib)

data/ext/jl4rb/jl4rb.c

@@ -4,7 +4,6 @@
 
 **********************************************************************/
 
-#include "julia.h"
 #include <stdio.h>
 #include <string.h>
 #include <math.h>
@@ -17,23 +16,28 @@
 //#endif
 
 //-| next macros already exist in ruby and are undefined here
-//#undef T_FLOAT
 #undef NORETURN
 #include "ruby.h"
 #include "ruby/version.h"
+#undef T_FLOAT
+#undef NOINLINE
+#include "julia.h"
 
 #define length(a) jl_array_size(a,0)
 
 /************* INIT *********************/
 
 
-VALUE Julia_init()
+VALUE Julia_init(VALUE obj)
 {
-  jl_init();
+  //jl_init();
+  printf("%s %s\n", jl_get_libdir(), jl_get_default_sysimg_path());
+  jl_init(); //_with_image("/Applications/Julia-1.6.app/Contents/Resources/julia/bin", "../lib/sys.dylib");
+  printf("ok\n");
   return Qtrue;
 }
 
-VALUE Julia_exit(VALUE exitcode) {
+VALUE Julia_exit(VALUE obj, VALUE exitcode) {
   jl_atexit_hook(exitcode);
   return Qtrue;
 }
@@ -278,7 +282,7 @@ VALUE util_jl_value_to_VALUE(jl_value_t *ans)
 //-| Todo: when not a vector, avoid transform to vector first.
 jl_value_t* util_VALUE_to_jl_value(VALUE arr)
 {
-  jl_value_t *ans,*elt;
+  jl_value_t *ans,*elt,*array_type;
   VALUE res,class,tmp;
   int i,n=0,vect=1;
 
@@ -293,39 +297,43 @@ jl_value_t* util_VALUE_to_jl_value(VALUE arr)
   }
 
   class=rb_class_of(rb_ary_entry(arr,0));
-  ans=jl_alloc_cell_1d(n);
+  
   if(class==rb_cFloat) {
     //-| This is maybe faster and can be developped in julia-api as jl_vector_float64(n) for example.
-    //ans=jl_alloc_array_1d(jl_float64_type,n);
+    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(ans,elt,i);
+      jl_arrayset((jl_array_t*)ans,elt,i);
     }
 #if RUBY_API_VERSION_CODE >= 20400
   } else if(class==rb_cInteger) {
 #else
   } else if(class==rb_cFixnum || class==rb_cBignum) {
 #endif
-    //ans=jl_alloc_array_1d(jl_long_type,n);
+    array_type=jl_apply_array_type((jl_value_t*)jl_long_type, 1);
+    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(ans,elt,i);
+      jl_arrayset((jl_array_t*)ans,elt,i);
     }
   } else if(class==rb_cTrueClass || class==rb_cFalseClass) {
-    //ans=jl_alloc_array_1d(jl_bool_type,n);
+    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(ans,elt,i);
+      jl_arrayset((jl_array_t*)ans,elt,i);
     }
   } else if(class==rb_cString) {
-    //ans=jl_alloc_array_1d(jl_utf8_string_type,n);
+    array_type=jl_apply_array_type((jl_value_t*)jl_string_type, 1);
+    ans=(jl_value_t*)jl_alloc_array_1d(array_type,n);
     for(i=0;i<n;i++) {
       tmp=rb_ary_entry(arr,i);
       elt=jl_cstr_to_string(StringValuePtr(tmp));
-      jl_arrayset(ans,elt,i);
+      jl_arrayset((jl_array_t*)ans,elt,i);
     }
   } else ans=NULL;
-  if(!vect && ans) ans=jl_arrayref(ans,0);
+  if(!vect && ans) ans=jl_arrayref((jl_array_t*)ans,0);
   return ans;
 }
 
@@ -502,7 +510,7 @@ Init_jl4rb()
   mJulia = rb_define_module("Julia");
 
   rb_define_module_function(mJulia, "initJL", Julia_init, 0);
-
+ 
   rb_define_module_function(mJulia, "exitJL", Julia_exit, 1);
 
   rb_define_module_function(mJulia, "evalLine", Julia_eval, 2);

data/jl4rb.gemspec

@@ -2,7 +2,7 @@ require 'rubygems'
 require 'rubygems/package_task'
 
 PKG_NAME='jl4rb'
-PKG_VERSION='0.2.2'
+PKG_VERSION='0.2.5'
 PKG_FILES=FileList[
     'Rakefile','jl4rb.gemspec',
     'ext/jl4rb/*.c',

data/lib/jl4rb.rb

@@ -1,6 +1,7 @@
 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')
 
+p [:dl, "jl4rb.DLL loaded" ]
 # loading ruby files
 require 'jl4rb/jl2rb_init'
 require 'jl4rb/jl2rb_eval'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jl4rb
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.5
 platform: ruby
 authors:
 - CQLS
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-11-23 00:00:00.000000000 Z
+date: 2022-03-27 00:00:00.000000000 Z
 dependencies: []
 description: 'R is embedded in ruby with some communication support .
 
@@ -35,7 +35,7 @@ licenses:
 - MIT
 - GPL-2.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -52,8 +52,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements:
 - none
-rubygems_version: 3.0.6
-signing_key: 
+rubygems_version: 3.3.7
+signing_key:
 specification_version: 4
 summary: Julia for ruby
 test_files: []