Merge branch 'master' of github.com:gorgonia/gorgonia

x/vm/vm_gomachine.go

@@ -2,6 +2,7 @@ package xvm
 
 import (
 	"log"
+	"sync"
 
 	"gorgonia.org/gorgonia"
 )
@@ -44,10 +45,10 @@ func (g *GoMachine) RunAll() error {
 					log.Fatal("chan edge not found")
 				}
 			}
-			go g.opWorker(currentNode, inputC, outputC)
+			go opWorker(currentNode, inputC, outputC)
 			// Send the input to the self nodes...
 		case currentNode.Op() == nil && currentNode.Value() != nil:
-			go g.valueFeeder(currentNode, outputC)
+			go valueFeeder(currentNode, outputC)
 		default:
 			log.Fatal("Yerk?")
 		}
@@ -80,25 +81,64 @@ func NewGoMachine(g *gorgonia.ExprGraph) *GoMachine {
 	}
 }
 
-func (g *GoMachine) opWorker(n *gorgonia.Node, inputC []<-chan gorgonia.Value, outputC []chan<- gorgonia.Value) {
+func opWorker(n *gorgonia.Node, inputC []<-chan gorgonia.Value, outputC []chan<- gorgonia.Value) {
 	vals := make([]gorgonia.Value, len(inputC))
+	var wg sync.WaitGroup
+	wg.Add(len(inputC))
 	for i := range inputC {
-		vals[i] = <-inputC[i]
+		go func(i int, vals []gorgonia.Value, inputC []<-chan gorgonia.Value) {
+			vals[i] = <-inputC[i]
+			wg.Done()
+		}(i, vals, inputC)
 	}
+	wg.Wait()
 	output, err := n.Op().Do(vals...)
 	if err != nil {
 		log.Fatal(err)
 	}
 	gorgonia.UnsafeLet(n, output)
+	wg.Add(len(outputC))
 	for i := range outputC {
-		outputC[i] <- output
+		go func(i int, outputC []chan<- gorgonia.Value) {
+			outputC[i] <- output
+			wg.Done()
+		}(i, outputC)
 	}
+	wg.Wait()
 }
 
-func (g *GoMachine) valueFeeder(n *gorgonia.Node, feedC []chan<- gorgonia.Value) {
+func valueFeeder(n *gorgonia.Node, feedC []chan<- gorgonia.Value) {
+	var wg sync.WaitGroup
+	wg.Add(len(feedC))
 	for i := range feedC {
-		feedC[i] <- n.Value()
+		go func(i int, feedC []chan<- gorgonia.Value) {
+			feedC[i] <- n.Value()
+		}(i, feedC)
 	}
+	wg.Wait()
+}
+
+func (g *GoMachine) populateChanDB() error {
+	edgesIt := g.g.Edges()
+	for edgesIt.Next() {
+		currentEdge := edgesIt.Edge()
+		head := currentEdge.From().ID()
+		tail := currentEdge.To().ID()
+		g.db.upsert(make(chan gorgonia.Value, 0), tail, head)
+	}
+	nodesIt := g.g.Nodes()
+	for nodesIt.Next() {
+		currentNode := nodesIt.Node().(*gorgonia.Node)
+		if g.g.From(currentNode.ID()).Len() == 0 {
+			// Node is an input
+			g.db.upsert(make(chan gorgonia.Value, 0), currentNode.ID(), g.db.inputNodeID)
+		}
+		if g.g.To(currentNode.ID()).Len() == 0 {
+			// Node is an output
+			g.db.upsert(make(chan gorgonia.Value, 0), g.db.outputNodeID, currentNode.ID())
+		}
+	}
+	return nil
 }
 
 func (g *GoMachine) populateChanDB() error {