Compare commits

..

5 Commits

Author SHA1 Message Date
17319c4925 Possible bugfix for pyinstaller
Some checks failed
Building, testing and releasing LASP if it has a tag / Release-Ubuntu (push) Has been skipped
Building, testing and releasing LASP if it has a tag / Build-Test-Ubuntu (push) Failing after 2m7s
2023-10-24 20:56:07 +02:00
a7b219a1e1 Updated readme
All checks were successful
Building, testing and releasing LASP if it has a tag / Build-Test-Ubuntu (push) Successful in 2m55s
Building, testing and releasing LASP if it has a tag / Release-Ubuntu (push) Has been skipped
2023-10-24 19:49:56 +02:00
e4f887dc5b Renamed test_input.py to example_input.py
Some checks reported warnings
Building, testing and releasing LASP if it has a tag / Build-Test-Ubuntu (push) Has been cancelled
Building, testing and releasing LASP if it has a tag / Release-Ubuntu (push) Has been cancelled
2023-10-24 19:47:35 +02:00
ee7e5fbba9 Added test_input.py
Some checks failed
Building, testing and releasing LASP if it has a tag / Build-Test-Ubuntu (push) Failing after 2m13s
Building, testing and releasing LASP if it has a tag / Release-Ubuntu (push) Has been skipped
2023-10-24 15:14:37 +02:00
bfa6704360 New armadillo version, some updates in pyproject and README
All checks were successful
Building, testing and releasing LASP if it has a tag / Build-Test-Ubuntu (push) Successful in 2m12s
Building, testing and releasing LASP if it has a tag / Release-Ubuntu (push) Has been skipped
2023-10-24 15:13:06 +02:00
5 changed files with 41 additions and 45 deletions

4
.gitignore vendored
View File

@ -6,9 +6,6 @@
.ninja* .ninja*
build.ninja build.ninja
dist dist
src/lasp.egg-info
test/.ipynb_checkpoints
src/lasp/lasp_config.h
_deps _deps
compile_commands.json compile_commands.json
CMakeFiles CMakeFiles
@ -23,3 +20,4 @@ doc
acme_log.log acme_log.log
.venv .venv
.py-build-cmake_cache .py-build-cmake_cache
cpp_src/lasp_config.h

View File

@ -1,8 +1,5 @@
# Library for Acoustic Signal Processing # Library for Acoustic Signal Processing
- Master branch: [![Build Status](https://drone.ascee.nl/api/badges/ASCEE/lasp/status.svg?ref=refs/heads/master)](https://drone.ascee.nl/ASCEE/lasp)
- Develop branch: [![Build Status](https://drone.ascee.nl/api/badges/ASCEE/lasp/status.svg?ref=refs/heads/develop)](https://drone.ascee.nl/ASCEE/lasp)
Welcome to LASP: Library for Acoustic Signal Processing. LASP is a C++ library Welcome to LASP: Library for Acoustic Signal Processing. LASP is a C++ library
with a Python interface which is supposed to acquire and process (multi) sensor data in real time on a PC and output results. with a Python interface which is supposed to acquire and process (multi) sensor data in real time on a PC and output results.
@ -46,41 +43,48 @@ in a sister repository [lasp-doc](https://code.ascee.nl/ascee/lasp-doc).
If you have any question(s), please feel free to contact us: [email](info@ascee.nl). If you have any question(s), please feel free to contact us: [email](info@ascee.nl).
# Installation - Linux (Debian-based) # Installation - Linux (Ubuntu-based)
## Dependencies ## From wheel (recommended for non-developers)
One-liner: ### Prerequisites
- `$ sudo apt install python3-pybind11 libopenblas-dev python3-pip python3-scipy libusb-1.0-0-dev libpulse-dev cmake-curses-gui python3-h5py python3-dataclasses-json python3-matplotlib python3-appdirs` Run the following on the command line to install all prerequisites on
Debian-based Linux:
- `sudo apt install python3-pip libfftw3-3 libopenblas-base libusb-1.0-0
libpulse0`
### Download and install LASP
Go to: [LASP releases](https://code.ascee.nl/ASCEE/lasp/releases/latest/) and
download the latest `.whl`. Then run:
- `pip install lasp-*-linux_x86_64.whl`
## From source (Ubuntu-based)
### Prerequisites
Run the following one-liner:
- `sudo apt install -y git python3 python3-virtualenv python3-venv libopenblas-dev python3-pip libfftw3-dev libusb-1.0-0-dev libpulse-dev python3-build`
If building RtAudio with the ALSA backend, you will also require the following packages: If building RtAudio with the ALSA backend, you will also require the following packages:
- libclalsadrv-dev - `sudo apt install libclalsadrv-dev`
If building RtAudio with the Jack Audio Connection Kit (JACK) backend, you will also require the following packages: If building RtAudio with the Jack Audio Connection Kit (JACK) backend, you will also require the following packages:
- libjack-jackd2-dev - `sudo apt install libjack-jackd2-dev`
## Download & build ### Download & build
- `$ git clone --recursive https://code.ascee.nl/ASCEE/lasp.git` - `$ git clone --recursive https://code.ascee.nl/ASCEE/lasp.git`
- `$ cd lasp` - `$ cd lasp`
- `pip install -e .`
For a release build: # Installation - (x86_64) Windows (with WinPython), build with MSYS2 (NOT YET UPDATED!!)
- `$ cmake .`
or optionally for a custom build:
- `$ ccmake .`
Configure and run:
- `$ make -j`
# Installation - (x86_64) Windows (with WinPython), build with MSYS2
## Prerequisites ## Prerequisites
@ -113,7 +117,11 @@ Configure and run:
# Documentation # Documentation
In directory: ## Online
[Online LASP documentation](https://lasp.ascee.nl/).
## In directory
`$ sudo apt install doxygen graphviz` `$ sudo apt install doxygen graphviz`
`$ pip install doxypypy` `$ pip install doxypypy`
@ -126,21 +134,7 @@ This will build the documentation. It can be read by:
`$ <YOUR-BROWSER> doc/html/index.html` `$ <YOUR-BROWSER> doc/html/index.html`
Or via docker: # Usage
`$ docker build -t lasp_ascee_nl:latest .`
## Install
For an editable install (while developing):
- `$ pip3 install --prefix=$HOME/.local -e .`
To install locally, for a fixed version:
- `$ pip3 install --prefix=$HOME/.local`
## Usage
- See examples directories for IPython notebooks. - See examples directories for IPython notebooks.
- Please refer to the [documentation](https://lasp.ascee.nl/) for features. - Please refer to the [documentation](https://lasp.ascee.nl/) for features.

View File

@ -22,8 +22,8 @@ classifiers = [
] ]
urls = { "Documentation" = "https://lasp.ascee.nl" } urls = { "Documentation" = "https://lasp.ascee.nl" }
dependencies = ["scipy", "numpy", "matplotlib>=3.7.2", "appdirs", "dataclasses_json", dependencies = ["scipy", "numpy", "matplotlib>=3.7.2", "appdirs",
"h5py", "pybind11"] "dataclasses_json", "h5py"]
[build-system] # How pip and other frontends should build this project [build-system] # How pip and other frontends should build this project
requires = ["py-build-cmake~=0.1.8", "pybind11" ] requires = ["py-build-cmake~=0.1.8", "pybind11" ]

View File

@ -3,6 +3,10 @@ LASP: Library for Acoustic Signal Processing
""" """
# Error with dbm in Pyinstaller
# https://stackoverflow.com/questions/45670104/how-to-fix-the-no-dbm-clone-found-error-in-pyinstaller
import dbm.dump
from .lasp_version import __version__ from .lasp_version import __version__
from .lasp_common import * from .lasp_common import *

@ -1 +1 @@
Subproject commit 3865a0520d577ac293d88c4fd726a41bda949869 Subproject commit b6e810f2d33bcc234d67db5277d027949fec82f8