remove torchscript and conditional imports to allow compilation with nuitka

Author: victor-shepardson

examples/notochord/generate-demo.scd

@@ -22,7 +22,7 @@ Quarks.install("API")
 
 (
 ///////// define scheduler /////////
-~player_instrument = nil;
+~player_inst = nil;
 ~gate = true;
 
 // track the current predicted next event
@@ -64,7 +64,7 @@ Quarks.install("API")
 	~output.send(inst, pitch, vel);
 
     //get a new prediction in light of current note
-	~exclude_instrument = ~player_instrument!?([_]);
+	~exclude_instrument = ~player_inst!?([_]);
     ~noto.feedQuery(
 		\inst, inst, \pitch, pitch, \time, dt, \vel, vel,
 		\handle, event_time, *~noto.globalArgs);
@@ -229,8 +229,8 @@ Quarks.install("API")
 ~pitch_temp = 1;
 ~rhythm_temp = 1;
 ~timing_temp = 0.1;
-~min_time = 0.015;
-~max_time = 0.125;
+~min_time = nil;//0.015;
+~max_time = nil;//0.125;
 ~velocity_temp = 1;
 ~include_pitch = ([[0,3,7,9]]+[40,52,64,76]).flatten;
 ~clear_prediction.();
@@ -263,8 +263,8 @@ Quarks.install("API")
 ~last_event_time = nil;
 
 // choose instruments for the player and Notochord
-~player_inst = 12;
-~include_instrument = [55, 120,]; //notochord instruments
+~player_inst = 57;
+~include_instrument = [61]; //notochord instruments
 ~allow_end = true;
 
 ~instrument_temp = 1;

notochord/notochord/__main__.py

@@ -2,6 +2,8 @@
 
 from iipyper import run
 
+from notochord.server import main as server
+
 def help():
     print("""
     available subcommands:
@@ -12,9 +14,8 @@ def help():
     # print(sys.argv)
     try:
         if sys.argv[1] == 'server':
-            from .server import main
             sys.argv = sys.argv[1:]
-            run(main)
+            run(server)
         else:
             help()
     except IndexError:

notochord/notochord/model.py

@@ -129,11 +129,11 @@ def __init__(self,
         # embeddings for inputs
         self.instrument_emb = nn.Embedding(self.instrument_domain, emb_size)
         self.pitch_emb = nn.Embedding(self.pitch_domain, emb_size)
-        self.time_emb = torch.jit.script(
+        self.time_emb = (#torch.jit.script(
             SineEmbedding(
             time_sines, emb_size, 1e-3, 30, scale='log'))
         # self.vel_emb = MixEmbedding(emb_size, (0, 127))
-        self.vel_emb = torch.jit.script(
+        self.vel_emb = (#torch.jit.script(
             SineEmbedding(
             vel_sines, emb_size, 2, 512, scale='lin'))
 
@@ -149,7 +149,7 @@ def __init__(self,
             for _ in range(2 if kind=='lstm' else 1)
         ])
 
-        mlp_cls = lambda *a: torch.jit.script(GLUMLP(*a))
+        mlp_cls = GLUMLP#lambda *a: torch.jit.script(GLUMLP(*a))
         # projection from RNN state to distribution parameters
         self.h_proj = mlp_cls(
                 rnn_hidden, emb_size, emb_size, 

notochord/notochord/server.py

@@ -10,7 +10,8 @@
 import numpy as np
 from time import time
 
-def main(host="127.0.0.1", receive_port=9999, send_port=None, checkpoint=None):
+def main(host="127.0.0.1", receive_port=9999, send_port=None, 
+        checkpoint="artifacts/notochord-latest.ckpt"):
     osc = OSC(host, receive_port)
 
     if checkpoint is not None: