BOAST 1.2.2 → 1.3.0

data/lib/BOAST/Runtime/CRuntime.rb

@@ -1,8 +1,11 @@
 module BOAST
 
+  # @private
   module CRuntime
     include CompiledRuntime
 
+    private
+
     def fill_library_header
       get_output.puts "#include <stdlib.h>"
       get_output.puts "#include <inttypes.h>"

data/lib/BOAST/Runtime/CUDARuntime.rb

@@ -1,8 +1,11 @@
 module BOAST
 
+  # @private
   module CUDARuntime
     include CRuntime
 
+    private
+
     alias fill_library_source_old fill_library_source
     alias fill_library_header_old fill_library_header
     alias fill_module_header_old fill_module_header

data/lib/BOAST/Runtime/CompiledRuntime.rb

@@ -34,6 +34,8 @@ module BOAST
     attr_accessor :binary
     attr_accessor :source
 
+    private
+
     @@extensions = {
       C => ".c",
       CUDA => ".cu",
@@ -391,6 +393,8 @@ EOF
       }
     end
 
+    public
+
     def build(options={})
       compiler_options = BOAST::get_compiler_options
       compiler_options.update(options)

data/lib/BOAST/Runtime/Compilers.rb

@@ -5,6 +5,7 @@ require 'os'
 
 module BOAST
 
+  # @private
   module Compilers
     include Rake::DSL
 
@@ -51,7 +52,7 @@ module BOAST
       cflags += " -DHAVE_NARRAY_H" if narray_path
       cflags += " -I/usr/local/k1tools/include" if @architecture == MPPA
       objext = RbConfig::CONFIG["OBJEXT"]
-      if options[:openmp] and @lang == C and not disable_openmp then
+      if (options[:openmp] or options[:OPENMP]) and @lang == C and not disable_openmp then
           openmp_cflags = get_openmp_flags(c_compiler)
           raise "unkwown openmp flags for: #{c_compiler}" if not openmp_cflags
           cflags += " #{openmp_cflags}"
@@ -79,7 +80,7 @@ module BOAST
       cxx_compiler = options[:CXX]
       cxxflags = options[:CXXFLAGS]
       cxxflags += " -fPIC #{includes}"
-      if options[:openmp] and @lang == C and not disable_openmp then
+      if (options[:openmp] or options[:OPENMP]) and @lang == C and not disable_openmp then
           openmp_cxxflags = get_openmp_flags(cxx_compiler)
           raise "unkwown openmp flags for: #{cxx_compiler}" if not openmp_cxxflags
           cxxflags += " #{openmp_cxxflags}"
@@ -97,7 +98,7 @@ module BOAST
       fcflags += " -march=#{get_model}"
       fcflags += " -fPIC"
       fcflags += " -fno-second-underscore" if f_compiler == 'g95'
-      if options[:openmp] and @lang == FORTRAN and not disable_openmp then
+      if (options[:openmp] or options[:OPENMP]) and @lang == FORTRAN and not disable_openmp then
           openmp_fcflags = get_openmp_flags(f_compiler)
           raise "unkwown openmp flags for: #{f_compiler}" if not openmp_fcflags
           fcflags += " #{openmp_fcflags}"
@@ -152,7 +153,7 @@ module BOAST
       c_compiler = "cc" if not c_compiler
       linker = options[:LD]
       linker = c_compiler if not linker
-      if options[:openmp] and not disable_openmp then
+      if (options[:openmp] or options[:OPENMP]) and not disable_openmp then
         openmp_ldflags = get_openmp_flags(linker)
         raise "unknown openmp flags for: #{linker}" if not openmp_ldflags
         ldflags += " #{openmp_ldflags}"
@@ -171,7 +172,7 @@ module BOAST
 
     def setup_compilers(options = {})
       Rake::Task::clear
-      verbose = options[:verbose]
+      verbose = options[:VERBOSE]
       verbose = get_verbose if not verbose
       Rake::verbose(verbose)
       Rake::FileUtilsExt.verbose_flag=verbose

data/lib/BOAST/Runtime/Config.rb

@@ -19,7 +19,7 @@ module BOAST
     :CLDEVICETYPE => nil,
     :MAQAO => 'maqao',
     :MAQAO_FLAGS => '',
-    :openmp => false
+    :OPENMP => false
   }
   
   @@openmp_default_flags = {

data/lib/BOAST/Runtime/FFIRuntime.rb

@@ -1,7 +1,10 @@
 module BOAST
 
+  # @private
   module FFIRuntime
 
+    private
+
     def target
       return library_path
     end

data/lib/BOAST/Runtime/FORTRANRuntime.rb

@@ -1,8 +1,11 @@
 module BOAST
 
+  # @private
   module FORTRANRuntime
     include CompiledRuntime
 
+    private
+
     def method_name
       return @procedure.name + "_"
     end

data/lib/BOAST/Runtime/MPPARuntime.rb

@@ -1,5 +1,6 @@
 module BOAST
 
+  # @private
   module MPPAProbe
     extend PrivateStateAccessor
 
@@ -54,6 +55,7 @@ EOF
 
   end
 
+  # @private
   module MPPARuntime
     include CRuntime
 

data/lib/BOAST/Runtime/NonRegression.rb

@@ -2,11 +2,11 @@ module BOAST
 
   class CKernel
 
-    def load_ref_inputs(path = "", suffix = ".in" )
+    def load_ref_inputs(path = ".", suffix = ".in" )
       return load_ref_files( path, suffix, :in )
     end
 
-    def load_ref_outputs(path = "", suffix = ".out" )
+    def load_ref_outputs(path = ".", suffix = ".out" )
       return load_ref_files( path, suffix, :out )
     end
 
@@ -32,6 +32,8 @@ module BOAST
       return res
     end
 
+    private
+
     def get_array_type(param)
       if param.type.class == Real then
         case param.type.size
@@ -130,7 +132,7 @@ module BOAST
       return res
     end
 
-    def load_ref_files(  path = "", suffix = "", intent )
+    def load_ref_files(  path, suffix, intent )
       proc_path = path + "/#{@procedure.name}/"
       res_h = {}
       begin

data/lib/BOAST/Runtime/OpenCLRuntime.rb

@@ -1,4 +1,6 @@
 module BOAST
+
+  # @private
   module OpenCLRuntime
 
     attr_reader :context
@@ -6,11 +8,7 @@ module BOAST
 
     def select_cl_platforms(options)
       platforms = OpenCL::get_platforms
-      if options[:platform_vendor] then
-        platforms.select!{ |p|
-          p.vendor.match(options[:platform_vendor])
-        }
-      elsif options[:CLVENDOR] then
+      if options[:CLVENDOR] then
         platforms.select!{ |p|
           p.vendor.match(options[:CLVENDOR])
         }
@@ -30,12 +28,11 @@ module BOAST
         devices = context.devices
       else
         platforms = select_cl_platforms(options)
-        type = options[:device_type] ? OpenCL::Device::Type.const_get(options[:device_type]) : options[:CLDEVICETYPE] ? OpenCL::Device::Type.const_get(options[:CLDEVICETYPE]) : OpenCL::Device::Type::ALL
+        type = options[:CLDEVICETYPE] ? OpenCL::Device::Type.const_get(options[:CLDEVICETYPE]) : OpenCL::Device::Type::ALL
         devices = platforms.collect { |plt| plt.devices(type) }
         devices.flatten!
       end
-      name_pattern = options[:device_name]
-      name_pattern = options[:CLDEVICE] unless name_pattern
+      name_pattern = options[:CLDEVICE]
       if name_pattern then
         devices.select!{ |d|
           d.name.match(name_pattern)
@@ -63,12 +60,12 @@ module BOAST
         puts e.to_s
         puts program.build_status
         puts program.build_log
-        if options[:verbose] or get_verbose then
+        if options[:VERBOSE] or get_verbose then
           puts @code.string
         end
         raise "OpenCL Failed to build #{@procedure.name}"
       end
-      if options[:verbose] or get_verbose then
+      if options[:VERBOSE] or get_verbose then
         program.build_log.each {|dev,log|
           puts "#{device.name}: #{log}"
         }

data/lib/BOAST/Runtime/Probe.rb

@@ -1,5 +1,6 @@
 module BOAST
 
+  # @private
   module TimerProbe
     extend PrivateStateAccessor
 
@@ -64,6 +65,7 @@ EOF
 
   end
 
+  # @private
   module PAPIProbe
     extend PrivateStateAccessor
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: BOAST
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.3.0
 platform: ruby
 authors:
 - Brice Videau
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-17 00:00:00.000000000 Z
+date: 2016-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: narray
@@ -56,20 +56,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.1
+        version: 1.3.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.1
+        version: 1.3.2
 - !ruby/object:Gem::Dependency
   name: systemu
   requirement: !ruby/object:Gem::Requirement
@@ -228,6 +228,7 @@ files:
 - lib/BOAST/Language/Variable.rb
 - lib/BOAST/Language/While.rb
 - lib/BOAST/Optimization/Optimization.rb
+- lib/BOAST/Runtime/AffinityProbe.rb
 - lib/BOAST/Runtime/CKernel.rb
 - lib/BOAST/Runtime/CRuntime.rb
 - lib/BOAST/Runtime/CUDARuntime.rb