acoular 23.6__tar.gz → 24.3__tar.gz

acoular-24.3/.github/workflows/build_docs.yml

@@ -0,0 +1,43 @@
+name: Build docs and deploy
+
+#DEPLOY NOTE: This workflow will only deploy the docs when a workflow is manually triggered from the main branch via github! 
+
+on:
+  pull_request:
+    branches: [ master ] # build docs as additional test on PRs to main
+  workflow_dispatch:
+    branches: [ '*' ] # allow manual trigger for all branches
+  
+permissions:
+  contents: write
+
+jobs:
+  sphinx:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Setup Python 3.11
+        uses: actions/setup-python@v4
+        with:
+          python-version: '3.11'
+      - name: Install dependencies
+        run: |
+          sudo apt-get install graphviz  
+          sudo apt-get install libportaudio2
+          python -m pip install --upgrade pip
+          pip install ".[dev]"
+      - name: Build docs 
+        run: |
+          cd docs
+          make html
+      - name: Deploy docs
+        uses: peaceiris/actions-gh-pages@v3
+        if: ${{ github.event_name =='workflow_dispatch' && github.ref == 'refs/heads/master' }}
+        with:
+          publish_branch: gh-pages
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          publish_dir: ./docs/build/html/
+          cname: www.acoular.org
+          force_orphan: true # This allows you to make your publish branch with only the latest commit.
+          enable_jekyll: false
+

{acoular-23.6 → acoular-24.3}/.github/workflows/python-package.yml

@@ -20,9 +20,9 @@ jobs:
         python-version: ['3.7', '3.8', '3.9','3.10','3.11']
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v4
       with:
         python-version: ${{ matrix.python-version }}
     - name: Install acoular

{acoular-23.6 → acoular-24.3}/.gitignore

@@ -5,6 +5,7 @@
 *~
 examples/three_sources.h5
 examples/all_bf.sav
+examples/benchmark/results/
 MANIFEST
 
 # ignore the build directories

acoular-24.3/.zenodo.json

@@ -0,0 +1,47 @@
+{
+  "metadata": {
+    "title": "Acoular – Acoustic testing and source mapping software",
+    "license": "BSD",
+    "keywords": [
+      "acoustics",
+      "beamforming",
+      "microphone array"
+    ],
+    "upload_type": "software",
+    "creators": [
+      {
+        "affiliation": "Department of Engineering Acoustics, TU Berlin",
+        "name": "Sarradj, Ennes",
+        "orcid": "0000-0002-0274-8456"
+      },
+      {
+        "affiliation": "Department of Engineering Acoustics, TU Berlin",
+        "name": "Herold, Gert",
+        "orcid": "0000-0001-5284-051X"
+      },
+      {
+        "affiliation": "Department of Engineering Acoustics, TU Berlin",
+        "name": "Kujawski, Adam",
+        "orcid": "0000-0003-4579-8813"
+      },
+      {
+        "affiliation": "Department of Engineering Acoustics, TU Berlin",
+        "name": "Jekosch, Simon"
+      },
+      {
+        "affiliation": "Department of Engineering Acoustics, TU Berlin",
+        "name": "Pelling, Art J. R.",
+        "orcid": "0000-0003-3228-6069"
+
+      },
+      {
+        "affiliation": "Department of Engineering Acoustics, TU Berlin",
+        "name": "Czuchaj, Mikolaj"
+      },
+      {
+        "affiliation": "Department of Engineering Acoustics, TU Berlin",
+        "name": "Gensch, Tom"
+      }
+    ]
+  }
+}

{acoular-23.6 → acoular-24.3}/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2006-2021 The acoular developers.
+Copyright (c) Acoular Development Team.
 All rights reserved.
 
 

acoular-24.3/PKG-INFO

@@ -0,0 +1,181 @@
+Metadata-Version: 2.1
+Name: acoular
+Version: 24.3
+Summary: Python library for acoustic beamforming
+Project-URL: homepage, https://acoular.org
+Project-URL: documentation, https://acoular.org
+Project-URL: repository, https://github.com/acoular/acoular
+Author-email: Acoular Development Team <info@acoular.org>
+Maintainer-email: Adam Kujawski <adam.kujawski@tu-berlin.de>, Art Pelling <a.pelling@tu-berlin.de>, Ennes Sarradj <ennes.sarradj@tu-berlin.de>, Gert Herold <gert.herold@tu-berlin.de>, Mikolaj Czuchaj <mikolaj.czuchaj@tu-berlin.de>, Simon Jekosch <s.jekosch@tu-berlin.de>
+License: Copyright (c) Acoular Development Team.
+        All rights reserved.
+        
+        
+        Redistribution and use in source and binary forms, with or without
+        modification, are permitted provided that the following conditions are met:
+        
+          a. Redistributions of source code must retain the above copyright notice,
+             this list of conditions and the following disclaimer.
+          b. Redistributions in binary form must reproduce the above copyright
+             notice, this list of conditions and the following disclaimer in the
+             documentation and/or other materials provided with the distribution.
+          c. Neither the name of the acoular developers nor the names of
+             its contributors may be used to endorse or promote products
+             derived from this software without specific prior written
+             permission. 
+        
+        
+        THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+        AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+        IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+        ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR
+        ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+        DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+        SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+        CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+        LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+        OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+        DAMAGE.
+License-File: AUTHORS.rst
+License-File: LICENSE
+Keywords: acoustics,beamforming,microphone array
+Classifier: Development Status :: 5 - Production/Stable
+Classifier: Intended Audience :: Education
+Classifier: Intended Audience :: Science/Research
+Classifier: License :: OSI Approved :: BSD License
+Classifier: Programming Language :: Python :: 3.7
+Classifier: Programming Language :: Python :: 3.8
+Classifier: Programming Language :: Python :: 3.9
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Topic :: Scientific/Engineering :: Physics
+Requires-Python: <=11,>=3.7
+Requires-Dist: numba
+Requires-Dist: numpy
+Requires-Dist: scikit-learn
+Requires-Dist: scipy>=1.1.0
+Requires-Dist: tables>=3.4.4
+Requires-Dist: traits>=6.0
+Provides-Extra: dev
+Requires-Dist: graphviz; extra == 'dev'
+Requires-Dist: ipython; extra == 'dev'
+Requires-Dist: matplotlib; extra == 'dev'
+Requires-Dist: nox; extra == 'dev'
+Requires-Dist: numpydoc; extra == 'dev'
+Requires-Dist: pickleshare; extra == 'dev'
+Requires-Dist: sounddevice; extra == 'dev'
+Requires-Dist: sphinx; extra == 'dev'
+Provides-Extra: full
+Requires-Dist: matplotlib; extra == 'full'
+Requires-Dist: pylops; extra == 'full'
+Requires-Dist: sounddevice; extra == 'full'
+Description-Content-Type: text/markdown
+
+![Acoular Logo](./docs/source/_static/Acoular_logo.png)
+
+[![PyPI](https://img.shields.io/pypi/pyversions/acoular.svg)](https://pypi.org/project/acoular)
+[![PyPI](https://img.shields.io/pypi/v/acoular.svg)](https://pypi.org/project/acoular)
+[![Github](https://github.com/acoular/acoular/actions/workflows/python-package.yml/badge.svg)](https://github.com/acoular/acoular/actions/workflows/python-package.yml)
+
+# Acoular
+Acoular is a Python module for acoustic beamforming that is distributed under the new BSD license. 
+
+It is aimed at applications in acoustic testing. Multichannel data recorded by a microphone array can be processed and analyzed in order to generate mappings of sound source distributions. The maps (acoustic photographs) can then be used to locate sources of interest and to characterize them using their spectra. 
+
+# Features
+- frequency domain beamforming algorithms: delay & sum, Capon (adaptive), MUSIC, functional beamforming, eigenvalue beamforming
+- frequency domain deconvolution algorithms: DAMAS, DAMAS+, Clean, CleanSC, orthogonal deconvolution
+- frequency domain inverse methods: CMF (covariance matrix fitting), general inverse beamforming, SODIX
+- time domain methods: delay & sum beamforming, CleanT deconvolution
+- time domain methods applicable for moving source with arbitrary trajectory (linear, circular, arbitrarily 3D curved), 
+- frequency domain methods for rotating sources via virtual array rotation for arbitrary arrays and with different interpolation techniques
+- 1D, 2D and 3D mapping grids for all methods
+- gridless option for orthogonal deconvolution
+- four different built-in steering vector formulations
+- arbitrary stationary background flow can be considered for all methods
+- efficient cross spectral matrix computation
+- flexible modular time domain processing: n-th octave band filters, fast, slow, and impulse weighting, A-, C-, and Z-weighting, filter bank, zero delay filters
+- time domain simulation of array microphone signals from fixed and arbitrarily moving sources in arbitrary flow
+- fully object-oriented interface
+- lazy evaluation: while processing blocks are set up at any time, (expensive) computations are only performed when needed
+- intelligent and transparent caching: computed results are automatically saved and loaded on the next run to avoid unnecessary re-computation
+- parallel (multithreaded) implementation with Numba for most algorithms
+- easily extendable with new algorithms
+
+# License
+Acoular is licensed under the BSD 3-clause. See [LICENSE](LICENSE)
+
+# Citing
+
+If you use Acoular for academic work, please consider citing our
+[publication](https://doi.org/10.1016/j.apacoust.2016.09.015):
+
+    Ennes Sarradj, Gert Herold,
+    A Python framework for microphone array data processing,
+    Applied Acoustics, Volume 116, 2017, Pages 50-58
+
+# Dependencies
+Acoular runs under Linux, Windows and MacOS and needs Numpy, Scipy, Traits, scikit-learn, pytables, Numba packages available. 
+Matplotlib is needed for some of the examples.
+
+If you want to use input from a soundcard hardware, you will also need to install the [sounddevice](https://python-sounddevice.readthedocs.io/en/0.3.12/installation.html) package. Some solvers for the CMF method need [Pylops](https://pylops.readthedocs.io/en/stable/installation.html).
+
+# Installation
+
+Acoular can be installed via [conda](https://docs.conda.io/en/latest/), which is also part of the [Anaconda Python distribution](https://www.anaconda.com/). It is recommended to install into a dedicated [conda environment](https://docs.conda.io/projects/conda/en/latest/user-guide/tasks/manage-environments.html). After activating this environment, run
+
+    conda install -c acoular acoular
+
+This will install Acoular in your Anaconda Python enviroment and make the Acoular library available from Python. In addition, this will install all dependencies (those other packages mentioned above) if they are not already present on your system. 
+
+A second option is to install Acoular via [pip](https://pip.pypa.io/en/stable/). It is recommended to use a dedicated [virtual environment](https://virtualenv.pypa.io/en/latest/) and then run
+
+    pip install acoular
+
+For more detailed install instructions see the [documentation](http://acoular.org/install/index.html).
+
+# Documentation and help
+Documentation is available [here](http://acoular.org) with a
+[getting started](http://acoular.org/get_started/index.html) section and
+[examples](http://acoular.org/examples/index.html).
+
+The Acoular [blog](https://acoular.github.io/blog/) contains some tutorials.
+
+Problems, suggestions and success using Acoular may be reported via the [acoular-users](https://groups.google.com/forum/#!forum/acoular-users) discussion forum.
+
+# Example
+This reads data from 64 microphone channels and computes a beamforming map for the 8kHz third octave band:
+
+```python
+from os import path
+import acoular
+from matplotlib.pylab import figure, plot, axis, imshow, colorbar, show
+
+# this file contains the microphone coordinates
+micgeofile = path.join(path.split(acoular.__file__)[0],'xml','array_64.xml')
+# set up object managing the microphone coordinates
+mg = acoular.MicGeom( from_file=micgeofile )
+# set up object managing the microphone array data (usually from measurement)
+ts = acoular.TimeSamples( name='three_sources.h5' )
+# set up object managing the cross spectral matrix computation
+ps = acoular.PowerSpectra( time_data=ts, block_size=128, window='Hanning' )
+# set up object managing the mapping grid
+rg = acoular.RectGrid( x_min=-0.2, x_max=0.2, y_min=-0.2, y_max=0.2, z=0.3, \
+increment=0.01 )
+# set up steering vector, implicitely contains also the standard quiescent 
+# environment with standard speed of sound
+st = acoular.SteeringVector( grid = rg, mics=mg )
+# set up the object managing the delay & sum beamformer
+bb = acoular.BeamformerBase( freq_data=ps, steer=st )
+# request the result in the 8kHz third octave band from approriate FFT-Lines
+# this starts the actual computation (data intake, FFT, Welch CSM, beamforming)
+pm = bb.synthetic( 8000, 3 )
+# compute the sound pressure level
+Lm = acoular.L_p( pm )
+# plot the map
+imshow( Lm.T, origin='lower', vmin=Lm.max()-10, extent=rg.extend(), \
+interpolation='bicubic')
+colorbar()
+```
+
+![result](./docs/source/get_started/three_source_py3_colormap.png)

acoular-24.3/README.md

@@ -0,0 +1,108 @@
+![Acoular Logo](./docs/source/_static/Acoular_logo.png)
+
+[![PyPI](https://img.shields.io/pypi/pyversions/acoular.svg)](https://pypi.org/project/acoular)
+[![PyPI](https://img.shields.io/pypi/v/acoular.svg)](https://pypi.org/project/acoular)
+[![Github](https://github.com/acoular/acoular/actions/workflows/python-package.yml/badge.svg)](https://github.com/acoular/acoular/actions/workflows/python-package.yml)
+
+# Acoular
+Acoular is a Python module for acoustic beamforming that is distributed under the new BSD license. 
+
+It is aimed at applications in acoustic testing. Multichannel data recorded by a microphone array can be processed and analyzed in order to generate mappings of sound source distributions. The maps (acoustic photographs) can then be used to locate sources of interest and to characterize them using their spectra. 
+
+# Features
+- frequency domain beamforming algorithms: delay & sum, Capon (adaptive), MUSIC, functional beamforming, eigenvalue beamforming
+- frequency domain deconvolution algorithms: DAMAS, DAMAS+, Clean, CleanSC, orthogonal deconvolution
+- frequency domain inverse methods: CMF (covariance matrix fitting), general inverse beamforming, SODIX
+- time domain methods: delay & sum beamforming, CleanT deconvolution
+- time domain methods applicable for moving source with arbitrary trajectory (linear, circular, arbitrarily 3D curved), 
+- frequency domain methods for rotating sources via virtual array rotation for arbitrary arrays and with different interpolation techniques
+- 1D, 2D and 3D mapping grids for all methods
+- gridless option for orthogonal deconvolution
+- four different built-in steering vector formulations
+- arbitrary stationary background flow can be considered for all methods
+- efficient cross spectral matrix computation
+- flexible modular time domain processing: n-th octave band filters, fast, slow, and impulse weighting, A-, C-, and Z-weighting, filter bank, zero delay filters
+- time domain simulation of array microphone signals from fixed and arbitrarily moving sources in arbitrary flow
+- fully object-oriented interface
+- lazy evaluation: while processing blocks are set up at any time, (expensive) computations are only performed when needed
+- intelligent and transparent caching: computed results are automatically saved and loaded on the next run to avoid unnecessary re-computation
+- parallel (multithreaded) implementation with Numba for most algorithms
+- easily extendable with new algorithms
+
+# License
+Acoular is licensed under the BSD 3-clause. See [LICENSE](LICENSE)
+
+# Citing
+
+If you use Acoular for academic work, please consider citing our
+[publication](https://doi.org/10.1016/j.apacoust.2016.09.015):
+
+    Ennes Sarradj, Gert Herold,
+    A Python framework for microphone array data processing,
+    Applied Acoustics, Volume 116, 2017, Pages 50-58
+
+# Dependencies
+Acoular runs under Linux, Windows and MacOS and needs Numpy, Scipy, Traits, scikit-learn, pytables, Numba packages available. 
+Matplotlib is needed for some of the examples.
+
+If you want to use input from a soundcard hardware, you will also need to install the [sounddevice](https://python-sounddevice.readthedocs.io/en/0.3.12/installation.html) package. Some solvers for the CMF method need [Pylops](https://pylops.readthedocs.io/en/stable/installation.html).
+
+# Installation
+
+Acoular can be installed via [conda](https://docs.conda.io/en/latest/), which is also part of the [Anaconda Python distribution](https://www.anaconda.com/). It is recommended to install into a dedicated [conda environment](https://docs.conda.io/projects/conda/en/latest/user-guide/tasks/manage-environments.html). After activating this environment, run
+
+    conda install -c acoular acoular
+
+This will install Acoular in your Anaconda Python enviroment and make the Acoular library available from Python. In addition, this will install all dependencies (those other packages mentioned above) if they are not already present on your system. 
+
+A second option is to install Acoular via [pip](https://pip.pypa.io/en/stable/). It is recommended to use a dedicated [virtual environment](https://virtualenv.pypa.io/en/latest/) and then run
+
+    pip install acoular
+
+For more detailed install instructions see the [documentation](http://acoular.org/install/index.html).
+
+# Documentation and help
+Documentation is available [here](http://acoular.org) with a
+[getting started](http://acoular.org/get_started/index.html) section and
+[examples](http://acoular.org/examples/index.html).
+
+The Acoular [blog](https://acoular.github.io/blog/) contains some tutorials.
+
+Problems, suggestions and success using Acoular may be reported via the [acoular-users](https://groups.google.com/forum/#!forum/acoular-users) discussion forum.
+
+# Example
+This reads data from 64 microphone channels and computes a beamforming map for the 8kHz third octave band:
+
+```python
+from os import path
+import acoular
+from matplotlib.pylab import figure, plot, axis, imshow, colorbar, show
+
+# this file contains the microphone coordinates
+micgeofile = path.join(path.split(acoular.__file__)[0],'xml','array_64.xml')
+# set up object managing the microphone coordinates
+mg = acoular.MicGeom( from_file=micgeofile )
+# set up object managing the microphone array data (usually from measurement)
+ts = acoular.TimeSamples( name='three_sources.h5' )
+# set up object managing the cross spectral matrix computation
+ps = acoular.PowerSpectra( time_data=ts, block_size=128, window='Hanning' )
+# set up object managing the mapping grid
+rg = acoular.RectGrid( x_min=-0.2, x_max=0.2, y_min=-0.2, y_max=0.2, z=0.3, \
+increment=0.01 )
+# set up steering vector, implicitely contains also the standard quiescent 
+# environment with standard speed of sound
+st = acoular.SteeringVector( grid = rg, mics=mg )
+# set up the object managing the delay & sum beamformer
+bb = acoular.BeamformerBase( freq_data=ps, steer=st )
+# request the result in the 8kHz third octave band from approriate FFT-Lines
+# this starts the actual computation (data intake, FFT, Welch CSM, beamforming)
+pm = bb.synthetic( 8000, 3 )
+# compute the sound pressure level
+Lm = acoular.L_p( pm )
+# plot the map
+imshow( Lm.T, origin='lower', vmin=Lm.max()-10, extent=rg.extend(), \
+interpolation='bicubic')
+colorbar()
+```
+
+![result](./docs/source/get_started/three_source_py3_colormap.png)

{acoular-23.6 → acoular-24.3}/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-23.6 → acoular-24.3}/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-23.6 → acoular-24.3}/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