cleanup + bugfix

dnnweaver2/graph.py

@@ -132,6 +132,15 @@ def get_op_name(self, name, op_type):
         self.op_type_counter[op_type] += 1
         return name
 
+    def get_ops(self):
+        total_ops = {}
+        for opname, op in self.op_registry.iteritems():
+            for op_type, num_ops in op.get_ops().iteritems():
+                if op_type not in total_ops:
+                    total_ops[op_type] = 0
+                total_ops[op_type] += num_ops
+        return total_ops
+
     @contextmanager
     def name_scope(self, name):
         current_scope = self.current_scope

dnnweaver2/scalar/dtypes.py

@@ -33,10 +33,14 @@ def __init__(self, exp_bits):
         self.bits = 2
         self.exp_bits = exp_bits
 
-class Binary(Dtype):
+class Binary(FixedPoint):
     def __init__(self):
         self.bits = 1
         self.op_str = 'Binary'
+        self.frac_bits = 0
+        self.int_bits = 1
+    def __str__(self):
+        return 'Binary'
 
 class CustomFloat(Dtype):
     def __init__(self, bits, exp_bits):

dnnweaver2/scalar/ops.py

@@ -23,6 +23,7 @@ def __init__(self):
         self.CmpOp = {}
         self.AddOp = {}
         self.SubOp = {}
+        self.RshiftOp = {}
     def MUL(self, dtypes):
         assert len(dtypes) == 2
         if dtypes not in self.MulOp:
@@ -53,6 +54,11 @@ def SUB(self, dtypes):
         if dtypes not in self.SubOp:
             self.SubOp[dtypes] = ScalarOp('Subtract', dtypes)
         return self.SubOp[dtypes]
+    def RSHIFT(self, dtypes):
+        assert isinstance(dtypes, Dtype), 'Got Dtypes: {}'.format(dtypes)
+        if dtypes not in self.RshiftOp:
+            self.RshiftOp[dtypes] = ScalarOp('Rshift', dtypes)
+        return self.RshiftOp[dtypes]
 
 
 Ops = ScalarOpTypes()