jl4rb 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2284c017e95791b1179e1f0a61b46520f193a0057b9ce968d46071126408b219
-  data.tar.gz: 7c5223125d3a8bd4ac49e10db04e7071050b870e84278dbd835c6b1f5c29bef4
+  metadata.gz: 5c7ae193c99972539639a96d7964b652f4d778c4003566549ad28acff8d58fa1
+  data.tar.gz: c588912e8ad02fda35f7eb0034cdf7e5d3d220385a991824bd594ac8bf67244b
 SHA512:
-  metadata.gz: 811939ca02ebe88ffc9eb91836a28872ffec2191668ca82179e5c0a2d7c3620e0a9637b8bf187e703694e682f8db7f92f0f6f9139a44c5a911bb9335f9f1f762
-  data.tar.gz: 6fd70f99e98ddae1ad68239cebfc12b5eae5c5c6111c3a489d00d2cdf9f96cd37cd252924e6c9555748ca4cebba0a120c51e98e92198959f265c09c90f15be08
+  metadata.gz: b9f41f2debc68026e427d292cade9b08d70f44b3702f8885728f0367ba4478a65dec3177f7b3577c6de0fbbacea83f3e9e80f8bc005303d82b8a3a7e4ef0a329
+  data.tar.gz: 9c496f95518a6ea625b41ae22a60743a660f8fa760fc964a8fb0862a3aa71f7de0c33916e2d38c32f1304bdd9ddb9a68665dad238947dae5a3571b1e76377685

data/ext/jl4rb/extconf.rb

@@ -1,37 +1,23 @@
 require "mkmf"
-require 'fileutils' #if RUBY_VERSION < "1.9"
-
+require 'fileutils'
 
 $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"
-
-#     $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
-    [$prefix+"/include/julia",$prefix+"/usr/include",$prefix+"/src",$prefix+"/src/support"].each do |incl|
-    	$prefix_include << incl if File.exists? 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
-    end
-# end
+$prefix= File.dirname(`julia -e 'print(Sys.BINDIR)'`)
 
-def jl4rb_makefile(incs,libs)
-    #$CFLAGS = "-I"+inc+" -I."
-    # $CFLAGS = (enable_config("julia-release") ? "-DWITH_JULIA_RELEASE " : "")+ "-I"+inc+" -I."
-    # $LDFLAGS = " -Wl,-rpath,"+lib+" -L"+lib if lib
-    # $libs = (enable_config("julia-release") ? " -ljulia-release" : " -ljulia-api" )
+[$prefix+"/include/julia",$prefix+"/usr/include",$prefix+"/src",$prefix+"/src/support"].each do |incl|
+    $prefix_include << incl if File.exists? incl
+end
 
-    ## TODO: utiliser julia-config 
+([$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
+
+def jl4rb_makefile(incs,libs)
 
- 	$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"
+    jl_share=`julia -e 'print(joinpath(Sys.BINDIR, Base.DATAROOTDIR, "julia"))'`
+    $CFLAGS     =`julia #{jl_share}/julia-config.jl --cflags`
+    $LDFLAGS    =`julia #{jl_share}/julia-config.jl --ldflags`
+    $libs    =`julia #{jl_share}/julia-config.jl --ldlibs`
 
 
     header = nil

data/ext/jl4rb/jl4rb.c

@@ -9,8 +9,6 @@
 #include <string.h>
 #include <math.h>
 
-//JULIA_DEFINE_FAST_TLS()
-
 //#define WITH_JULIA_RELEASE
 
 //#ifdef WITH_JULIA_RELEASE
@@ -29,41 +27,9 @@
 /************* INIT *********************/
 
 
-VALUE Julia_init(VALUE obj, VALUE args)
+VALUE Julia_init()
 {
-  char **argv,*julia_home_dir;
-  int i,argc;
-  VALUE tmp;
-
-  argc=RARRAY_LEN(args) + 1;
-  tmp=rb_ary_entry(args,0);
-  julia_home_dir=StringValuePtr(tmp);
-  //printf("First initialization with julia_home_dir=%s\n",julia_home_dir);
-// printf("copy stacks ");
-// #ifdef COPY_STACKS
-//   printf("defined \n");
-// #else
-//   printf("undefined \n");
-// #endif
-// printf("JL_SET_STACK_BASE ");
-// #ifdef JL_SET_STACK_BASE
-//   printf("defined \n");
-// #else
-//   printf("undefined \n");
-// #endif
-//#ifdef WITH_JULIA_RELEASE
-  // if(strcmp(julia_home_dir,"")==0) {
-  //   jl_init(); //(NULL);
-  //   //JL_SET_STACK_BASE;
-  // } else {
-    jl_init(); //(julia_home_dir);
-    //julia_init(JL_IMAGE_JULIA_HOME);
-  //   //JL_SET_STACK_BASE;
-  // }
-//#else
-//  jlapi_init(julia_home_dir,mode);
-//#endif
-
+  jl_init();
   return Qtrue;
 }
 
@@ -535,7 +501,7 @@ Init_jl4rb()
 
   mJulia = rb_define_module("Julia");
 
-  rb_define_module_function(mJulia, "initJL", Julia_init, 1);
+  rb_define_module_function(mJulia, "initJL", Julia_init, 0);
 
   rb_define_module_function(mJulia, "exitJL", Julia_exit, 1);
 

data/jl4rb.gemspec

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

data/lib/jl4rb/jl2rb_init.rb

@@ -1,11 +1,8 @@
 module Julia
 
-  def Julia.init(args={})
+  def Julia.init
     unless Julia.alive?
-      args={:img=>File.join(ENV["JULIA_DIR"],"lib")}.merge(args) if ENV["JULIA_DIR"]
-      args={:img=>ENV["JULIA_IMG_DIR"]}.merge(args) if ENV["JULIA_IMG_DIR"]
-      #p [:julia_init,args,ENV]
-      @@initJL=Julia.initJL([args[:img]])
+      @@initJL=Julia.initJL
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jl4rb
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - CQLS