ruby-lapack 1.4 → 1.4.1a

data/README.rdoc

@@ -1,13 +1,25 @@
 = What's Ruby-LAPACK
 
 Ruby-LAPACK is a Ruby wrapper of LAPACK.
-Requires
+
+= Requires
 
     * Ruby   (http://www.ruby-lang.org/)
     * LAPACK (http://www.netlib.org/lapack/)
     * NArray (http://narray.rubyforge.org/index.html.en)
 
 
+= Install
+
+== with gem
+ # gem install ruby-lapack
+
+== build from source
+ % rake
+ % rake tests
+ % sudo rake install
+
+
 = Usage
 
 You need require numru/lapack to use Ruby-lapack

data/Rakefile

@@ -1,86 +1,89 @@
 require "rubygems"
 require "rake/clean"
 require "rake/gempackagetask"
+require "rake/testtask"
 
+version = "1.4.1a"
 target_prefix = "numru"
 
-# get destdir
-if i = ARGV.index{|arg| /\ADESTDIR=/ =~ arg}
-  destdir = ARGV[i].sub(/\ADESTDIR=/,"")
-else
-  destdir = ""
-end
-
-# get sitelibdir
-if i = ARGV.index{|arg| /\ASITELIBDIR=/ =~ arg}
-  libdir = ARGV[i].sub(/\ASITELIBDIR=/,"")
-  unless File.exist?(libdir) && File.directory?(libdir)
-    raise "SITELIBDIR is invalid: #{sitelibdir}"
-  end
-else
-  libdir = Config::CONFIG["sitelibdir"]
-end
-# get sitearchdir
-if i = ARGV.index{|arg| /\ASITEARCHDIR=/ =~ arg}
-  archdir = ARGV[i].sub(/\ASITEARCHLIBDIR=/,"")
-  unless File.exist?(archdir) && File.directory?(archdir)
-    raise "SITEARCHDIR is invalid: #{sitearchdir}"
-  end
-else
-  archdir = Config::CONFIG["sitearchdir"]
-end
-
-
+# get options
+destdir = ENV["DESTDIR"]
+libdir = ENV["SITELIBDIR"] || Config::CONFIG["sitelibdir"]
+archdir = ENV["SITEARCHDIR"] || Config::CONFIG["sitearchdir"]
+config_opts = ENV["CONFIG_OPTIONS"]
 
 NAME = "lapack"
 LIBS = FileList["lib/#{target_prefix}/*rb"]
 DLLIB = "ext/#{NAME}.so"
+so_file = File.join("lib", target_prefix, "#{NAME}.so")
 
 
-task :default => DLLIB
+task :default => so_file
 
-desc "building extensions"
+desc "Building extensions"
+file so_file => DLLIB do
+  mkdir_p File.dirname(so_file)
+  rm_f so_file
+  cp DLLIB, so_file
+end
 file DLLIB => "ext/Makefile" do
   system("cd ext; make")
 end
-so_file = File.join("lib", target_prefix, "#{NAME}.so")
-file so_file => DLLIB do
-  mkdir File.dirname(so_file)
-  cp DLLIB, so_file
+file "ext/Makefile" => "ext/rb_lapack.h" do
+  unless system("cd ext; ruby extconf.rb #{config_opts}")
+    warn <<-EOL
+
+To give options to extconf.rb, set the options to CONFIG_OPTIONS
+e.g.
+% rake CONFIG_OPTIONS="--with-lapack=/opt/lapack"
+    EOL
+  end
 end
-file "ext/Makefile" do
-  system("cd ext; ruby extconf.rb")
+file "ext/rb_lapack.h" => "dev/make_csrc.rb" do
+  system("ruby dev/make_csrc.rb")
 end
 
-desc "install files to system"
+desc "Install files to system"
 task :install => [:install_so, :install_rb]
 
 task :install_so => DLLIB do
-  install DLLIB, File.join(destdir, archdir, target_prefix), 0755
+  dst = File.join(destdir, archdir, target_prefix)
+  mkdir_p dst
+  install DLLIB, dst, :mode => 0755
 end
 
 task :install_rb => LIBS do
-  LIB.each do |lib|
-    install lib, File.join(destdir, libdir, target_prefix), 644
+  dst = File.join(destdir, libdir, target_prefix)
+  mkdir_p dst
+  LIBS.each do |lib|
+    install lib, dst, :mode => 644
   end
 end
 
-
 CLEAN.include("ext/*.o")
-CLOBBER.include("ext/lapack.so")
+CLOBBER.include(DLLIB, so_file)
+CLOBBER.include("ext/Makefile")
 
 
 PKG_FILES = FileList["lib/#{target_prefix}/*rb"]
-PKG_FILES.include("ext/*.c", "ext/*h")
+PKG_FILES.include("ext/rb_lapack.h")
+PKG_FILES.include("ext/f2c_minimal.h")
+PKG_FILES.include("ext/*.c")
 PKG_FILES.include("Rakefile")
 PKG_FILES.include("COPYING", "GPL", "README.rdoc")
 PKG_FILES.include("doc/*.html", "samples/**/*rb")
 PKG_FILES.include("dev/*.rb", "dev/defs/*")
 TEST_FILES = FileList["tests/**/*.rb"]
 
+Rake::TestTask.new do |t|
+  t.libs << "lib"
+  t.libs << "tests"
+  t.test_files = TEST_FILES
+end
+
 spec = Gem::Specification.new do |s|
   s.name = "ruby-lapack"
-  s.version = "1.4"
+  s.version = version
   s.summary = "A Ruby wrapper of Lapack"
   s.description = <<EOL
 Ruby-LAPACK is a Ruby wrapper of Lapack, which is a linear algebra package (http://www.netlib.org/lapack/).
@@ -110,6 +113,7 @@ task :binary_package => binary_pkg
 file binary_pkg => so_file do
   files = PKG_FILES.dup
   files.include so_file
+  files.exclude "ext"
   spec.platform = Gem::Platform::CURRENT
   spec.files = files
   spec.extensions = []

data/dev/defs/cggbal

@@ -46,7 +46,8 @@
 - work: 
     :type: real
     :intent: workspace
-    :dims: "(lsame_(&job,\"S\")||lsame_(&job,\"B\")) ? MAX(1,6*n) : (lsame_(&job,\"N\")||lsame_(&job,\"P\")) ? 1 : 0"
+    :dims: 
+    - "(lsame_(&job,\"S\")||lsame_(&job,\"B\")) ? MAX(1,6*n) : (lsame_(&job,\"N\")||lsame_(&job,\"P\")) ? 1 : 0"
 - info: 
     :type: integer
     :intent: output

data/dev/defs/sggbal

@@ -46,7 +46,8 @@
 - work: 
     :type: real
     :intent: workspace
-    :dims: "(lsame_(&job,\"S\")||lsame_(&job,\"B\")) ? MAX(1,6*n) : (lsame_(&job,\"N\")||lsame_(&job,\"P\")) ? 1 : 0"
+    :dims: 
+    - "(lsame_(&job,\"S\")||lsame_(&job,\"B\")) ? MAX(1,6*n) : (lsame_(&job,\"N\")||lsame_(&job,\"P\")) ? 1 : 0"
 - info: 
     :type: integer
     :intent: output

data/dev/defs/zggbal

@@ -46,7 +46,8 @@
 - work: 
     :type: doublereal
     :intent: workspace
-    :dims: "(lsame_(&job,\"S\")||lsame_(&job,\"B\")) ? MAX(1,6*n) : (lsame_(&job,\"N\")||lsame_(&job,\"P\")) ? 1 : 0"
+    :dims: 
+    - "(lsame_(&job,\"S\")||lsame_(&job,\"B\")) ? MAX(1,6*n) : (lsame_(&job,\"N\")||lsame_(&job,\"P\")) ? 1 : 0"
 - info: 
     :type: integer
     :intent: output

data/ext/extconf.rb

@@ -31,73 +31,10 @@ EOF
   end
 end
 
-def try_func(func, libs, headers = nil, &b)
-  headers = cpp_include(headers)
-    try_link(<<"SRC", libs, &b) or try_link(<<"SRC", libs, &b)
-#{COMMON_HEADERS}
-#{headers}
-/*top*/
-int main() { return 0; }
-int MAIN__() { return main(); }
-int t() { void ((*volatile p)()); p = (void ((*)()))#{func}; return 0; }
-SRC
-#{headers}
-/*top*/
-int main() { return 0; }
-int MAIN__() { return main(); }
-int t() { #{func}(); return 0; }
-SRC
-end
-    
-
-def find_library(lib, func=nil, name=nil)
-  func = "main" if !func or func.empty?
-  ldir = with_config(lib+'-lib')
-  ldirs = ldir ? Array === ldir ? ldir : ldir.split(File::PATH_SEPARATOR) : []
-  $LIBPATH = ldirs | $LIBPATH
-  if /\.(a|so)$/ =~ name
-    libs = $libs
-    $LIBPATH.each{|path|
-      f = File.join(path,name)
-      if File.exist?(f)
-        libs = f + " " + $libs
-        break
-      end
-    }
-  else
-    name = LIBARG%lib
-    libs = append_library($libs, lib)
-  end
-  paths = {}
-  checking_for "#{func}() in #{name}" do
-    libpath = $LIBPATH
-    begin
-      until r = try_func(func, libs) or paths.empty?
-        $LIBPATH = libpath | [paths.shift]
-      end
-      if r
-        $libs = libs
-        libpath = nil
-      end
-    ensure
-      $LIBPATH = libpath if libpath
-    end
-    r
-  end
-end
-
-
-unless File.exist?("rb_lapack.c")
-  print "making c source files\n"
-  cmd = File.join( File.dirname(__FILE__), "..", "dev", "make_csrc.rb")
-  unless system("ruby #{cmd} > /dev/null")
-    raise "error occure in making c source files"
-  end
-end
 
 
 dir_config("lapack")
-unless find_library("lapack")
+unless find_library("lapack", nil)
   library_not_found("lapack",nil)
 
   warn "LAPACK will be tried to find"
@@ -126,11 +63,16 @@ end
 
 sitearchdir = Config::CONFIG["sitearchdir"]
 dir_config("narray", sitearchdir, sitearchdir)
-unless find_header("narray.h") && have_header("narray_config.h")
-  header_not_found("narray")
+gem_path = nil
+begin
+  require "rubygems"
+  if (spec = Gem.source_index.find_name("narray")).any?
+    gem_path = spec.last.full_gem_path
+  end
+rescue LoadError
 end
-unless find_library("narray", nil, "narray.so")
-  library_not_found("narray","narray.so")
+unless find_header("narray.h",gem_path) && have_header("narray_config.h")
+  header_not_found("narray")
 end
 
 create_makefile("numru/lapack")

data/tests/lapack_test.rb

@@ -1,4 +1,4 @@
-$:.unshift(File.dirname(__FILE__), "..", "lib")
+$:.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
 require "test/unit"
 require "numru/lapack"
 
@@ -10,7 +10,7 @@ module LapackTest
     unless delta
       case actual.typecode
       when NArray::SFLOAT, NArray::SCOMPLEX
-        delta = 1.0e-5
+        delta = 5.0e-5
       when NArray::DFLOAT, NArray::DCOMPLEX
         delta = 1.0e-13
       when NArray::INT, NArray::LINT

data/tests/lin/ge/test_gelss.rb

@@ -44,7 +44,7 @@ class GelssTest < Test::Unit::TestCase
       assert_equal 0, info
       assert_narray @b_exp[rc], b, 1e-4
       assert_narray @s_exp[rc], s, 1e-4
-      assert @rank_exp[rc], rank
+      assert_equal @rank_exp[rc], rank
     end
 
     define_method("test_#{method}_inquiring_lwork") do
@@ -56,7 +56,7 @@ class GelssTest < Test::Unit::TestCase
       assert_equal lwork, get_int(work[0])
       assert_narray @b_exp[rc], b, 1e-4
       assert_narray @s_exp[rc], s, 1e-4
-      assert @rank_exp[rc], rank
+      assert_equal @rank_exp[rc], rank
     end
 
     define_method("test_#{method}_inquiring_lwork_oldargstyle") do

data/tests/lin/ge/test_gelsy.rb

@@ -45,7 +45,7 @@ class GelsyTest < Test::Unit::TestCase
       rank, work, info, a, b, jpvt = NumRu::Lapack.send(method, @a[rc], @b[rc], @jpvt[rc], @rcond)
       assert_equal 0, info
       assert_narray @b_exp[rc], b, 1e-4
-      assert @rank_exp[rc], rank
+      assert_equal @rank_exp[rc], rank
     end
 
     define_method("test_#{method}_inquiring_lwork") do
@@ -56,7 +56,7 @@ class GelsyTest < Test::Unit::TestCase
       assert_equal 0, info
       assert_equal lwork, get_int(work[0])
       assert_narray @b_exp[rc], b, 1e-4
-      assert @rank_exp[rc], rank
+      assert_equal @rank_exp[rc], rank
     end
 
     define_method("test_#{method}_inquiring_lwork_oldargstyle") do

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ruby-lapack
 version: !ruby/object:Gem::Version 
-  hash: 7
-  prerelease: false
+  hash: 3314901
+  prerelease: true
   segments: 
   - 1
   - 4
-  version: "1.4"
+  - 1a
+  version: 1.4.1a
 platform: ruby
 authors: 
 - Seiya Nishizawa
@@ -14,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-18 00:00:00 +09:00
+date: 2011-04-22 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -43,6 +44,8 @@ extra_rdoc_files: []
 
 files: 
 - lib/numru/lapack.rb
+- ext/rb_lapack.h
+- ext/f2c_minimal.h
 - ext/sstemr.c
 - ext/ilaenv.c
 - ext/slaqp2.c
@@ -1674,8 +1677,6 @@ files:
 - ext/dgeqr2.c
 - ext/zpotrs.c
 - ext/cunglq.c
-- ext/f2c_minimal.h
-- ext/rb_lapack.h
 - Rakefile
 - COPYING
 - GPL
@@ -3449,7 +3450,6 @@ files:
 - tests/eig/sb/test_sbev.rb
 - tests/eig/gg/test_ggev.rb
 - tests/eig/gg/test_ggsvd.rb
-- tests/test_all.rb
 - tests/lin/ge/test_gelsy.rb
 - tests/lin/ge/test_gesv.rb
 - tests/lin/ge/test_gelss.rb
@@ -3481,12 +3481,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 25
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: 
@@ -3501,7 +3503,6 @@ test_files:
 - tests/eig/sb/test_sbev.rb
 - tests/eig/gg/test_ggev.rb
 - tests/eig/gg/test_ggsvd.rb
-- tests/test_all.rb
 - tests/lin/ge/test_gelsy.rb
 - tests/lin/ge/test_gesv.rb
 - tests/lin/ge/test_gelss.rb

data/tests/test_all.rb

@@ -1,7 +0,0 @@
-require "test/unit"
-
-dir = File.dirname(__FILE__)
-
-Test::Unit::AutoRunner.run(true, File.join(dir, "lin"))
-
-Test::Unit::AutoRunner.run(true, File.join(dir, "eig"))