Merge branch 'alex' into jack

src/bin/test_simple.rs

@@ -40,21 +40,22 @@ fn main() {
         println!("{:?}", num);
     }
 
-    let a:Vec<Vec<i32>> = vec![vec![1,2,3],vec![4,5,6],vec![7,8,9]];
+    let a = vec![vec![1,2,3],vec![4,5,6],vec![7,8,9]];
+    let b = vec![vec![3,2,1],vec![6,5,4],vec![9,8,7]];
     let n = a.len();
     let mut c = vec![vec![0;n];n];
-    let mut x = 0;
+    for i in 0..n {
-    par_for! {
+        for j in 0..n {
-        // I feel like we shouldn't need to capture a here
+            let mut x = 0;
-        for k in 0..n, capturing a, reduction x#+, {
+            par_for! {
-            critical! {
+                for k in 0..n, using a b, reducing x#+, {
-                read a;
+                    x += a[i][k]*b[k][j];
-                x += a[1][k]*a[k][0];
+                }
             }
+            c[i][j] = x;
         }
     }
-    c[1][0] = x;
+    println!("{:?}", c);
-    println!("{:?}", c[1][0]);
     // let mut local = 0;
     // par_for! {
     // for i in 1..32, blocksize 1, capturing numbers, private local, {

src/lib.rs

@@ -71,13 +71,14 @@ macro_rules! critical {
 
 #[macro_export]
 macro_rules! __internal_par_for {
-    // without reduction
+    // without reducing
     (var_name($name:ident),
     iterator($iter:expr),
     blocksize($size:expr),
     captured($($captured:ident)*),
     private($($private:ident)*),
-    reduction(),
+    reducing(),
+    using($($used_name:ident)*),
     $blk:block) => {
         let mut __rmp_tasks = Vec::new();
         $(let $captured = rustmp::Capture::new($captured);)*
@@ -88,6 +89,7 @@ macro_rules! __internal_par_for {
             for iter in __rmp_iters {
                 $(let $captured = $captured.clone();)*
                 $(let $private = $private.clone();)*
+                $(let $used_name = $used_name.clone();)*
                 __rmp_tasks.push(rustmp::as_static_job(move || {
                     $(let mut $private = $private.clone();)*
                     for &$name in &iter
@@ -98,13 +100,14 @@ macro_rules! __internal_par_for {
         }
         $(let $captured = $captured.unwrap();)*
     };
-    // with reduction
+    // with reducing
     (var_name($name:ident),
     iterator($iter:expr),
     blocksize($size:expr),
     captured($($captured:ident)*),
     private($($private:ident)*),
-    reduction($($red_name:ident, $red_op:tt)+),
+    reducing($($red_name:ident, $red_op:tt)+),
+    using($($used_name:ident)*),
     $blk:block) => {
         let mut __rmp_tasks = Vec::new();
         $(let $captured = rustmp::Capture::new($captured);)*
@@ -118,6 +121,7 @@ macro_rules! __internal_par_for {
             let __rmp_red_vals = rustmp::Capture::new(__rmp_red_vals);
             for iter in __rmp_iters {
                 $(let $captured = $captured.clone();)*
+                $(let $used_name = $used_name.clone();)*
                 let __rmp_red_vals = __rmp_red_vals.clone();
                 $(let $private = $private.clone();)*
                 $(let $red_name = $red_name.clone();)*
@@ -144,7 +148,8 @@ macro_rules! __internal_par_for {
     blocksize($size:expr),
     captured($($captured:ident)*),
     private($($private:ident)*),
-    reduction($($red_name:ident, $red_op:tt)*),
+    reducing($($red_name:ident, $red_op:tt)*),
+    using($($used_name:ident)*),
     blocksize $new_size:expr,
     $($rem:tt)+) => {
         rustmp::__internal_par_for!(
@@ -153,7 +158,8 @@ macro_rules! __internal_par_for {
             blocksize($new_size),
             captured($($captured)*),
             private($($private)*),
-            reduction($($red_name, $red_op)*),
+            reducing($($red_name, $red_op)*),
+            using($($used_name)*),
             $($rem)*)
     };
     // Parse capturing
@@ -162,7 +168,8 @@ macro_rules! __internal_par_for {
     blocksize($size:expr),
     captured($($captured:ident)*),
     private($($private:ident)*),
-    reduction($($red_name:ident, $red_op:tt)*),
+    reducing($($red_name:ident, $red_op:tt)*),
+    using($($used_name:ident)*),
     capturing $($new_captured:ident)*,
     $($rem:tt)+) => {
         rustmp::__internal_par_for!(
@@ -171,7 +178,8 @@ macro_rules! __internal_par_for {
             blocksize($size),
             captured($($new_captured)*),
             private($($private)*),
-            reduction($($red_name, $red_op)*),
+            reducing($($red_name, $red_op)*),
+            using($($used_name)*),
             $($rem)*)
     };
     // Parse private
@@ -180,7 +188,8 @@ macro_rules! __internal_par_for {
     blocksize($size:expr),
     captured($($captured:ident)*),
     private($($private:ident)*),
-    reduction($($red_name:ident, $red_op:tt)*),
+    reducing($($red_name:ident, $red_op:tt)*),
+    using($($used_name:ident)*),
     private $($new_private:ident)*,
     $($rem:tt)+) => {
         rustmp::__internal_par_for!(
@@ -189,17 +198,19 @@ macro_rules! __internal_par_for {
             blocksize($size),
             captured($($captured)*),
             private($($new_private)*),
-            reduction($($red_name, $red_op)*),
+            reducing($($red_name, $red_op)*),
+            using($($used_name)*),
             $($rem)*)
     };
-    // Parse reduction
+    // Parse reducing
     (var_name($name:ident),
     iterator($iter:expr),
     blocksize($size:expr),
     captured($($captured:ident)*),
     private($($private:ident)*),
-    reduction($($red_name:ident, $red_op:tt)*),
+    reducing($($red_name:ident, $red_op:tt)*),
-    reduction $($new_name:ident#$new_op:tt);*,
+    using($($used_name:ident)*),
+    reducing $($new_name:ident#$new_op:tt);*,
     $($rem:tt)+) => {
         rustmp::__internal_par_for!(
             var_name($name),
@@ -207,7 +218,28 @@ macro_rules! __internal_par_for {
             blocksize($size),
             captured($($captured)*),
             private($($private)*),
-            reduction($($new_name, $new_op)*),
+            reducing($($new_name, $new_op)*),
+            using($($used_name)*),
+            $($rem)*)
+    };
+    // Parse using
+    (var_name($name:ident),
+    iterator($iter:expr),
+    blocksize($size:expr),
+    captured($($captured:ident)*),
+    private($($private:ident)*),
+    reducing($($red_name:ident, $red_op:tt)*),
+    using($($used_name:ident)*),
+    using $($new_name:ident)*,
+    $($rem:tt)+) => {
+        rustmp::__internal_par_for!(
+            var_name($name),
+            iterator($iter),
+            blocksize($size),
+            captured($($captured)*),
+            private($($private)*),
+            reducing($($red_name, $red_op)*),
+            using($($new_name)*),
             $($rem)*)
     };
 }
@@ -225,7 +257,8 @@ macro_rules! par_for {
             blocksize(1),
             captured(),
             private(),
-            reduction(),
+            reducing(),
+            using(),
             $($rem)*)
     }
 }