fix tags for tracking request types in ILP

1 files changed, 8 insertions, 4 deletions

diff --git a/rtss14/gpusync.py b/rtss14/gpusync.py
index ce0e0c8..4c94f9f 100644
--- a/rtss14/gpusync.py
+++ b/rtss14/gpusync.py
@@ -39,6 +39,10 @@ class ResourceRequirement(object):
     def add_request(self, request, tag = 0):
         if type(request) is not list:
             request = [request]
+        if len(request) == 0:
+            assert False
+        if request is None:
+            assert False
         request = np.array(request, dtype=np.float32)
         if tag not in self.requests:
             self.requests[tag] = request
@@ -135,9 +139,9 @@ class FifoCopyEngineLockNoMigrate(FifoEngineLock):
 # use an ILP to joinly solve worst-case engine blocking for in and out copy
 # engines. may only use if there are two copy engines and 1 <= rho <= 5
 class FifoCopyEngineLockP2P_ILP(FifoEngineLock):
-    IN_TAG = 0
-    OUT_TAG = 1
-    MIG_TAG = 2
+    IN_TAG = 1
+    OUT_TAG = 2
+    MIG_TAG = 3
 
     def __init__(self, tasks, ntokens, solver):
         super(FifoCopyEngineLockP2P_ILP,self).__init__(tasks, ntokens)
@@ -153,7 +157,7 @@ class FifoCopyEngineLockP2P_ILP(FifoEngineLock):
             if len(t.resmodel[self].requests[FifoCopyEngineLockP2P_ILP.IN_TAG]) == 0:
                 sys.stderr.write('---- ack!\n')
                 sys.stderr.write(str(t) + '\n')
-                sys.stderr.write('ns: %d   nr: %d   st: %d\n' % (t.sdata, t.rdata, t.stdata))
+                sys.stderr.write('send: %d   rec: %d   state: %d\n' % (t.sdata, t.rdata, t.stdata))
                 sys.stderr.write('ns: %d   nr: %d   st: %d\n' % (t.nsendrequests, t.nrecvrequests, t.nstaterequests))
                 sys.stderr.write('*********\n')
                 sys.stderr.write(str(t.resmodel[self].requests) + '\n')