Update app.py

app.py

@@ -207,55 +207,55 @@ def GenerateAccompaniment(input_midi, input_num_tokens, input_conditioning_type)
 
     output = []
     
-    force_acc = input_acc_type
-    num_toks_per_note = 32
+    max_chords_limit = 8
     temperature=0.9
-    max_drums_limit=4
     num_memory_tokens=4096
 
-    output1 = []
-    output2 = []
+    output = []
     
-
-    for m in melody_chords[:input_num_tokens]:
+    idx = 0
     
-        output1.extend(m)
-
-        input_seq = output1
+    for c in chords[:input_num_tokens]:
     
-        if force_acc:
-          x = torch.LongTensor([input_seq+[0]]).cuda()
-        else:
-          x = torch.LongTensor([input_seq]).cuda()
+      try:
     
-        time = input_seq[-2]-512
+        output.append(c)
     
-        cur_time = 0
+        if input_conditioning_type == 'Chords-Times' or input_conditioning_type == 'Chords-Times-Durations':
+          output.append(times[idx])
+    
+        if input_conditioning_type == 'Chords-Times-Durations':
+          output.append(durs[idx])
+
+        chords = output
     
-        for _ in range(num_toks_per_note):
+        x = torch.tensor([chords] * 1, dtype=torch.long, device='cuda')
+        
+        o = 0
+        
+        ncount = 0
+        
+        while o < 384 and ncount < max_chords_limit:
           with ctx:
             out = model.generate(x[-num_memory_tokens:],
                                 1,
                                 temperature=temperature,
                                 return_prime=False,
                                 verbose=False)
-    
+        
           o = out.tolist()[0][0]
-    
-          if 0 <= o < 128:
-            cur_time += o
-    
-          if cur_time < time and o < 384:
-    
-            out = torch.LongTensor([[o]]).cuda()
+        
+          if 256 <= o < 384:
+            ncount += 1
+        
+          if o < 384:
             x = torch.cat((x, out), 1)
-          else:
-            break
+        
+        outy =  x.tolist()[0][len(chords):]
+          
+        output.extend(outy)
     
-        outy =  x.tolist()[0][len(input_seq):]
-
-        output1.extend(outy)
-        output2.append(outy)
+        idx += 1
 
     print('=' * 70)
     print('Done!')
@@ -265,13 +265,10 @@ def GenerateAccompaniment(input_midi, input_num_tokens, input_conditioning_type)
     print('Rendering results...')
     
     print('=' * 70)
-    print('Sample INTs', output1[:12])
+    print('Sample INTs', output[:12])
     print('=' * 70)
     
-    out1 = output2
-
-    accompaniment_MIDI_patch_number = 0
-    melody_MIDI_patch_number = 40
+    out1 = output
 
     if len(out1) != 0: