flattening package for easier redistribution

drscotthawley · Jul 24, 2019 · bfe5f9b · bfe5f9b
1 parent 3d5c824
commit bfe5f9b
Show file tree

Hide file tree

Showing 9 changed files with 7 additions and 18 deletions.
diff --git a/demo/bokeh_sliders.py b/demo/bokeh_sliders.py
@@ -14,7 +14,7 @@
 import os, sys
 sys.path.append(os.path.abspath('../'))  # for running from signaltrain/demo/
 import signaltrain as st
-from signaltrain.nn_modules import nn_proc
+from signaltrain import nn_proc
 
 if torch.cuda.is_available():
     device = torch.device("cuda:0")

diff --git a/signaltrain/__init__.py b/signaltrain/__init__.py
@@ -3,6 +3,6 @@
 from . import io_methods
 from . import learningrate
 from . import loss_functions
-from . import nn_modules
+from . import nn_proc
 from . import misc
 from . import train
diff --git a/signaltrain/nn_modules/cls_fe_dct_bases.py → signaltrain/cls_fe_dct_bases.py b/signaltrain/nn_modules/cls_fe_dct_bases.py → signaltrain/cls_fe_dct_bases.py
diff --git a/signaltrain/nn_modules/cls_fe_dft.py → signaltrain/cls_fe_dft.py b/signaltrain/nn_modules/cls_fe_dft.py → signaltrain/cls_fe_dft.py
diff --git a/signaltrain/nn_modules/__init__.py b/signaltrain/nn_modules/__init__.py
diff --git a/signaltrain/nn_modules/nn_proc.py → signaltrain/nn_proc.py b/signaltrain/nn_modules/nn_proc.py → signaltrain/nn_proc.py
@@ -1,6 +1,6 @@
 
 # -*- coding: utf-8 -*-
-__author__ = 'S.I. Mimilakis'
+__author__ = 'S.I. Mimilakis & S.H. Hawley'
 __copyright__ = 'MacSeNet'
 
 # imports

diff --git a/signaltrain/train.py b/signaltrain/train.py
@@ -9,8 +9,8 @@
 from torch.utils.data import DataLoader
 import os, sys
 import time
-from signaltrain import audio, io_methods, learningrate, datasets, loss_functions, misc
-from signaltrain.nn_modules import nn_proc as nn_proc
+from signaltrain import audio, io_methods, learningrate, datasets, loss_functions, misc, nn_proc
+#from signaltrain.nn_modules import nn_proc as nn_proc
 
 # NVIDIA Apex for mixed-precision training
 have_apex = False

diff --git a/utils/lr_finder.py b/utils/lr_finder.py
@@ -119,7 +119,7 @@ def lrfind(model, dataloader, optimizer, calc_loss, start=1e-6, stop=4e-3, num_l
 
 
 # Initialize nn modules
-model = st.nn_modules.nn_proc.st_model(scale_factor=args.scale, shrink_factor=args.shrink, num_knobs=len(effect.knob_names), sr=44100)
+model = st.nn_proc.st_model(scale_factor=args.scale, shrink_factor=args.shrink, num_knobs=len(effect.knob_names), sr=44100)
 chunk_size = model.in_chunk_size
 
 optimizer = torch.optim.Adam(list(model.parameters()), lr=args.lrmax, weight_decay=0)

diff --git a/utils/predict_long.py b/utils/predict_long.py
@@ -97,7 +97,7 @@ def calc_ct(signal, effect, knobs_wc, out_chunk_size, chunk_size, sr=44100):
     ## Can be run as standalone app for testing / eval purposes
     import os
     import argparse
-    from signaltrain.nn_modules import nn_proc
+    from signaltrain import nn_proc
 
     # torch device
     if torch.cuda.is_available():