acoular 23.6__py3-none-any.whl → 24.3__py3-none-any.whl

acoular/__init__.py

@@ -44,14 +44,14 @@ from .microphones import MicGeom
 from .spectra import BaseSpectra, FFTSpectra, PowerSpectra, PowerSpectraImport, PowerSpectra as EigSpectra, synthetic
 
 from .fbeamform import BeamformerBase, BeamformerCapon, BeamformerEig, \
-BeamformerMusic, BeamformerDamas, BeamformerDamasPlus, BeamformerOrth,BeamformerCleansc, \
+BeamformerMusic, BeamformerDamas, BeamformerDamasPlus, BeamformerOrth, BeamformerCleansc, \
 BeamformerCMF,BeamformerSODIX, BeamformerClean, BeamformerFunctional, BeamformerGIB, L_p, integrate, \
 PointSpreadFunction, SteeringVector, BeamformerAdaptiveGrid, BeamformerGridlessOrth
 
 from .sources import PointSource, MovingPointSource, \
 TimeSamples, MaskedTimeSamples, PointSourceDipole, UncorrelatedNoiseSource, \
 SourceMixer, SphericalHarmonicSource, LineSource, MovingPointSourceDipole, \
-MovingLineSource
+MovingLineSource, PointSourceConvolve
 from .signals import SineGenerator, WNoiseGenerator, SignalGenerator,\
 PNoiseGenerator, GenericSignalGenerator, FiltWNoiseGenerator
 

acoular/configuration.py

@@ -12,7 +12,43 @@
     config
 """
 
-from os import path, mkdir
+from os import path, mkdir, environ
+from warnings import warn
+import sys 
+
+# When numpy is using OpenBLAS then it runs with OPENBLAS_NUM_THREADS which may lead to
+# overcommittment when called from within numba jitted function that run on
+# NUMBA_NUM_THREADS. If overcommitted, things get extremely! slow. Therefore we make an
+# attempt to avoid this situation. The main problem is that OPENBLAS_NUM_THREADS is
+# only respected once numpy starts. Later on, it cannot be changed.
+
+# we check if numpy already loaded
+if 'numpy' in sys.modules: 
+    # numpy is loaded 
+    # temporarily route stdout to string
+    import io
+    import numpy 
+    orig_stdout = sys.stdout
+    temp_stdout = io.StringIO()
+    sys.stdout = temp_stdout
+    numpy.show_config()
+    sys.stdout = orig_stdout
+    # check if it uses OpenBLAS or another library
+    if 'openblas' in temp_stdout.getvalue().lower():
+        # it's OpenBLAS, set numba threads=1 to avoid overcommittment
+        import numba
+        numba.set_num_threads(1)
+        warn("We detected that Numpy is already loaded and uses OpenBLAS. Because "
+             "this conflicts with Numba parallel execution, we disable parallel "
+             "execution for now and processing might be slower. To speed up, "
+             "either import Numpy after Acoular or set environment variable "
+             "OPENBLAS_NUM_THREADS=1 before start of the program.",
+             UserWarning, stacklevel = 2)
+else:
+    # numpy is not loaded
+    environ['OPENBLAS_NUM_THREADS'] = "1"
+
+# this loads numpy, so we have to defer loading until OpenBLAS check is done
 from traits.api import Trait, Bool, Str, Property, HasStrictTraits
 
 class Config(HasStrictTraits):

acoular/environments.py

@@ -18,9 +18,9 @@
 
 """
 import numba as nb
-from numpy import array, isscalar, float32, float64, newaxis, zeros, \
+from numpy import array, isscalar, float32, float64, newaxis, \
 sqrt, arange, pi, exp, sin, cos, arccos, zeros_like, empty, dot, hstack, \
-vstack, identity, cross, sign, arctan2, matmul, sum, lexsort, stack, nonzero, append, outer, asarray
+vstack, identity, cross, sign, arctan2, matmul, sum, ascontiguousarray
 from numpy.linalg.linalg import norm
 from scipy.integrate import ode
 from scipy.interpolate import LinearNDInterpolator
@@ -28,10 +28,10 @@ from scipy.spatial import ConvexHull
 from traits.api import HasPrivateTraits, Float, Property, Int, \
 CArray, cached_property, Trait, Dict
 
-from .internal import digest, ldigest
+from .internal import digest
 
-f64ro = nb.types.Array(nb.types.float64,2,'A',readonly=True)
-f32ro = nb.types.Array(nb.types.float32,2,'A',readonly=True)
+f64ro = nb.types.Array(nb.types.float64,2,'C',readonly=True)
+f32ro = nb.types.Array(nb.types.float32,2,'C',readonly=True)
 
 @nb.njit([(f64ro, f64ro), (f64ro, f32ro), (f32ro, f64ro),(f32ro, f32ro)],
                 cache=True, fastmath=True)
@@ -47,11 +47,17 @@ def dist_mat(gpos,mpos):
     """    
     _,M = mpos.shape
     _,N = gpos.shape
-    rm = empty((N,M),dtype=float64)
+    rm = empty((N,M),dtype=gpos.dtype)
+    TWO = rm.dtype.type(2.0) # make sure to have a float32 or float 64 literal
+    m0 = mpos[0]
+    m1 = mpos[1]
+    m2 = mpos[2]
     for n in range(N):
-        g = gpos[:,n]
+        g0 = gpos[0,n]
+        g1 = gpos[1,n]
+        g2 = gpos[2,n]
         for m in range(M):
-            rm[n,m] = sqrt((g[0] - mpos[0,m])**2 + (g[1] - mpos[1,m])**2 + (g[2] - mpos[2,m])**2)
+            rm[n,m] = sqrt((g0 - m0[m])**TWO + (g1 - m1[m])**TWO + (g2 - m2[m])**TWO)
     return rm
 
 
@@ -156,7 +162,7 @@ class Environment( HasPrivateTraits ):
         """
         if isscalar(mpos):
             mpos = array((0, 0, 0), dtype = float64)[:, newaxis]
-        rm = dist_mat(gpos,mpos)
+        rm = dist_mat(ascontiguousarray(gpos),ascontiguousarray(mpos))
 #        mpos = mpos[:, newaxis, :]
 #        rmv = gpos[:, :, newaxis]-mpos
 #        rm = sum(rmv*rmv, 0)**0.5