Merge branch 'lite-arch' into vs-dev

Author: victor-shepardson

Readme.md

@@ -1,12 +1,12 @@
 # Structure
 
 - iipyper: python package for easy MIDI, OSC, event loops
-- notepredictor: python package for defining+training pytorch RNN models
+- notochord: python package for defining+training pytorch RNN models
     - notebooks: jupyter notebooks
     - scripts: helper scripts for training, data preprocessing etc
 - examples:
     - iipyper: basic usage for iipyper
-    - notepredictor: interactive MIDI apps with notepredictor and SuperCollider
+    - notochord: interactive MIDI apps with notochord and SuperCollider
     - bela: [Bela](https://bela.io) examples in C++, Pure Data and so on
     - faust: [Faust](https://faustdoc.grame.fr/) examples
     - tidalcycles [TidalCycles](https://tidalcycles.org) examples
@@ -18,23 +18,23 @@
 ```
 conda env create -f environment.yml
 conda activate iil-python-tools
-pip install -e notepredictor
+pip install -e notochord
 pip install -e iipyper
 ```
 
-# notepredictor
+# notochord
 ## Train a model
 ```
-python scripts/lakh_prep.py --data_path /path/to/midi/files --dest_path /path/to/data/storage
-python scripts/train_notes.py --data_dir /path/to/data/storage --log_dir /path/for/tensorboard logs --model_dir /path/for/checkpoints train
+python notochord/scripts/lakh_prep.py --data_path /path/to/midi/files --dest_path /path/to/data/storage
+python notochord/train.py --data_dir /path/to/data/storage --log_dir /path/for/tensorboard logs --model_dir /path/for/checkpoints train
 ```
 
 ## Run OSC app
 
 ```
-python examples/notepredictor/server.py --checkpoint /path/to/my/model.ckpt
+python examples/notochord/server.py --checkpoint /path/to/my/model.ckpt
 ```
-step through `examples/notepredictor/generate.scd` in SuperCollider IDE
+step through `examples/notochord/generate.scd` in SuperCollider IDE
 
 # Develop
 

environment.yml

@@ -5,7 +5,7 @@ channels:
   - conda-forge
 dependencies:
   - python=3.9
-  - pytorch>=1.10
+  - pytorch=1.11
   - torchaudio
   - onnx
   - tensorboard
@@ -17,5 +17,6 @@ dependencies:
   - pip
   - pip:
     - mido
+    - pretty-midi
     - python-rtmidi
     - python-osc

examples/bela/readme.md

@@ -8,7 +8,7 @@ Unless otherwise stated, these examples assume a set up of a Bela device connect
 - `cpp-osc-resonator`: controlling a resonant filter
 - `cpp-osc-resonators`: controlling a bank of resonant filters
 - `cpp-osc-gui-sliders`: Bela GUI with sliders controlled by `iipyper`
-- `cpp-osc-notepredictor-trill`: using Trill sensors to control `iipyper` `notepredictor` parameters
+- `cpp-osc-notochord-trill`: using Trill sensors to control `iipyper` `notochord` parameters
 
 ## Pure Data
 - `osc-receive`: receive OSC from `iipyper`

examples/notepredictor/generate.scd

@@ -0,0 +1,73 @@
+(
+Server.default.options.numInputBusChannels = 8;
+s.boot;
+)
+
+(
+SynthDef(\analyzer, {
+    arg in=0, threshold=0.1, relaxtime=0.05;
+    var onset1, s1, lv1;
+    var sdel = 0.04; // this is a small delay to skip the first chaotic miliseconds
+
+    var sound_in = HPF.ar(SoundIn.ar(in), 30);
+
+    var amp = WAmp.kr(sound_in, sdel);
+
+    var f0 = Pitch.kr(sound_in, 300,
+        ampThreshold:0.001, peakThreshold:0.5, minFreq:30, maxFreq:8000, median:5
+    )[0];
+
+    var onsets = Onsets.kr(FFT(LocalBuf(2048), sound_in, wintype:1), threshold, \wphase,//\rcomplex,
+        relaxtime:relaxtime, floor:0.1, mingap:1, medianspan:11, whtype:1, rawodf:0);
+
+    var delay_onsets = DelayN.kr(onsets, sdel, sdel);
+
+    // onsets.poll(5);
+
+    SendReply.kr(delay_onsets, '/analysis', [amp, f0]);
+}).add;
+)
+
+(
+~analyzer!?(_.free);
+~analyzer = Synth(\analyzer, [\in, 6, \threshold, 0.1]);
+)
+
+(
+~clear_pending_events.();
+b.sendMsg("/predictor/reset");
+~release_all.(0);
+~allow_end = false;
+~duet = true;
+~do_synth = false;
+~player_sound = true;
+~player_inst = 43;
+~last_pitch = nil;
+~gate = false;
+
+OSCdef(\analysis, {
+    arg msg;
+    var amp = msg[3];
+    var f0 = msg[4];
+    var vel = (amp.pow(0.5)*126+1).round.asInteger;
+    var pitch = f0.cpsmidi.round.asInteger;
+
+
+    ~last_pitch.notNil.if{
+        MIDIdef.all[\input_off].func.value(0, ~last_pitch)};
+    MIDIdef.all[\input_on].func.value(vel, pitch);
+
+    ~last_pitch = pitch;
+
+}, "/analysis")
+)
+
+(
+~clear_pending_events.();
+~release_all.(0);
+)
+
+
+// ~analyzer.set(\threshold, 0.1)
+
+// OSCdef.trace

examples/notochord/analysis.scd

@@ -1,5 +1,5 @@
 // in this example the Linnstrument displays an interface to perform pitches
-// by their likelihood under the NotePredictor model instead of by MIDI number
+// by their likelihood under the Notochord model instead of by MIDI number
 
 // the grid in the upper left gives control of pitches from
 // the single most likely (cyan) to least likely (pink).