adjustments to facilitate packaging

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

Hide file tree

Showing 3 changed files with 98 additions and 47 deletions.
diff --git a/demo/SliderDemo.ipynb b/demo/SliderDemo.ipynb
diff --git a/demo/modelcheckpoint_4c.tar b/demo/modelcheckpoint_4c.tar
diff --git a/signaltrain/io_methods.py b/signaltrain/io_methods.py
@@ -8,7 +8,7 @@
 from scipy.io.wavfile import write, read
 from sys import platform
 import matplotlib.pylab as plt
-from .nn_modules import nn_proc
+#from signaltrain.nn_modules import nn_proc
 
 class AudioIO:
 	""" Class for handling audio input/output operations.
@@ -480,21 +480,21 @@ def plot_spectrograms(model, mag_val, mag_val_hat):
 	plt.title('Processed magnitude')
 	savefig('mag_hat.png')
 
-	if isinstance(model, nn_proc.AsymMPAEC):     # Plot the spectrograms
-		plt.matshow(model.dft_analysis.conv_analysis_real.weight.data.cpu().numpy()[:, 0, :] + 1)
-		plt.title('Conv-Analysis Real')
-		savefig('conv_anal_real.png')
-		plt.matshow(model.dft_analysis.conv_analysis_imag.weight.data.cpu().numpy()[:, 0, :])
-		plt.title('Conv-Analysis Imag')
-		savefig('conv_anal_imag.png')
-		plt.matshow(model.dft_synthesis.conv_synthesis_real.weight.data.cpu().numpy()[:, 0, :])
-		plt.title('Conv-Synthesis Real')
-		savefig('conv_synth_real.png')
-		plt.matshow(model.dft_synthesis.conv_synthesis_imag.weight.data.cpu().numpy()[:, 0, :])
-		plt.title('Conv-Synthesis Imag')
-		savefig('conv_synth_imag.png')
-	return
+	#if isinstance(model, nn_proc.AsymMPAEC):     # Plot the spectrograms
+	plt.matshow(model.dft_analysis.conv_analysis_real.weight.data.cpu().numpy()[:, 0, :] + 1)
+	plt.title('Conv-Analysis Real')
+	savefig('conv_anal_real.png')
+	plt.matshow(model.dft_analysis.conv_analysis_imag.weight.data.cpu().numpy()[:, 0, :])
+	plt.title('Conv-Analysis Imag')
+	savefig('conv_anal_imag.png')
+	plt.matshow(model.dft_synthesis.conv_synthesis_real.weight.data.cpu().numpy()[:, 0, :])
+	plt.title('Conv-Synthesis Real')
+	savefig('conv_synth_real.png')
+	plt.matshow(model.dft_synthesis.conv_synthesis_imag.weight.data.cpu().numpy()[:, 0, :])
+	plt.title('Conv-Synthesis Imag')
+	savefig('conv_synth_imag.png')
 
+	return