diff options
Diffstat (limited to 'tensorflow/go')
-rw-r--r-- | tensorflow/go/graph.go | 17 | ||||
-rw-r--r-- | tensorflow/go/graph_test.go | 22 |
2 files changed, 4 insertions, 35 deletions
diff --git a/tensorflow/go/graph.go b/tensorflow/go/graph.go index fc087d9d99..f200a8e00a 100644 --- a/tensorflow/go/graph.go +++ b/tensorflow/go/graph.go @@ -28,8 +28,7 @@ package tensorflow // int num_shapes) { // const int64_t** dims = // (const int64_t**)malloc(sizeof(const int64_t*) * num_shapes); -// int i = 0; -// for (i = 0; i < num_shapes; i++) { +// for (int i = 0; i < num_shapes; i++) { // dims[i] = flat_dims; // if (num_dims[i] > 0) { // // flat_dims will be NULL iff num_shapes is 0 or all elements in num_dims are <= 0. @@ -133,20 +132,6 @@ func (g *Graph) Operation(name string) *Operation { return &Operation{cop, g} } -// Operations returns a list of all operations in the graph -func (g *Graph) Operations() []Operation { - var pos C.size_t = 0 - ops := []Operation{} - for { - cop := C.TF_GraphNextOperation(g.c, &pos) - if cop == nil { - break - } - ops = append(ops, Operation{cop, g}) - } - return ops -} - // OpSpec is the specification of an Operation to be added to a Graph // (using Graph.AddOperation). type OpSpec struct { diff --git a/tensorflow/go/graph_test.go b/tensorflow/go/graph_test.go index b8d65c54f6..c3120bc720 100644 --- a/tensorflow/go/graph_test.go +++ b/tensorflow/go/graph_test.go @@ -29,26 +29,10 @@ func hasOperations(g *Graph, ops ...string) error { missing = append(missing, op) } } - if len(missing) != 0 { - return fmt.Errorf("Graph does not have the operations %v", missing) + if len(missing) == 0 { + return nil } - - inList := map[string]bool{} - for _, op := range g.Operations() { - inList[op.Name()] = true - } - - for _, op := range ops { - if !inList[op] { - missing = append(missing, op) - } - } - - if len(missing) != 0 { - return fmt.Errorf("Operations %v are missing from graph.Operations()", missing) - } - - return nil + return fmt.Errorf("Graph does not have the operations %v", missing) } func TestGraphWriteToAndImport(t *testing.T) { |