BOAST 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 88a3643b3adeeb4ba00c9e2531df8351c70739f0
-  data.tar.gz: ab54c2487d50cdd9683ce700ada7c4af6d36113c
+  metadata.gz: 088ca11e6055b1cdd5e9580b43be12939db50203
+  data.tar.gz: 720f4cdd6c10a19380a5d00872d291e73b1b4c85
 SHA512:
-  metadata.gz: 898b0a5c86fde5ef320abcce81c9adb21a34ff0ce0b8d49acad2232b2f23d0e595a238140b3295070831f06f51a996280b6d5213f7e3d2dc37f3185a3ee0a515
-  data.tar.gz: 155796857e44a0456c4e2ae0549e69d8599d2ee5efa7803d8fc95a139d58d491eecb032dd89a4b24efaf3c76a06a66793ee9f610d0c5d20b39f882ea505e5bf3
+  metadata.gz: 528c03146b6b66b806caa187f14a1a9ee8417399ea0ba769b13860384eb0840ac40446f5bdac646771efc569372f2b4a2e8fd25a514d438059de6c78dc46ae9c
+  data.tar.gz: 05f318ecd0a323e045c1dd8cc6e6722a6a7aefd90d35214e2306aac0ec400abbd8858aa4a670ffe04ae15d7e33478578853620600a0d6a8b0df9f8bb09956ccb

data/BOAST.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'BOAST'
-  s.version = "1.0.1"
+  s.version = "1.0.2"
   s.author = "Brice Videau"
   s.email = "brice.videau@imag.fr"
   s.homepage = "https://github.com/Nanosim-LIG/boast"
@@ -42,5 +42,6 @@ Gem::Specification.new do |s|
   s.add_dependency 'narray', '>=0.6.0.8'
   s.add_dependency 'opencl_ruby_ffi', '>=0.4'
   s.add_dependency 'systemu', '>=2.2.0'
+  s.add_dependency 'os', '>=0.9.6'
   s.add_dependency 'PAPI', '>=0.101'
 end

data/lib/BOAST/CKernel.rb

@@ -6,6 +6,7 @@ require 'rbconfig'
 require 'systemu'
 require 'yaml'
 require 'pathname'
+require 'os'
 
 module BOAST
   @@compiler_default_options = {
@@ -37,13 +38,16 @@ module BOAST
 
   module PrivateStateAccessor
     private_boolean_state_accessor :verbose
+    private_boolean_state_accessor :debug_source
     private_boolean_state_accessor :ffi
   end
 
   boolean_state_accessor :verbose
+  boolean_state_accessor :debug_source
   boolean_state_accessor :ffi
   @@ffi = false
   @@verbose = false
+  @@debug_source = false
   FORTRAN_LINE_LENGTH = 72
 
   module_function
@@ -81,6 +85,7 @@ module BOAST
     @@compiler_default_options[:LD] = ENV["LD"] if ENV["LD"]
     @@verbose = ENV["VERBOSE"] if ENV["VERBOSE"]
     @@ffi = ENV["FFI"] if ENV["FFI"]
+    @@debug_source = ENV["DEBUG_SOURCE"] if ENV["DEBUG_SOURCE"]
   end
 
   read_boast_config
@@ -184,7 +189,7 @@ module BOAST
           cflags += " #{openmp_cflags}"
       end
 
-      rule '.o' => '.c' do |t|
+      rule ".#{RbConfig::CONFIG["OBJEXT"]}" => '.c' do |t|
         c_call_string = "#{c_compiler} #{cflags} -c -o #{t.name} #{t.source}"
         runner.call(t, c_call_string)
       end
@@ -200,7 +205,7 @@ module BOAST
           cxxflags += " #{openmp_cxxflags}"
       end
 
-      rule '.o' => '.cpp' do |t|
+      rule ".#{RbConfig::CONFIG["OBJEXT"]}" => '.cpp' do |t|
         cxx_call_string = "#{cxx_compiler} #{cxxflags} -c -o #{t.name} #{t.source}"
         runner.call(t, cxx_call_string)
       end
@@ -217,7 +222,7 @@ module BOAST
           fcflags += " #{openmp_fcflags}"
       end
 
-      rule '.o' => '.f90' do |t|
+      rule ".#{RbConfig::CONFIG["OBJEXT"]}" => '.f90' do |t|
         f_call_string = "#{f_compiler} #{fcflags} -c -o #{t.name} #{t.source}"
         runner.call(t, f_call_string)
       end
@@ -228,7 +233,7 @@ module BOAST
       cudaflags = options[:NVCCFLAGS]
       cudaflags += " --compiler-options '-fPIC'"
 
-      rule '.o' => '.cu' do |t|
+      rule ".#{RbConfig::CONFIG["OBJEXT"]}" => '.cu' do |t|
         cuda_call_string = "#{cuda_compiler} #{cudaflags} -c -o #{t.name} #{t.source}"
         runner.call(t, cuda_call_string)
       end
@@ -236,7 +241,8 @@ module BOAST
 
     def setup_linker(options)
       ldflags = options[:LDFLAGS]
-      ldflags += " -L#{RbConfig::CONFIG["libdir"]} #{RbConfig::CONFIG["LIBRUBYARG"]} -lrt"
+      ldflags += " -L#{RbConfig::CONFIG["libdir"]} #{RbConfig::CONFIG["LIBRUBYARG"]}"
+      ldflags += " -lrt" if not OS.mac?
       ldflags += " -lcudart" if @lang == CUDA
       c_compiler = options[:CC]
       c_compiler = "cc" if not c_compiler
@@ -248,7 +254,15 @@ module BOAST
         ldflags += " #{openmp_ldflags}"
       end
 
-      return [linker, ldflags]
+      if OS.mac? then
+        ldflags = "-Wl,-undefined,dynamic_lookup -Wl,-multiply_defined,suppress #{ldflags}"
+        ldshared = "-dynamic -bundle"
+      else
+        ldflags = "-Wl,-Bsymbolic-functions -Wl,-z,relro -rdynamic -Wl,-export-dynamic #{ldflags}"
+        ldshared = "-shared"
+      end
+
+      return [linker, ldshared, ldflags]
     end
 
     def setup_compilers(options = {})
@@ -482,8 +496,10 @@ EOF
       module_file = File::open(module_file_name,"w+")
       set_output( module_file )
       fill_module(module_file, module_name)
-      module_file.rewind
-      #puts module_file.read
+      if debug_source? then
+        module_file.rewind
+        puts module_file.read
+      end
       module_file.close
       set_lang( previous_lang )
       set_output( previous_output )
@@ -503,6 +519,10 @@ EOF
       path = source_file.path
       target = path.chomp(File::extname(path))+".o"
       fill_code(source_file)
+      if debug_source? then
+        source_file.rewind
+        puts source_file.read
+      end
       source_file.close
       return [source_file, path, target]
     end
@@ -589,7 +609,7 @@ EOF
       compiler_options.update(options)
       return build_opencl(compiler_options) if @lang == CL
 
-      linker, ldflags = setup_compilers(compiler_options)
+      linker, ldshared, ldflags = setup_compilers(compiler_options)
 
       extension = @@extensions[@lang]
 
@@ -597,10 +617,10 @@ EOF
 
       if not ffi? then
         module_file_name, module_name = create_module_source(path)
-        module_target = module_file_name.chomp(File::extname(module_file_name))+".o"
-        module_final = module_file_name.chomp(File::extname(module_file_name))+".so"
+        module_target = module_file_name.chomp(File::extname(module_file_name))+"."+RbConfig::CONFIG["OBJEXT"]
+        module_final = module_file_name.chomp(File::extname(module_file_name))+"."+RbConfig::CONFIG["DLEXT"]
       else
-        module_final = path.chomp(File::extname(path))+".so"
+        module_final = path.chomp(File::extname(path))+"."+RbConfig::CONFIG["DLEXT"]
         module_name = "Mod_" + File::split(path.chomp(File::extname(path)))[1].gsub("-","_")
       end
 
@@ -608,16 +628,16 @@ EOF
 
       if not ffi? then
         file module_final => [module_target, target] do
-          #puts "#{linker} -shared -o #{module_final} #{module_target} #{target} #{kernel_files.join(" ")} -Wl,-Bsymbolic-functions -Wl,-z,relro -rdynamic -Wl,-export-dynamic #{ldflags}"
-          sh "#{linker} -shared -o #{module_final} #{module_target} #{target} #{(kernel_files.collect {|f| f.path}).join(" ")} -Wl,-Bsymbolic-functions -Wl,-z,relro -rdynamic -Wl,-export-dynamic #{ldflags}"
+          #puts "#{linker} #{ldshared} -o #{module_final} #{module_target} #{target} #{kernel_files.join(" ")} #{ldflags}"
+          sh "#{linker} #{ldshared} -o #{module_final} #{module_target} #{target} #{(kernel_files.collect {|f| f.path}).join(" ")} #{ldflags}"
         end
         Rake::Task[module_final].invoke
 
         require(module_final)
       else
         file module_final => [target] do
-          #puts "#{linker} -shared -o #{module_final} #{target} #{kernel_files.join(" ")} -Wl,-Bsymbolic-functions -Wl,-z,relro -rdynamic -Wl,-export-dynamic #{ldflags}"
-          sh "#{linker} -shared -o #{module_final} #{target} #{(kernel_files.collect {|f| f.path}).join(" ")} -Wl,-Bsymbolic-functions -Wl,-z,relro -rdynamic -Wl,-export-dynamic #{ldflags}"
+          #puts "#{linker} #{ldshared} -o #{module_final} #{target} #{kernel_files.join(" ")} #{ldflags}"
+          sh "#{linker} #{ldshared} -o #{module_final} #{target} #{(kernel_files.collect {|f| f.path}).join(" ")} #{ldflags}"
         end
         Rake::Task[module_final].invoke
         create_ffi_module(module_name, module_final)
@@ -693,12 +713,24 @@ EOF
       module_file.print <<EOF
 #include "ruby.h"
 #include <inttypes.h>
-#include <time.h>
 #ifdef HAVE_NARRAY_H
 #include "narray.h"
 #endif
 EOF
-      if( @lang == CUDA ) then
+      if OS.mac? then
+        module_file.print <<EOF
+#if __cplusplus
+extern "C" {
+#endif
+#include <mach/mach_time.h>
+#if __cplusplus
+}
+#endif
+EOF
+      else
+        module_file.print "#include <time.h>\n"
+      end
+      if @lang == CUDA then
         module_file.print "#include <cuda_runtime.h>\n"
       end
     end
@@ -754,8 +786,9 @@ EOF
     _boast_array_size = _boast_n_ary->total * na_sizeof[_boast_n_ary->type];
     cudaMalloc( (void **) &#{param.name}, _boast_array_size);
     cudaMemcpy(#{param.name}, (void *) _boast_n_ary->ptr, _boast_array_size, cudaMemcpyHostToDevice);
-  } else
+  } else {
     rb_raise(rb_eArgError, "wrong type of argument %d", #{i});
+  }
 EOF
           else
             module_file.print <<EOF
@@ -765,8 +798,9 @@ EOF
     struct NARRAY *_boast_n_ary;
     Data_Get_Struct(_boast_rb_ptr, struct NARRAY, _boast_n_ary);
     #{param.name} = (void *) _boast_n_ary->ptr;
-  } else
+  } else {
     rb_raise(rb_eArgError, "wrong type of argument %d", #{i});
+  }
 EOF
           end
         end
@@ -785,9 +819,13 @@ EOF
       set_decl_module(false)
       module_file.print "  #{@procedure.properties[:return].type.decl} _boast_ret;\n" if @procedure.properties[:return]
       module_file.print "  VALUE _boast_stats = rb_hash_new();\n"
-      module_file.print "  VALUE _boast_refs = rb_hash_new();\n"
       module_file.print "  VALUE _boast_event_set = Qnil;\n"
-      module_file.print "  struct timespec _boast_start, _boast_stop;\n"
+      if OS.mac? then
+        module_file.print "  uint64_t _mac_boast_start, _mac_boast_stop;\n"
+        module_file.print "  mach_timebase_info_data_t _mac_boast_timebase_info;\n"
+      else
+        module_file.print "  struct timespec _boast_start, _boast_stop;\n"
+      end
       module_file.print "  unsigned long long int _boast_duration;\n"
     end
 
@@ -847,7 +885,6 @@ EOF
     def  get_PAPI_options(module_file)
 module_file.print <<EOF
   if( _boast_rb_opts != Qnil ) {
-    VALUE _boast_rb_array_data = Qnil;
     _boast_rb_ptr = rb_hash_aref(_boast_rb_opts, ID2SYM(rb_intern("PAPI")));
     if( _boast_rb_ptr != Qnil ) {
       VALUE _boast_PAPI = Qnil;
@@ -936,9 +973,9 @@ EOF
             end
             module_file.print <<EOF
     cudaFree( (void *) #{param.name});
-  } else
+  } else {
     rb_raise(rb_eArgError, "wrong type of argument %d", #{i});
-  
+  }
 EOF
           end
         end
@@ -947,6 +984,7 @@ EOF
         @procedure.parameters.each_with_index do |param,i|
           if param.scalar_output? then
             if first then
+              module_file.print "  VALUE _boast_refs = rb_hash_new();\n"
               module_file.print "  rb_hash_aset(_boast_stats,ID2SYM(rb_intern(\"reference_return\")),_boast_refs);\n"
               first = false
             end
@@ -964,10 +1002,6 @@ EOF
     end
 
     def store_result(module_file)
-      if @lang != CUDA then
-        module_file.print "  _boast_duration = (unsigned long long int)_boast_stop.tv_sec * (unsigned long long int)1000000000 + _boast_stop.tv_nsec;\n"
-        module_file.print "  _boast_duration -= (unsigned long long int)_boast_start.tv_sec * (unsigned long long int)1000000000 + _boast_start.tv_nsec;\n"
-      end
       module_file.print "  rb_hash_aset(_boast_stats,ID2SYM(rb_intern(\"duration\")),rb_float_new((double)_boast_duration*(double)1e-9));\n"
       if @procedure.properties[:return] then
         type_ret = @procedure.properties[:return].type
@@ -983,7 +1017,7 @@ EOF
       module_preamble(module_file, module_name)
 
       module_file.puts "VALUE method_run(int _boast_argc, VALUE *_boast_argv, VALUE _boast_self) {"
-
+      increment_indent_level
       check_args(module_file)
 
       argc = @procedure.parameters.length
@@ -1002,19 +1036,37 @@ EOF
 
       get_PAPI_options(module_file)
 
-      module_file.print "  clock_gettime(CLOCK_REALTIME, &_boast_start);\n"
+      if OS.mac? then
+        module_file.print "  _mac_boast_start = mach_absolute_time();\n"
+      else
+        module_file.print "  clock_gettime(CLOCK_REALTIME, &_boast_start);\n"
+      end
 
       create_procedure_call(module_file)
 
-      module_file.print "  clock_gettime(CLOCK_REALTIME, &_boast_stop);\n"
+      if OS.mac? then
+        module_file.print "  _mac_boast_stop = mach_absolute_time();\n"
+      else
+        module_file.print "  clock_gettime(CLOCK_REALTIME, &_boast_stop);\n"
+      end
 
       get_PAPI_results(module_file)
 
+      if @lang != CUDA then
+        if OS.mac? then
+          module_file.print "  mach_timebase_info(&_mac_boast_timebase_info);\n"
+          module_file.print "  _boast_duration = (_mac_boast_stop - _mac_boast_start) * _mac_boast_timebase_info.numer / _mac_boast_timebase_info.denom;\n"
+        else
+          module_file.print "  _boast_duration = (_boast_stop.tv_sec - _boast_start.tv_sec) * (unsigned long long int)1000000000 + _boast_stop.tv_nsec - _boast_start.tv_nsec;\n"
+        end
+      end
+
       get_results(module_file, argv, rb_ptr)
 
       store_result(module_file)
 
       module_file.print "  return _boast_stats;\n"
+      decrement_indent_level
       module_file.print "}"
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: BOAST
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Brice Videau
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-24 00:00:00.000000000 Z
+date: 2015-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: narray
@@ -52,6 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.2.0
+- !ruby/object:Gem::Dependency
+  name: os
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.9.6
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.9.6
 - !ruby/object:Gem::Dependency
   name: PAPI
   requirement: !ruby/object:Gem::Requirement