diff options
-rw-r--r-- | ext/lazar/extconf.rb | 2 | ||||
-rw-r--r-- | lib/lazar.rb | 13 |
2 files changed, 9 insertions, 6 deletions
diff --git a/ext/lazar/extconf.rb b/ext/lazar/extconf.rb index f466afb..edb960a 100644 --- a/ext/lazar/extconf.rb +++ b/ext/lazar/extconf.rb @@ -17,7 +17,7 @@ lib_dir = File.join openbabel_dir, "lib", "openbabel" ruby_src_dir = File.join src_dir, "scripts", "ruby" begin - nr_processors = `grep processor /proc/cpuinfo | wc -l` # speed up compilation, Linux only + nr_processors = `getconf _NPROCESSORS_ONLN`.to_i # should be POSIX compatible rescue nr_processors = 1 end diff --git a/lib/lazar.rb b/lib/lazar.rb index bcae96f..63257ca 100644 --- a/lib/lazar.rb +++ b/lib/lazar.rb @@ -41,6 +41,9 @@ when "development" end # R setup +# should work on POSIX including os x +# http://stackoverflow.com/questions/19619582/number-of-processors-cores-in-command-line +NR_CORES = `getconf _NPROCESSORS_ONLN`.to_i R = Rserve::Connection.new R.eval " suppressPackageStartupMessages({ @@ -49,14 +52,14 @@ suppressPackageStartupMessages({ library(gridExtra) library(caret) library(doMC) - registerDoMC(4) + registerDoMC(#{NR_CORES}) }) " # Require sub-Repositories -require_relative '../libfminer/libbbrc/bbrc' # include before openbabel -require_relative '../libfminer/liblast/last' # -require_relative '../last-utils/lu.rb' +#require_relative '../libfminer/libbbrc/bbrc' # include before openbabel +#require_relative '../libfminer/liblast/last' # +#require_relative '../last-utils/lu.rb' require_relative '../openbabel/lib/openbabel' # Fminer environment variables @@ -81,7 +84,7 @@ CLASSES = ["Feature","Compound","Dataset","Validation","CrossValidation","LeaveO "dataset.rb", "descriptor.rb", "algorithm.rb", - "bbrc.rb", + #"bbrc.rb", "model.rb", "similarity.rb", "classification.rb", |