BOAST 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b7f276c1688e0a9ba92d4292b2f99c008e264821
-  data.tar.gz: d8c603a75c17ab5535c69156dcab3faecdd69826
+  metadata.gz: 12d3019064fc0609d6be8218867a2e5f96d36be8
+  data.tar.gz: 7c461ebad9ad23314f8fc531d89a680008422828
 SHA512:
-  metadata.gz: 64dbe9f8d71796a2cbe626e2f7fe400ac90c491fdaa56b9d0e8cdcbf7696eb4df94cfaebf10cd80e43b886828d927a3f3e2c21988f6e9338b9f10be4eb5cbfca
-  data.tar.gz: 8c069701fce7b32127bdf26930587eb7644658f844161dc84ffcecc5d1d67bf42fa8c560702bc06b77c8b72b2250a188e964b46d2b8718ce0a0164b9de711a06
+  metadata.gz: c92be2673de5ac581c069c91641beb11327bbf64c406b1af262c78c942763395c3f28b256b6cc395fdee83841e8e90688d4eff114fb22238cb8d451b47c08385
+  data.tar.gz: 496596256bb9a9ab2f29257001327a40a49484c2c8bc0d965f6d4c66a1634c2b95ca2c5bff6b121b4f2cb705a0a77f291cb0489d11b30fafdbae7886a10584ad

data/BOAST.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'BOAST'
-  s.version = "2.0.0"
+  s.version = "2.0.1"
   s.author = "Brice Videau"
   s.email = "brice.videau@imag.fr"
   s.homepage = "https://github.com/Nanosim-LIG/boast"

data/lib/BOAST/Language/Algorithm.rb

@@ -47,6 +47,11 @@ module BOAST
       BOAST::annotate_number(name)
     end
 
+    # (see BOAST#reset_annotate_numbers
+    def reset_annotate_numbers
+      BOAST::reset_annotate_numbers
+    end
+
   end
 
   module_function
@@ -132,6 +137,11 @@ module BOAST
     return num
   end
 
+  # Resets the annotate_numbers to an empty Hash
+  def reset_annotate_numbers
+    @@annotate_numbers = Hash::new { |h,k| h[k] = 0 }
+  end
+
   # Annotates an Object by inlining a YAML structure in a comment.
   # If object's class is part of the annotate list an indepth version of the annotation
   # will be generated.

data/lib/BOAST/Language/Arithmetic.rb

@@ -6,7 +6,7 @@ module BOAST
     # @param [#to_var] value to return
     # @return [Expression]
     def Return(value)
-      return Expression::new("return",nil, value)
+      return Expression::new("return",nil, value ? value : "" )
     end
 
     # Creates an Expression using the boolean And Operator

data/lib/BOAST/Language/Index.rb

@@ -4,10 +4,31 @@ module BOAST
     attr_reader :source
     attr_reader :indexes
     attr_accessor :alignment
+    attr_accessor :vector_index
+
+    def method_missing(m, *a, &b)
+      var = to_var
+      if var.type.methods.include?(:members) and var.type.members[m.to_s] then
+        return struct_reference(type.members[m.to_s])
+      elsif var.vector? and m.to_s[0] == 's' and lang != CUDA then
+        required_set = m.to_s[1..-1].chars.to_a
+        existing_set = [*('0'..'9'),*('a'..'z')].first(var.type.vector_length)
+        if required_set.length == required_set.uniq.length and (required_set - existing_set).empty? then
+          return var.copy(var.name+"."+m.to_s, :vector_length => m.to_s[1..-1].length) if lang == CL
+          @vector_index = existing_set.index(required_set[0])
+          return self
+        else
+          return super
+        end
+      else
+        return super
+      end
+    end
 
     def initialize(source, *indexes)
       @source = source
       @indexes = indexes
+      @vector_index = nil
     end
 
     def align?
@@ -20,7 +41,9 @@ module BOAST
     end
 
     def to_var
-      var = @source.copy("#{self}", :const => nil, :constant => nil, :dim => nil, :dimension => nil, :direction => nil, :dir => nil, :align => alignment)
+      options = { :const => nil, :constant => nil, :dim => nil, :dimension => nil, :direction => nil, :dir => nil, :align => alignment }
+      options[:vector_length] = 1 if @vector_index
+      var = @source.copy("#{self}", options)
       return var
     end
 
@@ -79,7 +102,7 @@ module BOAST
         end
       }
       s = ""
-      s += "#{@source}(#{@source.vector? ? ":, " : "" }#{indexes_dup.join(", ")})"
+      s += "#{@source}(#{@source.vector? ? (@vector_index ? "#{@vector_index+1}, " : ":, ") : "" }#{indexes_dup.join(", ")})"
       return s
     end
 
@@ -171,6 +194,9 @@ module BOAST
         sub = to_s_c_reversed
       end
       s = "#{@source}[" + sub + "]"
+      if @vector_index then
+        s += "[#{@vector_index}]"
+      end
       return s
     end
 

data/lib/BOAST/Language/Procedure.rb

@@ -6,11 +6,12 @@ module BOAST
     include Inspectable
     extend Functor
     include Annotation
-    ANNOTATIONS = [ :name, :parameters, :constants ]
+    ANNOTATIONS = [ :name, :parameters, :constants, :locals ]
 
     attr_reader :name
     attr_reader :parameters
     attr_reader :constants
+    attr_reader :locals
     attr_reader :properties
     attr_reader :headers
 
@@ -27,6 +28,8 @@ module BOAST
       @parameters = parameters
       @constants = properties[:constants]
       @constants = [] unless @constants
+      @locals = properties[:locals]
+      @locals = [] unless @locals
       @block = block
       @properties = properties
       @headers = properties[:headers]
@@ -148,9 +151,9 @@ module BOAST
         s += "void "
       end
       s += "#{@name}("
-      if parameters.first then
-        s += parameters.first.send(:decl_c_s, @properties[:local])
-        parameters[1..-1].each { |p|
+      if @parameters.first then
+        s += @parameters.first.send(:decl_c_s, @properties[:local])
+        @parameters[1..-1].each { |p|
           s += ", "+p.send(:decl_c_s, @properties[:local])
         }
       end
@@ -172,7 +175,7 @@ module BOAST
         s += "SUBROUTINE "
       end
       s += "#{@name}("
-      s += parameters.collect(&:name).join(", ")
+      s += @parameters.collect(&:name).join(", ")
       s += ")"
     end
 
@@ -180,18 +183,23 @@ module BOAST
       s = indent + decl_c_s + "{"
       output.puts s
       increment_indent_level
-      constants.each { |c|
+      @constants.each { |c|
         BOAST::decl c
       }
       if lang == C then
-        parameters.each { |p|
+        @parameters.each { |p|
           align = p.align
-          BOAST::pr align if align
+          BOAST::pr align if align and not p.send(:__attr_align?)
         }
       end
       if @properties[:return] then
         BOAST::decl @properties[:return]
       end
+      @locals.each { |l|
+        BOAST::decl l
+        align = l.align
+        BOAST::pr align if align and not l.send(:__attr_align?)
+      }
       return self
     end
 
@@ -201,7 +209,7 @@ module BOAST
       increment_indent_level
       tmp_buff = StringIO::new
       push_env( :output => tmp_buff ) {
-        parameters.each { |p|
+        @parameters.each { |p|
           p.type.define if p.type.kind_of? CStruct
         }
       }
@@ -209,13 +217,18 @@ module BOAST
       s += tmp_buff.read
       s += indent + "integer, parameter :: wp=kind(1.0d0)"
       output.puts s
-      constants.each { |c|
+      @constants.each { |c|
         BOAST::decl c
       }
-      parameters.each { |p|
+      @parameters.each { |p|
         BOAST::decl p
-        align = p.align
-        BOAST::pr align if align
+#        align = p.align
+#        BOAST::pr align if align
+      }
+      @locals.each { |l|
+        BOAST::decl l
+#        align = l.align
+#        BOAST::pr align if align
       }
       if @properties[:functions] then
         @properties[:functions].each { |f|
@@ -225,6 +238,10 @@ module BOAST
       if @properties[:return] then
         BOAST::decl @properties[:return]
       end
+      (@parameters + @locals).each { |v|
+        align = v.align
+        BOAST::pr align if align and not v.send(:__attr_align?)
+      }
       return self
     end
 
@@ -274,9 +291,9 @@ module BOAST
         s += "void "
       end
       s += "#{@name}#{trailer}("
-      if parameters.first then
-        s += parameters.first.boast_header(lang)
-        parameters[1..-1].each { |p|
+      if @parameters.first then
+        s += @parameters.first.boast_header(lang)
+        @parameters[1..-1].each { |p|
           s += ", "
           s += p.boast_header(lang)
         }

data/lib/BOAST/Language/Variable.rb

@@ -328,7 +328,7 @@ module BOAST
     end
   
     def to_s
-      if force_replace_constant? or ( replace_constant? and constant? and replace_constants? and not dimension? ) then
+      if force_replace_constant? or ( ( replace_constant? or replace_constants? ) and constant? and not dimension? ) then
         s = @constant.to_s + @type.suffix
         return s
       end
@@ -486,6 +486,10 @@ module BOAST
       return ( @type.vector? and @type.vector_length > 1 )
     end
 
+    def __attr_align?
+      return ( __align? or ( vector? and not @direction ) )
+    end
+
     def decl_c_s(device = false)
       return decl_texture_s if texture?
       s = ""

data/lib/BOAST/Runtime/Compilers.rb

@@ -32,15 +32,22 @@ module BOAST
       narray_path = nil
       begin
         spec = Gem::Specification::find_by_name('narray')
-        narray_path = spec.full_gem_path
+        narray_path = spec.require_path
+        if narray_path == "." then
+          narray_path = spec.full_gem_path
+        end
       rescue Gem::LoadError => e
       rescue NoMethodError => e
         spec = Gem::available?('narray')
         if spec then
-          require 'narray' 
-          narray_path = Gem.loaded_specs['narray'].full_gem_path
+          require 'narray'
+          narray_path = Gem.loaded_specs['narray'].require_path
+          if narray_path == "." then
+            narray_path = Gem.loaded_specs['narray'].full_gem_path
+          end
         end
       end
+      return narray_path
     end
 
     def setup_c_compiler(options, includes, narray_path, runner, probes)
@@ -168,7 +175,12 @@ module BOAST
     def setup_linker(options, probes)
       ldflags = options[:LDFLAGS]
       ldflags += " -march=#{get_model}"
-      ldflags += " -L#{RbConfig::CONFIG["libdir"]} #{RbConfig::CONFIG["LIBRUBYARG"]}"
+      ldflags += " -L#{RbConfig::CONFIG["libdir"]}"
+      if RbConfig::CONFIG["ENABLE_SHARED"] != "no" then
+        ldflags += " #{RbConfig::CONFIG["LIBRUBYARG"]}"
+      else
+        ldflags += " -Wl,-R#{RbConfig::CONFIG["libdir"]}"
+      end
       probes.each { |p|
         ldflags += " #{p.ldflags}" if p.respond_to?(:ldflags)
       }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: BOAST
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Brice Videau
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-30 00:00:00.000000000 Z
+date: 2017-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: narray