jl4rb 0.0.10 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: aa762020a0d0b5213c4d62447f70eeeebb9b0739
-  data.tar.gz: e671f5d40a569ee2c420bbcf0bda2100ae977ff8
+SHA256:
+  metadata.gz: 2deb18c81ccd3f5a6392064cd109eebdd3d87280d78ac3a152e92b9668d6c2fe
+  data.tar.gz: 0c0818404e1d24520f7d598c16bb777b9e8d3173440be03bf63b141a02509169
 SHA512:
-  metadata.gz: 9062b693634f2c18105ec3b44a92e640f1f5bf9932e36f52a8169f995d5759759cbea88e48030656c9af819af79e61b6ff433868de50b8b13ab423326ca0aea7
-  data.tar.gz: 5ffec378260ad258b1d64bf3d2c1b97b878e4ad0e76f31e09d0dc70cfdde88ea147973fde518a0df2bb9318ee6c072391376790ddd95aae62e4c1f59e9b119ea
+  metadata.gz: 5b152d43c269981d459c3182bb1860331d6ee998064cfbd3dc358f5bbaa7ce12fe88d3fae0ae2bf9de82a2d5c95ac467fb206b430bd8e9bb43ad07d3c475d055
+  data.tar.gz: 417e6fbafe4972a696860b9afa8a45defd190b84c67d1b5a6029d25db70c047f7c046aae7b33a40609aa25e1ec5da5b5fec9020f00369c5c731b2f6351260c1b

data/ext/jl4rb/extconf.rb

@@ -3,12 +3,12 @@ require 'fileutils' #if RUBY_VERSION < "1.9"
 
 
 $prefix_include,$prefix_lib=[],[]
-if RUBY_PLATFORM =~ /linux/
-    $prefix_include << "/usr/include/"+RUBY_PLATFORM+"/julia" if File.exists? "/usr/include/"+RUBY_PLATFORM+"/julia"
-    $prefix_include << "/usr/include/julia" if File.exists? "/usr/include/julia"
+# if RUBY_PLATFORM =~ /linux/
+#     $prefix_include << "/usr/include/"+RUBY_PLATFORM+"/julia" if File.exists? "/usr/include/"+RUBY_PLATFORM+"/julia"
+#     $prefix_include << "/usr/include/julia" if File.exists? "/usr/include/julia"
 
-    $prefix_lib << "/usr/lib/"+RUBY_PLATFORM+"/julia" if File.exists? "/usr/lib/"+RUBY_PLATFORM+"/julia"
-else
+#     $prefix_lib << "/usr/lib/"+RUBY_PLATFORM+"/julia" if File.exists? "/usr/lib/"+RUBY_PLATFORM+"/julia"
+# else
     #$prefix=ENV["JLAPI_HOME"] || File.join(ENV["HOME"],".jlapi/julia") || ENV["JULIA_HOME"]
     $prefix=ENV["JULIA_DIR"]
     #p  $prefix
@@ -19,7 +19,7 @@ else
     ([$prefix+"/lib/julia",$prefix+"/usr/lib",$prefix+"/lib"]+(RUBY_PLATFORM=~/(?:mingw|msys)/ ? [$prefix+"/bin"] : [])).each do |lib|
     	$prefix_lib << lib if File.exists? lib
     end
-end
+# end
 
 def jl4rb_makefile(incs,libs)
     #$CFLAGS = "-I"+inc+" -I."
@@ -27,8 +27,10 @@ def jl4rb_makefile(incs,libs)
     # $LDFLAGS = " -Wl,-rpath,"+lib+" -L"+lib if lib
     # $libs = (enable_config("julia-release") ? " -ljulia-release" : " -ljulia-api" )
 
- 	$CFLAGS =   incs.map{|inc| "-I"+inc}.join(" ")+" -I."
-    $LDFLAGS = " "+libs.map{|lib| "-Wl,-rpath,"+lib+" -L"+lib}.join(" ") if libs
+    ## TODO: utiliser julia-config 
+
+ 	$CFLAGS = "-DJULIA_ENABLE_THREADING=1 -fPIC " + incs.map{|inc| "-I"+inc}.join(" ")+" -I."
+    $LDFLAGS = " "+libs.map{|lib| "-Wl,-rpath,'"+lib+"' -L'"+lib+"'"}.join(" ") if libs
     $libs =  " -ljulia"
 
 
@@ -38,6 +40,7 @@ def jl4rb_makefile(incs,libs)
     $objs = [rb4r_name+".o"]
 
     dir_config("R4rb")
+    p ( {:CFLAGS => $CFLAGS, :LDFLAGS => $LDFLAGS, :libs => $libs })
     create_makefile(rb4r_name)
 end
 

data/ext/jl4rb/jl4rb.c

@@ -9,6 +9,8 @@
 #include <string.h>
 #include <math.h>
 
+JULIA_DEFINE_FAST_TLS()
+
 //#define WITH_JULIA_RELEASE
 
 //#ifdef WITH_JULIA_RELEASE
@@ -50,13 +52,14 @@ VALUE Julia_init(VALUE obj, VALUE args)
 //   printf("undefined \n");
 // #endif
 //#ifdef WITH_JULIA_RELEASE
-  if(strcmp(julia_home_dir,"")==0) {
-    jl_init(); //(NULL);
-    //JL_SET_STACK_BASE;
-  } else {
+  // if(strcmp(julia_home_dir,"")==0) {
+  //   jl_init(); //(NULL);
+  //   //JL_SET_STACK_BASE;
+  // } else {
     jl_init(); //(julia_home_dir);
-    //JL_SET_STACK_BASE;
-  }
+    //julia_init(JL_IMAGE_JULIA_HOME);
+  //   //JL_SET_STACK_BASE;
+  // }
 //#else
 //  jlapi_init(julia_home_dir,mode);
 //#endif
@@ -64,6 +67,11 @@ VALUE Julia_init(VALUE obj, VALUE args)
   return Qtrue;
 }
 
+VALUE Julia_exit(VALUE exitcode) {
+  jl_atexit_hook(exitcode);
+  return Qtrue;
+}
+
 //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) {
@@ -212,7 +220,8 @@ VALUE Julia_eval(VALUE obj, VALUE cmd, VALUE print_stdout)
   res=jl_eval_string(cmdString);
   //printf("cmd=%s\n",cmdString);
   if (jl_exception_occurred()) {
-            jl_show(jl_stderr_obj(), jl_exception_occurred());
+            //jl_show(jl_stderr_obj(), jl_exception_occurred());
+            jl_call2(jl_get_function(jl_base_module, "show"), jl_stderr_obj(), jl_exception_occurred());
             jl_printf(jl_stderr_stream(), "\n");
             resRb=Qnil;
   } else {
@@ -528,6 +537,8 @@ Init_jl4rb()
 
   rb_define_module_function(mJulia, "initJL", Julia_init, 1);
 
+  rb_define_module_function(mJulia, "exitJL", Julia_exit, 1);
+
   rb_define_module_function(mJulia, "evalLine", Julia_eval, 2);
 
   rb_define_module_function(mJulia, "execLine", Julia_exec, 2);

data/jl4rb.gemspec

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

data/lib/jl4rb/jl2rb_init.rb

@@ -13,4 +13,8 @@ module Julia
     defined? @@initJL
   end
 
+  def Julia.exit()
+    Julia.exitJL(0)
+  end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jl4rb
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.1.1
 platform: ruby
 authors:
 - CQLS
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-11 00:00:00.000000000 Z
+date: 2018-10-02 00:00:00.000000000 Z
 dependencies: []
 description: 'R is embedded in ruby with some communication support .
 
@@ -53,7 +53,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - none
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Julia for ruby