ruby-dcl 1.7.1 → 1.8.2

data/demo/rakuraku/uxyz/uxyz7.rb

@@ -1,10 +1,9 @@
 #
 # uxyz7.rb
-#   $Id: uxyz7.rb,v 1.1.1.1 2011/02/23 07:21:26 horinout Exp $
+#   $Id$
 #
 
 
-require "narray"
 require "numru/dcl"
 include NumRu
 include Math

data/demo/rakuraku/uxyz/uxyz8.rb

@@ -1,10 +1,9 @@
 #
 # uxyz8.rb
-#   $Id: uxyz8.rb,v 1.1.1.1 2011/02/23 07:21:26 horinout Exp $
+#   $Id$
 #
 
 
-require "narray"
 require "numru/dcl"
 include NumRu
 include Math

data/demo/rubydcloriginal/uemrkz1.rb

@@ -1,4 +1,3 @@
-require "narray"
 require "numru/dcl"
 include NumRu
 include NMath

data/ext/numru/dcl_cary2obj.c

@@ -1,20 +1,25 @@
 /*
  * dcl_cary2obj.c
- *   $Id: dcl_cary2obj.c,v 1.1.1.1 2011/02/23 07:21:26 horinout Exp $
+ *   $Id$
  */
 
 #include <math.h>
 #include "ruby.h"
-#include "libtinyf2c.h"
+#include "cdcl.h"
 #include "narray.h"  /* kuro: depend on numarray.so */
 
+#ifndef NARRAY_BIGMEM
+typedef int    na_shape_t;
+#endif
 
 /*  functions  */
 VALUE dcl_ccharary2obj(char *, int, int);
-VALUE dcl_cintegerary2obj(integer *, int, int, int *);
-VALUE dcl_crealary2obj(real *, int, int, int *);
-VALUE dcl_ccomplexary2obj(complex *, int, char *);
-VALUE dcl_clogicalary2obj(logical *, int, int, int *);
+VALUE dcl_cintegerary2obj(integer *, na_shape_t, int, na_shape_t *);
+VALUE dcl_crealary2obj(real *, na_shape_t, int, na_shape_t *);
+/* not implemented
+VALUE dcl_ccomplexary2obj(complex *, na_shape_t, int, na_shape_t *);
+*/
+VALUE dcl_clogicalary2obj(logical *, na_shape_t, int, na_shape_t *);
 
 static VALUE ccharary2ary(char *, int, int);
 static VALUE cintegerary2ary(integer *, int);
@@ -25,9 +30,9 @@ static VALUE ccomplexary2ary(complex *, int);
 */
 
 /* kuro: depend on numarray.so */
-static VALUE crealary2na(real *, int, int, int *);
-static VALUE clogicalary2na(logical *, int, int, int *);
-static VALUE cintegerary2na(integer *, int, int, int *);
+static VALUE crealary2na(real *, na_shape_t, int, na_shape_t *);
+static VALUE clogicalary2na(logical *, na_shape_t, int, na_shape_t *);
+static VALUE cintegerary2na(integer *, na_shape_t, int, na_shape_t *);
 /* not implemented
 static VALUE ccomplexary2na(complex *, int, char *);
 */
@@ -57,9 +62,9 @@ dcl_ccharary2obj(cary, size, len)
 VALUE
 dcl_cintegerary2obj(cary, size, rank, shape)
     integer *cary;
-    int size;
+    na_shape_t size;
     int rank;
-    int *shape;
+    na_shape_t *shape;
 {
     VALUE obj;
 
@@ -75,9 +80,9 @@ dcl_cintegerary2obj(cary, size, rank, shape)
 VALUE
 dcl_crealary2obj(cary, size, rank, shape)
     real *cary;
-    int size;
+    na_shape_t size;
     int rank;
-    int *shape;
+    na_shape_t *shape;
 {
     VALUE obj;
 
@@ -112,9 +117,9 @@ dcl_ccomplexary2obj(cary, size, type)
 VALUE
 dcl_clogicalary2obj(cary, size, rank, shape)
     logical *cary;
-    int size;
+    na_shape_t size;
     int rank;
-    int *shape;
+    na_shape_t *shape;
 {
     VALUE obj;
 
@@ -271,13 +276,13 @@ clogicalary2ary(cary, size)
 static VALUE
 crealary2na(cary, size, rank, shape)
     real *cary;
-    int size;
+    na_shape_t size;
     int rank;
-    int *shape;
+    na_shape_t *shape;
 {
     VALUE obj;
     struct NARRAY *na;
-    int i;
+    na_shape_t i;
     float *ptr;
 
     if (cary == NULL)
@@ -299,13 +304,13 @@ crealary2na(cary, size, rank, shape)
 static VALUE
 cintegerary2na(cary, size, rank, shape)
     integer *cary;
-    int size;
+    na_shape_t size;
     int rank;
-    int *shape;
+    na_shape_t *shape;
 {
     VALUE obj;
     struct NARRAY *na;
-    int i;
+    na_shape_t i;
     int32_t *ptr;
 
     if (cary == NULL)
@@ -327,13 +332,13 @@ cintegerary2na(cary, size, rank, shape)
 static VALUE
 clogicalary2na(cary, size, rank, shape)
     logical *cary;
-    int size;
+    na_shape_t size;
     int rank;
-    int *shape;
+    na_shape_t *shape;
 {
     VALUE obj;
     struct NARRAY *na;
-    int i;
+    na_shape_t i;
     u_int8_t *ptr;
 
     if (cary == NULL)

data/ext/numru/dcl_narrayed_funcs.c

@@ -8,7 +8,7 @@
 
 #include <stdio.h>
 #include "ruby.h"
-#include "libtinyf2c.h"
+#include "cdcl.h"
 #include "narray.h"
 
 /* for compatibility with ruby 1.6 */
@@ -38,29 +38,29 @@ extern void dcl_freeclogicalary(logical *);
 
 /* for functions which return real */
 /* fnclib */
-extern real rd2r_(real *);
-extern real rr2d_(real *);
-extern real rexp_(real *, integer *, integer *);
-extern real rfpi_(void);
-extern real rmod_(real *, real *);
+extern real rd2r__(real *);
+extern real rr2d__(real *);
+extern real rexp__(real *, integer *, integer *);
+extern real rfpi__(void);
+extern real rmod__(real *, real *);
 /* gnmlib */
-extern real rgnlt_(real *);
-extern real rgnle_(real *);
-extern real rgngt_(real *);
-extern real rgnge_(real *);
+extern real rgnlt__(real *);
+extern real rgnle__(real *);
+extern real rgngt__(real *);
+extern real rgnge__(real *);
 /* rfalib */
-extern real rmax_(real *, integer *, integer *);
-extern real rmin_(real *, integer *, integer *);
-extern real rsum_(real *, integer *, integer *);
-extern real rave_(real *, integer *, integer *);
-extern real rvar_(real *, integer *, integer *);
-extern real rstd_(real *, integer *, integer *);
-extern real rrms_(real *, integer *, integer *);
-extern real ramp_(real *, integer *, integer *);
+extern real rmax__(real *, integer *, integer *);
+extern real rmin__(real *, integer *, integer *);
+extern real rsum__(real *, integer *, integer *);
+extern real rave__(real *, integer *, integer *);
+extern real rvar__(real *, integer *, integer *);
+extern real rstd__(real *, integer *, integer *);
+extern real rrms__(real *, integer *, integer *);
+extern real ramp__(real *, integer *, integer *);
 /* rfblib */
-extern real rprd_(real *, real *, integer *, integer *, integer *);
-extern real rcov_(real *, real *, integer *, integer *, integer *);
-extern real rcor_(real *, real *, integer *, integer *, integer *);
+extern real rprd__(real *, real *, integer *, integer *, integer *);
+extern real rcov__(real *, real *, integer *, integer *, integer *);
+extern real rcor__(real *, real *, integer *, integer *, integer *);
 
 
 extern int stftrf_(real*,real*,real*,real*);

data/ext/numru/dcl_obj2cary.c

@@ -1,13 +1,17 @@
 /*
  * dcl_obj2cary.c
- *   $Id: dcl_obj2cary.c,v 1.1.1.1 2011/02/23 07:21:26 horinout Exp $
+ *   $Id$
  */
 
 #include <math.h>
 #include "ruby.h"
-#include "libtinyf2c.h"
+#include "cdcl.h"
 #include "narray.h"
 
+#ifndef NARRAY_BIGMEM
+typedef int    na_shape_t;
+#endif
+
 /* for compatibility with ruby 1.6 */
 #ifndef RFLOAT_VALUE
 #define RFLOAT_VALUE(x) ((real)(RFLOAT(x)->value))
@@ -427,7 +431,7 @@ na2crealary(src)
     VALUE src;
 {
     VALUE chk;
-    int len, i;
+    na_shape_t len, i;
     real *rtn;
     float *ptr;
     struct NARRAY *na;
@@ -455,7 +459,7 @@ na2cintegerary(src)
     VALUE src;
 {
     VALUE chk;
-    int len, i;
+    na_shape_t len, i;
     integer *rtn;
     int32_t *ptr;
     struct NARRAY *na;
@@ -485,7 +489,7 @@ na2clogicalary(src)
 {
     VALUE chk;
     struct NARRAY *na;
-    int len, i;
+    na_shape_t len, i;
     logical *rtn;
     unsigned char *ptr;
 

data/ext/numru/dcl_rubydcloriginal.c

@@ -4,11 +4,20 @@
 
 #include <stdio.h>
 #include "ruby.h"
-#include "libtinyf2c.h"
 #include "narray.h"
+#include "cdcl.h"
+
+/* for compatibility with ruby 1.6 */
+#ifndef StringValuePtr
+#define StringValuePtr(s) STR2CSTR(s)
+#endif
 
 #define DFLT_SIZE 32
 
+#ifndef NARRAY_BIGMEM
+typedef int    na_shape_t;
+#endif
+
 extern char    *dcl_obj2ccharary(VALUE, int, int);
 extern integer *dcl_obj2cintegerary(VALUE);
 extern real    *dcl_obj2crealary(VALUE);
@@ -16,10 +25,10 @@ extern complex *dcl_obj2ccomplexary(VALUE);
 extern logical *dcl_obj2clogicalary(VALUE);
 
 extern VALUE dcl_ccharary2obj(char *, int, int);
-extern VALUE dcl_cintegerary2obj(integer *, int, int, int *);
-extern VALUE dcl_crealary2obj(real *, int, int, int *);
-extern VALUE dcl_ccomplexary2obj(complex *, int, char *);
-extern VALUE dcl_clogicalary2obj(logical *, int, int, int *);
+extern VALUE dcl_cintegerary2obj(integer *, na_shape_t, int, na_shape_t *);
+extern VALUE dcl_crealary2obj(real *, na_shape_t, int, na_shape_t *);
+/* extern VALUE dcl_ccomplexary2obj(complex *, int, char *); */
+extern VALUE dcl_clogicalary2obj(logical *, na_shape_t, int, na_shape_t *);
 
 extern void dcl_freeccharary(char *);
 extern void dcl_freecintegerary(integer *);

data/ext/numru/extconf.rb

@@ -2,30 +2,68 @@ require "rubygems" unless defined?(Gem)
 
 require "mkmf"
 require "rbconfig"
-begin
-  require "fileutils"
-rescue LoadError
-  require "ftools"
-  module FileUtils
-    def copy(src, dst); File.copy(src, dst); end
-    module_function :copy
+so = RbConfig::CONFIG["DLEXT"]
+
+raise("Your gem is too old") unless Gem.respond_to?(:find_files) 
+
+env = ENV['NARRAY_TYPE']
+if env == "NArray" || env == "narray"
+  na_type = "narray"
+elsif env == "NumRu::NArray" || env == "numru-narray"
+  na_type = "numru-narray"
+elsif !env.nil?
+  raise "Unsupported value for the environment variable NARRAY_TYPE: #{env}"
+else
+  if Gem.find_files("narray.h").length > 0
+    na_type = "narray"
+  elsif Gem.find_files("numru/narray/narray.h").length > 0
+    na_type = "numru-narray"
   end
 end
 
-if Gem.respond_to?(:find_files)
-  require "rbconfig"
-  so = RbConfig::CONFIG["DLEXT"]
+case na_type
+when "narray"
   narray_include = File.expand_path(File.dirname(Gem.find_files("narray.h")[0]))
-  narray_lib = File.expand_path(File.dirname(Gem.find_files("narray." + so)[0]))
-else
-  gem_home=(`gem environment GEM_HOME`).chomp
-  narray_dir = Dir.glob("#{gem_home}/gems/narray-*").sort[-1]
-  if narray_dir
-    narray_include = narray_lib = narray_dir
+  if `ruby -v`.include?("mingw")
+    narray_lib = File.expand_path(File.dirname(Gem.find_files("src/libnarray.a")[0]))
   else
-    narray_include = narray_lib = [ $sitearchdir, $vendorarchdir]
+    narray_lib = File.expand_path(File.dirname(Gem.find_files("narray." + so)[0]))
+  end
+  File.open("../../lib/numru/dcl/narray_type.rb","w"){|f| f.puts <<EOS
+module NumRu
+  module DCL
+    SUPPORT_BIGMEM = false
   end
 end
+EOS
+  }
+when "numru-narray"
+  narray_include = File.expand_path(File.dirname(Gem.find_files("numru/narray/narray.h")[0]))
+  if `ruby -v`.include?("mingw")
+    narray_lib = File.expand_path(File.dirname(Gem.find_files("numru/narray/narray.a")[0]))
+  else
+    narray_lib = File.expand_path(File.dirname(Gem.find_files("numru/narray/narray." + so)[0]))
+  end
+  File.open("../../lib/numru/dcl/narray_type.rb","w"){|f| f.puts <<EOS
+module NumRu
+  module DCL
+    SUPPORT_BIGMEM = true
+  end
+end
+EOS
+  }
+end
+
+### disabled (for very old gem, perhaps <= 1.2) -->
+#  gem_home=(`gem environment GEM_HOME`).chomp
+#  narray_dir = Dir.glob("#{gem_home}/gems/narray-*/ext/narray").sort[-1]
+#  if narray_dir
+#    narray_include = narray_lib = narray_dir
+#  else
+#    narray_include = narray_lib = [ $sitearchdir, $vendorarchdir]
+#  end
+### <-- disabled
+
 dir_config('narray', narray_include, narray_lib)
 if ( ! ( have_header("narray.h") && have_header("narray_config.h") ) ) then
    print <<-EOS
@@ -42,12 +80,20 @@ end
 initcfile_default = $srcdir+"/init.c.default"
 initcfile = $srcdir+"/init.c"
 
-if(xsystem("which cdclconfig"))
-  cflags = `cdclconfig --cflags`.gsub(/\n/, " ")
-  ldflags = `cdclconfig --ldflags`.gsub(/\n/, " ")
-  ldlibs = `cdclconfig --ldlibs`.gsub(/-R.*?\s/, " ").gsub(/\n/, " ")
-  print "checking DCL version... "
-  dclversion = `cdclconfig --dclversion`.strip
+if(xsystem("which dclconfig"))
+  if `ruby -v`.include?("mingw")
+    cflags = `sh dclconfig --cflags`.gsub(/\n/, " ")
+    ldflags = `sh dclconfig --ldflags`.gsub(/\n/, " ")
+    ldlibs = `sh dclconfig --ldlibs`.gsub(/-R.*?\s/, " ").gsub(/\n/, " ")
+    print "checking DCL version... "
+    dclversion = `sh dclconfig --dclversion`.strip
+  else
+    cflags = `dclconfig --cflags`.gsub(/\n/, " ")
+    ldflags = `dclconfig --ldflags`.gsub(/\n/, " ")
+    ldlibs = `dclconfig --ldlibs`.gsub(/-R.*?\s/, " ").gsub(/\n/, " ")
+    print "checking DCL version... "
+    dclversion = `dclconfig --dclversion`.strip
+  end
   print "DCL Version: #{dclversion}\n"
   dclver = dclversion.gsub(/\./,'')
   dclver = dclver+'0' if dclver.length <= 2   # 53 --> 530 etc
@@ -59,6 +105,9 @@ if(xsystem("which cdclconfig"))
   $CFLAGS += ' '+cflags  + dclversionmacro
   $LOCAL_LIBS += ' ' + ldflags
   $LOCAL_LIBS += ldlibs
+  if `ruby -v`.include?("mingw")
+    $LOCAL_LIBS += ldlibs + " -lnarray"
+  end
 
   fin = File.open(initcfile_default)
   fout = File.open(initcfile,'w')
@@ -69,44 +118,7 @@ if(xsystem("which cdclconfig"))
   fin.close
 
 else
-  print "**Warning** cdclconfig is not found. Assume C version of DCL 5.2\n"
-  dcllibname = "cdcl52"
-  f2clibname = "f2c4dcl"
-  xlibname = "X11"
-  dcllibdir = "-L/usr/local/lib"
-  f2clibdir = "-L/usr/local/lib"
-  xlibdir = "-L/usr/local/X11R6/lib"
-  f2cincdir = "-I/usr/local/include"
-  $CFLAGS += f2cincdir
-  if(dcllibdir != f2clibdir)
-    libdir = " "+dcllibdir
-  else
-    libdir = " "+dcllibdir+" "+f2clibdir
-  end
-  $LOCAL_LIBS += " "+libdir+" "+xlibdir
-  $LOCAL_LIBS += " -l"+dcllibname+" -l"+f2clibname+" -l"+xlibname+" -lsocket -lnsl"
-
-  FileUtils.copy(initcfile_default, initcfile)
-end
-
-if /cygwin|mingw/ =~ RUBY_PLATFORM
-   have_library("narray") || raise("ERROR: narray import library is not found")
+  raise "dclconfig is not found."
 end
 
 create_makefile("numru/dcl_raw")
-
-######  Modify Makefile: #######
-File.rename("Makefile","Makefile.orig")
-oldmkfl = File.open("Makefile.orig")
-newmkfl = File.open("Makefile","w")
-oldmkfl.each_line{ |line|
-   case(line)
-   when /^distclean:/
-      newmkfl.puts(line)
-      newmkfl.puts("\t\t@$(RM) Makefile.orig")
-      newmkfl.puts("\t\t@$(RM) init.c")
-   else
-      newmkfl.puts(line)
-   end
-}
-newmkfl.close

data/ext/numru/grph1_csgi.c

@@ -1,10 +1,9 @@
 /*
- * $Id: p_header,v 1.3 2015/03/18 03:27:42 horinout Exp $
+ * $Id$
  */
 
 #include <stdio.h>
 #include "ruby.h"
-#include "libtinyf2c.h"
 #include "narray.h"
 #include "cdcl.h"
 
@@ -15,6 +14,10 @@
 
 #define DFLT_SIZE 32
 
+#ifndef NARRAY_BIGMEM
+typedef int    na_shape_t;
+#endif
+
 extern char    *dcl_obj2ccharary(VALUE, int, int);
 extern integer *dcl_obj2cintegerary(VALUE);
 extern real    *dcl_obj2crealary(VALUE);
@@ -22,10 +25,10 @@ extern complex *dcl_obj2ccomplexary(VALUE);
 extern logical *dcl_obj2clogicalary(VALUE);
 
 extern VALUE dcl_ccharary2obj(char *, int, int);
-extern VALUE dcl_cintegerary2obj(integer *, int, int, int *);
-extern VALUE dcl_crealary2obj(real *, int, int, int *);
-extern VALUE dcl_ccomplexary2obj(complex *, int, char *);
-extern VALUE dcl_clogicalary2obj(logical *, int, int, int *);
+extern VALUE dcl_cintegerary2obj(integer *, na_shape_t, int, na_shape_t *);
+extern VALUE dcl_crealary2obj(real *, na_shape_t, int, na_shape_t *);
+/* extern VALUE dcl_ccomplexary2obj(complex *, int, char *); */
+extern VALUE dcl_clogicalary2obj(logical *, na_shape_t, int, na_shape_t *);
 
 extern void dcl_freeccharary(char *);
 extern void dcl_freecintegerary(integer *);
@@ -79,7 +82,7 @@ dcl_csgi(obj, ic)
     o_rtn_val= ALLOCA_N(char, (2));
     memset(o_rtn_val, '\0', 2);
 
-    csgi_(o_rtn_val, (ftnlen)1, &i_ic);
+    csgi__(o_rtn_val, (ftnlen)1, &i_ic);
 
     rtn_val = rb_str_new2(o_rtn_val);
 
@@ -103,11 +106,37 @@ dcl_isgc(obj, ch)
     i_ch = StringValuePtr(ch);
 
 
-    o_rtn_val = isgc_(i_ch, (ftnlen)strlen(i_ch));
+    o_rtn_val = isgc__(i_ch, (ftnlen)strlen(i_ch));
 
     rtn_val = INT2NUM(o_rtn_val);
 
 
+    return rtn_val;
+
+}
+
+static VALUE
+dcl_usgi(obj, ic)
+    VALUE obj, ic;
+{
+    integer i_ic;
+    char *o_rtn_val;
+    VALUE rtn_val;
+
+    if ((TYPE(ic) != T_BIGNUM) || (TYPE(ic) != T_FIXNUM)) {
+      ic = rb_funcall(ic, rb_intern("to_i"), 0);
+    }
+
+    i_ic = NUM2INT(ic);
+
+    o_rtn_val= ALLOCA_N(char, (3+1));
+    memset(o_rtn_val, '\0', 3+1);
+
+    usgi__(o_rtn_val, (ftnlen)3, &i_ic);
+
+    rtn_val = rb_str_new2(o_rtn_val);
+
+
     return rtn_val;
 
 }
@@ -117,4 +146,5 @@ VALUE mDCL;
 {
     rb_define_module_function(mDCL, "csgi", dcl_csgi, 1);
     rb_define_module_function(mDCL, "isgc", dcl_isgc, 1);
+    rb_define_module_function(mDCL, "usgi", dcl_usgi, 1);
 }