BOAST 1.3.4 → 1.3.5

data/lib/BOAST/Runtime/FFIRuntime.rb

@@ -32,7 +32,7 @@ module BOAST
       module #{module_name}
         extend FFI::Library
         ffi_lib "#{library_path}"
-        attach_function :#{method_name}, [ #{@procedure.parameters.collect{ |p| ":"+p.decl_ffi(false,@lang).to_s }.join(", ")} ], :#{@procedure.properties[:return] ? @procedure.properties[:return].type.decl_ffi(false,@lang) : "void" }
+        attach_function :#{method_name}, [ #{@procedure.parameters.collect{ |p| ":"+p.decl_ffi(false,@lang).to_s }.join(", ")} ], :#{@procedure.properties[:return] ? @procedure.properties[:return].type.decl_ffi : "void" }
         def run(*args)
           raise "Wrong number of arguments for \#{@procedure.name} (\#{args.length} for \#{@procedure.parameters.length})" if args.length < @procedure.parameters.length or args.length > @procedure.parameters.length + 1
           ev_set = nil
@@ -58,11 +58,11 @@ module BOAST
             }
           else
             @procedure.parameters.each_with_index { |p, i|
-              if p.scalar_output? then
+              if p.scalar_output? or p.reference? then
                 arg_p = FFI::MemoryPointer::new(p.decl_ffi(true, @lang))
                 arg_p.send("write_\#{p.decl_ffi(true,@lang)}",args[i])
                 t_args.push(arg_p)
-                r_args[p] = arg_p
+                r_args[p] = arg_p if p.scalar_output?
               else
                 t_args.push( args[i] )
               end
@@ -72,9 +72,15 @@ module BOAST
           counters = nil
           ev_set.start if ev_set
           begin
-            start = Time::new
-            ret = #{method_name}(*t_args)
-            stop = Time::new
+            if options[:repeat] then
+              start = Time::new
+              options[:repeat].times { ret = #{method_name}(*t_args) }
+              stop = Time::new
+            else
+              start = Time::new
+              ret = #{method_name}(*t_args)
+              stop = Time::new
+            end
           ensure
             if ev_set then
               counters = ev_set.stop

data/lib/BOAST/Runtime/FORTRANRuntime.rb

@@ -25,7 +25,7 @@ module BOAST
             chunks = line.scan(/.{1,#{fortran_line_length-4}}/)
             s += chunks.join("&\n!$&") + "\n"
           end
-        elsif line.match(/^\s*!/) then
+        elsif line.match(/^\s*!/) or line.match(/^\s*#include/) then
           s += line
         else
           chunks = line.scan(/.{1,#{fortran_line_length-2}}/)
@@ -36,7 +36,12 @@ module BOAST
     end
 
     def fill_library_source
-      get_output.print line_limited_source
+      if fortran_line_length == 0 then
+        @code.rewind
+        get_output.write @code.read
+      else
+        get_output.print line_limited_source
+      end
     end
 
     def create_procedure_call_parameters

data/lib/BOAST/Runtime/MPPARuntime.rb

@@ -205,7 +205,7 @@ EOF
       #Parameters declaration
       @procedure.parameters.each { |param|
         get_output.print "  #{param.type.decl} "
-        get_output.print "*" if param.dimension or param.scalar_output?
+        get_output.print "*" if param.dimension or param.scalar_output? or param.reference?
         get_output.puts "#{param.name};"
         if param.dimension then
           get_output.puts "  size_t _mppa_#{param}_size;"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: BOAST
 version: !ruby/object:Gem::Version
-  version: 1.3.4
+  version: 1.3.5
 platform: ruby
 authors:
 - Brice Videau
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-28 00:00:00.000000000 Z
+date: 2016-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: narray