more widely supported import syntax

Author: FoamyGuy

ulab_Crunch_Numbers_Fast/benchmark.py

@@ -1,6 +1,6 @@
 import time
 import math
-import ulab.numpy
+from ulab import numpy as np
 
 def mean(values):
     return sum(values) / len(values)
@@ -16,15 +16,15 @@ def normalized_rms(values):
 
 def normalized_rms_ulab(values):
     # this function works with ndarrays only
-    minbuf = ulab.numpy.mean(values)
+    minbuf = np.mean(values)
     values = values - minbuf
-    samples_sum = ulab.numpy.sum(values * values)
+    samples_sum = np.sum(values * values)
     return math.sqrt(samples_sum / len(values))
 
 # Instead of using sensor data, we generate some data
 # The amplitude is 5000 so the rms should be around 5000/1.414 = 3536
 nums_list = [int(8000 + math.sin(i) * 5000) for i in range(100)]
-nums_array = ulab.numpy.array(nums_list)
+nums_array = np.array(nums_list)
 
 def timeit(s, f, n=100):
     t0 = time.monotonic_ns()
@@ -37,5 +37,5 @@ def timeit(s, f, n=100):
 print("Computing the RMS value of 100 numbers")
 timeit("traditional", lambda: normalized_rms(nums_list))
 timeit("ulab, with ndarray, some implementation in python", lambda: normalized_rms_ulab(nums_array))
-timeit("ulab only, with list", lambda: ulab.numpy.std(nums_list))
-timeit("ulab only, with ndarray", lambda: ulab.numpy.std(nums_array))
+timeit("ulab only, with list", lambda: np.std(nums_list))
+timeit("ulab only, with ndarray", lambda: np.std(nums_array))

ulab_Crunch_Numbers_Fast/cluebarometer.py

@@ -3,7 +3,7 @@
 import adafruit_bmp280
 import board
 import displayio
-import ulab.numpy as np
+from ulab import numpy as np
 
 # Blank the screen.  Scrolling text causes unwanted delays.
 d = displayio.Group()

ulab_Crunch_Numbers_Fast/cluepulse.py

@@ -3,7 +3,7 @@
 import adafruit_apds9960.apds9960
 import board
 import digitalio
-import ulab.numpy as np
+from ulab import numpy as np
 
 # Blank the screen.  Scrolling text causes unwanted delays.
 import displayio

ulab_Crunch_Numbers_Fast/ledwave.py

@@ -3,7 +3,7 @@
 import board
 import neopixel
 from rainbowio import colorwheel as wheel
-import ulab.numpy as np
+from ulab import numpy as np
 
 # Customize your neopixel configuration here...
 pixel_pin = board.D5

ulab_Crunch_Numbers_Fast/waterfall.py

@@ -7,7 +7,7 @@
 import board
 import audiobusio
 import displayio
-import ulab.numpy as np
+from ulab import numpy as np
 from ulab.scipy.signal import spectrogram
 
 display = board.DISPLAY