visualize_helper 0.0.10.38 → 0.0.10.85

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f4b041e9c666807a1fb984af95df9d9781c5e02f
-  data.tar.gz: 8f5b36670c44d2fcb75b6a1e572cad6f5a10b27a
+  metadata.gz: c59eac56652287a7c49e6fbf2d7c830661f20686
+  data.tar.gz: dd3019d73e50651f6a7a680464cf659ed0e3889a
 SHA512:
-  metadata.gz: 3fb67de64e2ed37bc5aa8e342d19b5b8c90cf16ec883119dc9773d9b8efee616d5f4714b2fa312a20e41b902ce7808d2572f75a76d53e631c242602d80188980
-  data.tar.gz: 41ad6dca5fb1349f13576de5a5affafbe3216499e67a4a740d0863c4201cc3b483389b27a127debb0636be466251739be8e4a8b807f5a35b5ff14ece30b7dbd2
+  metadata.gz: 2a555e4a18aa7d985de818a9551808c64ae2deda7aec36de139aa35419ba8018e4d9a8bd1b2e8b8398a36deeb2e284f802ae77a7e67e24219743e9238c3ecd0d
+  data.tar.gz: fa1f57811d326688452b05b7050015b91810b6df5ba1a5fe75b8bef77675f8682f14f4341c2b1d563ac4254a83468b087d727ef0f9773f45f3acb385d2ac4942

data/ext/visualize_helper/extconf.rb

@@ -1,4 +1,7 @@
 require "mkmf"
 extension_name = "visualize_helper"
 dir_config("visualize_helper")
+$CXXFLAGS += ' -fopenmp '
+$CFLAGS += ' -fopenmp '
+have_library('gomp', "main") 
 create_makefile "visualize_helper/visualize_helper"

data/ext/visualize_helper/visualize_helper.c

@@ -3,6 +3,7 @@
 #include <string.h>
 #include <stdio.h>
 #include <math.h>
+#include <omp.h>
 
 void RemoveSpaces(char* source)
 {
@@ -399,7 +400,6 @@ static VALUE iterate_over_trajectories(VALUE self, VALUE trajectories, VALUE min
     } 
   
     value = rb_hash_aref(hash_v,trajectory);
-    //VALUE temp  =  rb_hash_aref(hash,key_t);
     min_max_aggr = min_max_period(self,min,max,rb_hash_aref(hash_t,trajectory),intervals,aggr);
     aggr = rb_ary_entry(min_max_aggr,4);
     min = rb_ary_entry(min_max_aggr,0);
@@ -412,6 +412,146 @@ static VALUE iterate_over_trajectories(VALUE self, VALUE trajectories, VALUE min
   return Qnil;
 }  
 
+
+static VALUE openmp_test(VALUE self, VALUE string) {
+
+  FILE *f = fopen("/tmp/open_mp", "w");
+
+  int nthreads, tid;
+
+  /* Fork a team of threads giving them their own copies of variables */
+  #pragma omp parallel private(nthreads, tid)
+  {
+  
+    /* Obtain thread number */
+    tid = omp_get_thread_num();
+    fprintf(f,"Hello World from thread = %d\n", tid);
+  
+    /* Only master thread does this */
+    if (tid == 0)
+      {
+      nthreads = omp_get_num_threads();
+      fprintf(f,"Number of threads = %d\n", nthreads);
+      }
+  
+  }  /* All threads join master thread and disband */
+
+  fclose(f);
+  return string;
+}
+
+
+// Function callback to iterate in hash of boxes or links
+static int update_boxes_links(VALUE key, VALUE value, VALUE parameters){
+ 
+  VALUE boxes_links_result = rb_ary_entry(parameters,0);
+  int index = FIX2INT(rb_ary_entry(parameters,1));
+
+  VALUE boxes_links_result_index = rb_ary_entry(boxes_links_result,index);
+
+  // if the key isnt already set on the boxes_result, create it 
+  if (rb_hash_aref(boxes_links_result_index,key) == Qnil) {
+    rb_hash_aset(boxes_links_result_index,key,value);
+  }else{
+    // if the key is already on the boxes_result, sum the results
+    rb_hash_aset(boxes_links_result_index,key, FIX2INT(rb_hash_aref(boxes_links_result_index,key)) + FIX2INT(value));
+  }  
+
+  return ST_CONTINUE;
+}  
+
+
+
+
+// iterate over all the trajectories and create the boxes and links needed for the dashboard (Parallel)
+//static VALUE iterate_over_trajectories_parallel(VALUE self, VALUE trajectories, VALUE min, VALUE max, VALUE hash_v, VALUE hash_t, VALUE intervals, VALUE dict, VALUE agrupamento, VALUE boxes, VALUE links) {
+static VALUE iterate_over_trajectories_parallel() {
+
+  //VALUE trajectory;
+  VALUE aggr;
+  //VALUE value;
+  //VALUE min_max_aggr;
+  //VALUE boxes_result = rb_ary_new(); 
+  //VALUE links_result = rb_ary_new();
+  int i,j;
+  
+
+  //initialize boxes_result and links_result
+  //for (j = 0; j < RARRAY_LEN(intervals) + 2; j++){
+  //  rb_ary_push(boxes_result,rb_hash_new());
+  //  if ( j != 0) {
+  //    rb_ary_push(links_result,rb_hash_new());
+  //  }  
+  //} 
+
+  //#pragma omp parallel firstprivate(boxes,links,i,j)
+  //#pragma omp parallel private(i,j,aggr,boxes,links)
+  //{
+  //  //#pragma omp for nowait
+  //  #pragma omp for firstprivate(min,max) nowait
+  //  for (i = 0; i < RARRAY_LEN(trajectories); i++ ){
+  //  
+  //    
+  //    trajectory = rb_ary_entry(trajectories,i);
+   
+  #pragma omp parallel for private(i,aggr)
+  for (i = 0; i < 500; i++ ){
+
+      aggr = rb_ary_new();
+      //for (j = 0; j < RARRAY_LEN(intervals) + 2; j++){
+      //  rb_ary_push(aggr,rb_ary_new());
+      //} 
+    
+      //value = rb_hash_aref(hash_v,trajectory);
+      //min_max_aggr = min_max_period(self,min,max,rb_hash_aref(hash_t,trajectory),intervals,aggr);
+      //aggr = rb_ary_entry(min_max_aggr,4);
+      //min = rb_ary_entry(min_max_aggr,0);
+      //max = rb_ary_entry(min_max_aggr,1);
+
+      //generate_boxes_and_links(self,aggr,boxes,links,dict,agrupamento,value);
+
+   // }// end pragma for  
+  }
+  //  // must aggregate the boxes from each thread into boxes_result
+  //  #pragma omp critical
+  //  {
+  //    int i;
+  //    VALUE parameters = rb_ary_new2(2);
+  //    // iterate over the size of boxes
+  //    for(i = 0; i < RARRAY_LEN(boxes); i++ ){
+  //      
+  //      rb_ary_store(parameters,0,boxes_result);
+  //      rb_ary_store(parameters,1,INT2FIX(i));
+  //      VALUE hash = rb_ary_entry(boxes,i);
+  //      //iterate over each key of the hashmap
+  //      rb_hash_foreach(hash,update_boxes_links,parameters);
+  //    }  
+  //  }  
+
+  //  // must aggregate the links from each thread into links_result
+  //  #pragma omp critical
+  //  {
+  //    int i;
+  //    VALUE parameters = rb_ary_new2(2);
+  //    for(i = 0; i < RARRAY_LEN(links); i++ ){
+  //      
+  //      rb_ary_store(parameters,0,links_result);
+  //      rb_ary_store(parameters,1,INT2FIX(i));
+  //      VALUE hash = rb_ary_entry(links,i);
+  //      //iterate over each key of the hashmap
+  //      rb_hash_foreach(hash,update_boxes_links,parameters);
+  //    }  
+  //  }  
+
+  //}// and pragma parallel
+
+  return Qnil;
+}  
+
+
+
+
+
 // Main function called when the gem is loaded 
 void Init_visualize_helper(void) {
 
@@ -427,9 +567,15 @@ void Init_visualize_helper(void) {
   // Register the method sort
   rb_define_singleton_method(mVisualizeHelper, "sort_uniq", sort_uniq, 2 );
 
-  // Register the method that iterates for each trajectory
+  // Register the method that iterates on each trajectory 
   rb_define_singleton_method(mVisualizeHelper, "iterate_over_trajectories", iterate_over_trajectories, 10);
 
   // Register the method sort
   rb_define_singleton_method(mVisualizeHelper, "join_teste", join_teste, 1 );
+
+  // Register a test with openmp
+  rb_define_singleton_method(mVisualizeHelper, "openmp_test", openmp_test, 1 );
+
+  // Register the method that iterates on each trajectory using openmp
+  rb_define_singleton_method(mVisualizeHelper, "iterate_over_trajectories_parallel", iterate_over_trajectories_parallel, 0);
 }

data/lib/visualize_helper/version.rb

@@ -1,3 +1,3 @@
 module VisualizeHelper
-  VERSION = "0.0.10.38"
+  VERSION = "0.0.10.85"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: visualize_helper
 version: !ruby/object:Gem::Version
-  version: 0.0.10.38
+  version: 0.0.10.85
 platform: ruby
 authors:
 - Raphael Ottoni Santiago Machado de Faria
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-11 00:00:00.000000000 Z
+date: 2016-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler