rb_require narray on modshogun module load

shogun-toolbox · Nov 23, 2011 · ecdb955 · ecdb955
1 parent fd6b20d
commit ecdb955
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 7 deletions.
diff --git a/src/Makefile.template b/src/Makefile.template
@@ -303,7 +303,7 @@ install-java_modular: $(TEMPLATE_TARGET)
 
 install-ruby_modular: $(TEMPLATE_TARGET)
 	install -d -m755 "$(DESTDIR)/$(RUBY_EXTENSIONS_INSTALL_DIR)"
-	install -m755 modshogun.$(EXT_LIB) "$(DESTDIR)/$(RUBY_EXTENSIONS_INSTALL_DIR)/modshogun$(EXT_LIB_SWIG_RUBY_MODULAR)"
+	install -m755 modshogun$(EXT_LIB_SWIG_RUBY_MODULAR) "$(DESTDIR)/$(RUBY_EXTENSIONS_INSTALL_DIR)/"
 
 install-lua_modular: $(TEMPLATE_TARGET)
 	install -d -m755 "$(DESTDIR)/$(LUA_EXTENSIONS_INSTALL_DIR)"
@@ -428,7 +428,7 @@ run-testsuite-ruby_modular:
 check-examples-ruby_modular:
 	cd $(CONFIGPATH)/../examples/undocumented/ruby_modular && \
 		( $(LIBRARY_PATH)=$(DESTDIR)$(LIBDIR) \
-		RUBYLIB="$(DESTDIR)$(RUBY_EXTENSIONS_INSTALL_DIR):." ./check.sh )
+		RUBYLIB="$$RUBYLIB:$(DESTDIR)$(RUBY_EXTENSIONS_INSTALL_DIR):." ./check.sh )
 
 lib/versionstring.h:    $(GITHEAD) 
 	        sh $(CONFIGPATH)/.version.sh > $@

diff --git a/src/interfaces/modular/SGBase.i b/src/interfaces/modular/SGBase.i
@@ -78,6 +78,7 @@ public void readExternal(java.io.ObjectInput in) throws java.io.IOException, jav
 %{
 #ifdef SWIGRUBY
  extern "C" {
+  #include <ruby.h>
   #include <narray.h>
   #include <stdlib.h>
   #include <stdio.h>
@@ -140,15 +141,50 @@ public void readExternal(java.io.ObjectInput in) throws java.io.IOException, jav
 #endif
 
 #ifdef SWIGRUBY
+        extern VALUE ruby_class;
+        rb_require("narray");
+        cNArray = rb_const_get(ruby_class, rb_intern("NArray"));
+
+        char* error=NULL;
+
         void* handle = dlopen(NARRAY_LIB, RTLD_LAZY);
         if (!handle) {
             fprintf(stderr, "%s\n", dlerror());
             exit(EXIT_FAILURE);
         }
 
+        dlerror();    /* Clear any existing error */
+
         *(void **) (&na_to_array_dl) = dlsym(handle, "na_to_array");
+        if ((error = dlerror()) != NULL)  {
+                fprintf(stderr, "na_to_array %s\n", error);
+                exit(EXIT_FAILURE);
+        }
+
+        /*if (cNArray==0)
+        {
+            void (*Init_narray)();
+            *(void **) (&Init_narray) = dlsym(handle, "Init_narray");
+            if ((error = dlerror()) != NULL)  {
+                fprintf(stderr, "Init_narray %s\n", error);
+                exit(EXIT_FAILURE);
+            }
+
+            fprintf(stderr, "initing narray\n");
+            (*Init_narray)();
+        }*/
+
         *(void **) (&na_to_narray_dl) = dlsym(handle, "na_to_narray");
-        *(void **) (&cNArray) = dlsym(handle, "cNArray");
+        if ((error = dlerror()) != NULL)  {
+                fprintf(stderr, "na_to_narray %s\n", error);
+                exit(EXIT_FAILURE);
+        }
+
+/*        cNArray = (*(VALUE*)(dlsym(handle, "cNArray")));
+        if ((error = dlerror()) != NULL)  {
+                fprintf(stderr, "cNArray %s\n", error);
+                exit(EXIT_FAILURE);
+        }*/
 #endif
 %}
 

diff --git a/src/interfaces/ruby_modular/swig_typemaps.i b/src/interfaces/ruby_modular/swig_typemaps.i
@@ -35,7 +35,7 @@
 	else {
 		if (NA_IsNArray($input)) {
 
-			VALUE v = na_to_array_dl($input);
+			VALUE v = (*na_to_array_dl)($input);
 			len = RARRAY_LEN(v);
 			array = SG_MALLOC(SGTYPE, len);
 
@@ -61,7 +61,7 @@
 
 	$1.free_vector();
 
-	$result = na_to_narray_dl(arr);
+	$result = (*na_to_narray_dl)(arr);
 }
 
 %enddef
@@ -98,7 +98,7 @@ TYPEMAP_SGVECTOR(float64_t, NUM2DBL, rb_float_new)
 
 	if (rb_obj_is_kind_of($input,rb_cArray) || NA_IsNArray($input)) {
 		if (NA_IsNArray($input))	{
-			v = na_to_array_dl($input);	
+			v = (*na_to_array_dl)($input);	
 		}
 		else {
 			v = $input;		
@@ -145,7 +145,7 @@ TYPEMAP_SGVECTOR(float64_t, NUM2DBL, rb_float_new)
 
 	$1.free_matrix();
 
-	$result = na_to_narray_dl(arr);
+	$result = (*na_to_narray_dl)(arr);
 }
 
 %enddef