Skip to content

Commit

Permalink
Merge pull request #103 from acoustic-warfare/rewriteawpu2
Browse files Browse the repository at this point in the history 
Rewriteawpu2
  • Loading branch information
@tuvabjornberg
tuvabjornberg authored Aug 1, 2024
2 parents 0858a87 + 4ffd2eb commit 3cc84dd
Show file tree
Hide file tree
Showing 61 changed files with 579 additions and 1,720 deletions.
281 changes: 12 additions & 269 deletions CMakeLists.txt
View file
Original file line number Diff line number Diff line change
@@ -1,280 +1,23 @@
cmake_minimum_required(VERSION 3.10.1)
project(beamformer VERSION 1.0.1)


# Optimizations
if (NOT CMAKE_BUILD_TYPE)
set(CMAKE_BUILD_TYPE Release)
endif ()

IF (NOT PYTHON)
find_program(PYTHON "python3")
ENDIF ()

set(EXTENDED_OPTIMIZATIONS "-fno-signaling-nans -fcx-limited-range -fno-math-errno -funsafe-math-optimizations -fassociative-math -freciprocal-math -ffinite-math-only -fno-signed-zeros -fno-trapping-math -frounding-math -fsingle-precision-constant -fcx-fortran-rules")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native -mavx2 -Ofast -save-temps -fverbose-asm -ffloat-store -ffast-math -fno-rounding-math")

set(CMAKE_CXX_FLAGS_ASM "-S")
project(beamforming-lk VERSION 1.0.1)

set(CMAKE_CXX_STANDARD 20)
set(CMAKE_CXX_STANDARD_REQUIRED ON)

set(CMAKE_BUILD_DIR "${CMAKE_CURRENT_SOURCE_DIR}/build")


# ---- Configuration ----
set(CONFIG_FILE ${CMAKE_CURRENT_SOURCE_DIR}/config.yaml)
set(CONFIG_MAKER "${CMAKE_CURRENT_SOURCE_DIR}/scripts/config_maker.py")

add_custom_command(
DEPENDS ${CONFIG_FILE}

# Generate Cython module/src/config.pxd
COMMAND ${PYTHON} ${CONFIG_MAKER} ${CONFIG_FILE} ${CMAKE_CURRENT_SOURCE_DIR}/module/src --cython
OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/module/src/config.pxd

# Generate Python build/config.py
COMMAND ${PYTHON} ${CONFIG_MAKER} ${CONFIG_FILE} ${CMAKE_CURRENT_BINARY_DIR} --python
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/config.py

OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/module/config.py
COMMAND ${CMAKE_COMMAND} -E copy
${CMAKE_CURRENT_BINARY_DIR}/config.py
${CMAKE_CURRENT_SOURCE_DIR}/module/config.py

# Required by module
COMMAND ${CMAKE_COMMAND} -E touch ${CMAKE_CURRENT_BINARY_DIR}/__init__.py

# Generate C/C++ config.h
COMMAND ${PYTHON} ${CONFIG_MAKER} ${CONFIG_FILE} ${CMAKE_CURRENT_SOURCE_DIR}/src --c
OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/src/config.h
)

set(CONFIGURATIONS
${CONFIG_FILE}
${CMAKE_CURRENT_BINARY_DIR}/config.py
${CMAKE_CURRENT_SOURCE_DIR}/src/config.h
${CMAKE_CURRENT_SOURCE_DIR}/module/src/config.pxd
)

add_custom_target(config DEPENDS ${CONFIGURATIONS})


# ---- Cython module ----
set(CMAKE_MODULE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/module")
set(SETUP_PY_IN "${CMAKE_MODULE_DIR}/setup.py.in")
set(SETUP_PY "${CMAKE_MODULE_DIR}/setup.py")
set(PY_OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/build/pytimestamp")


#configure_file(
# ${SETUP_PY_IN}
# ${SETUP_PY}
#)

# Define the Python virtual environment directory
set(PYTHON_VENV_DIR "${CMAKE_MODULE_DIR}/venv")

# Define the command to create the virtual environment
set(CREATE_VENV_COMMAND "${PYTHON}" -m venv "${PYTHON_VENV_DIR}")

# Define the commands to install dependencies inside the virtual environment
set(INSTALL_DEPENDENCIES_COMMAND
"${PYTHON_VENV_DIR}/bin/pip" install -r ${CMAKE_MODULE_DIR}/requirements.txt
COMMENT "Done installing "
)

set(PYTHON "${PYTHON_VENV_DIR}/bin/python")

# Define a custom target to create the virtual environment and install dependencies
add_custom_command(
OUTPUT ${PYTHON_VENV_DIR}
COMMAND ${CREATE_VENV_COMMAND}
COMMAND ${INSTALL_DEPENDENCIES_COMMAND}
COMMENT "Creating Python virtual environment and installing dependencies"
WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"
)

set(MODULE_SOURCES
${CMAKE_MODULE_DIR}/src/config.pxd
${CMAKE_MODULE_DIR}/src/antenna.pyx
${CMAKE_MODULE_DIR}/src/antenna.pxd
${CMAKE_MODULE_DIR}/src/eigen.pxd
${CMAKE_MODULE_DIR}/src/pipeline.pyx
${CMAKE_MODULE_DIR}/src/pipeline.pxd
)


add_custom_command(DEPENDS ${PYTHON_VENV_DIR} ${MODULE_SOURCES}
OUTPUT "${PY_OUTPUT}"

# Build modules
COMMENT "Starting build"
COMMAND ${PYTHON} ${SETUP_PY} build_ext

# Generate timestamp
COMMAND ${CMAKE_COMMAND} -E touch ${PY_OUTPUT}
)


add_custom_target(module DEPENDS ${PY_OUTPUT})


# ---- Program ----
# Find packages
find_package(Doxygen)

# Matrix operations
find_package(Eigen3 REQUIRED)

# MQTT Communication
find_package(WaraPSClient REQUIRED)

# Generating UUID:s
find_package(Boost REQUIRED)


# Find OpenCV package
find_package(OpenCV REQUIRED)

# Portaudio
find_library(portaudio
portaudio
REQUIRED
)

# MP3 Lame
find_library(LAME_LIB mp3lame REQUIRED)

# SndFiles Wav
find_package(PkgConfig QUIET)
if(PKG_CONFIG_FOUND)
pkg_check_modules(LIBSNDFILE_PKGCONF sndfile)
endif(PKG_CONFIG_FOUND)

## Include dir
find_path(LIBSNDFILE_INCLUDE_DIR
NAMES sndfile.h
PATHS ${LIBSNDFILE_PKGCONF_INCLUDE_DIRS}
)

## Library
find_library(LIBSNDFILE_LIBRARY
NAMES sndfile libsndfile-1
PATHS ${LIBSNDFILE_PKGCONF_LIBRARY_DIRS}
)

find_package(PackageHandleStandardArgs)
find_package_handle_standard_args(LibSndFile DEFAULT_MSG LIBSNDFILE_LIBRARY LIBSNDFILE_INCLUDE_DIR)

if(LIBSNDFILE_FOUND)
set(LIBSNDFILE_LIBRARIES ${LIBSNDFILE_LIBRARY})
set(LIBSNDFILE_INCLUDE_DIRS ${LIBSNDFILE_INCLUDE_DIR})
endif(LIBSNDFILE_FOUND)

mark_as_advanced(LIBSNDFILE_LIBRARY LIBSNDFILE_LIBRARIES LIBSNDFILE_INCLUDE_DIR LIBSNDFILE_INCLUDE_DIRS)

include(FindPkgConfig)
pkg_search_module(SndFile REQUIRED sndfile)

find_library(libgps
gps
REQUIRED
)

# Include directories for OpenCV
include_directories(${OpenCV_INCLUDE_DIRS})

# Include directories for SndFile
include_directories(${SndFile_INCLUDE_DIRS})

set(SOURCES
${CMAKE_CURRENT_SOURCE_DIR}/src/receiver.cpp
${CMAKE_CURRENT_SOURCE_DIR}/src/antenna.cpp
${CMAKE_CURRENT_SOURCE_DIR}/src/pipeline.cpp
${CMAKE_CURRENT_SOURCE_DIR}/src/main.cpp
${CMAKE_CURRENT_SOURCE_DIR}/src/delay.cpp
${CMAKE_CURRENT_SOURCE_DIR}/src/options.h
${CMAKE_CURRENT_SOURCE_DIR}/src/algorithms/pso_seeker.cpp
${CMAKE_CURRENT_SOURCE_DIR}/src/algorithms/gradient_ascend.cpp
${CMAKE_CURRENT_SOURCE_DIR}/src/algorithms/mimo.cpp
${CMAKE_CURRENT_SOURCE_DIR}/src/awpu.cpp
${CMAKE_CURRENT_SOURCE_DIR}/src/geometry.cpp
${CMAKE_CURRENT_SOURCE_DIR}/src/audio/audio_wrapper.cpp
${CMAKE_CURRENT_SOURCE_DIR}/src/aw_control_unit.cpp
${CMAKE_CURRENT_SOURCE_DIR}/src/algorithms/triangulate.cpp
${CMAKE_CURRENT_SOURCE_DIR}/src/algorithms/algorithms_common.cpp
${CMAKE_CURRENT_SOURCE_DIR}/src/TargetHandler/target_handler.cpp
)


# Main program
add_executable(beamformer
${CMAKE_CURRENT_SOURCE_DIR}/src/config.h
${SOURCES}
)

# Linking
target_link_libraries(beamformer
Eigen3::Eigen
${OpenCV_LIBS}
portaudio
gps
WaraPSClient::WaraPSClient
mp3lame
${LIBSNDFILE_LIBRARIES}
)

target_include_directories(beamformer PUBLIC ${Boost_INCLUDE_DIRS})


add_executable(awpu
${CMAKE_CURRENT_SOURCE_DIR}/src/config.h
${CMAKE_CURRENT_SOURCE_DIR}/src/receiver.cpp
${CMAKE_CURRENT_SOURCE_DIR}/src/antenna.cpp
${CMAKE_CURRENT_SOURCE_DIR}/src/pipeline.cpp
${CMAKE_CURRENT_SOURCE_DIR}/src/delay.cpp
${CMAKE_CURRENT_SOURCE_DIR}/src/options.h
${CMAKE_CURRENT_SOURCE_DIR}/src/algorithms/pso_seeker.cpp
${CMAKE_CURRENT_SOURCE_DIR}/src/algorithms/gradient_ascend.cpp
${CMAKE_CURRENT_SOURCE_DIR}/src/algorithms/algorithms_common.cpp
${CMAKE_CURRENT_SOURCE_DIR}/src/algorithms/mimo.cpp
${CMAKE_CURRENT_SOURCE_DIR}/src/audio/audio_wrapper.cpp
${CMAKE_CURRENT_SOURCE_DIR}/src/awpu.cpp
${CMAKE_CURRENT_SOURCE_DIR}/src/awpu_main.cpp
${CMAKE_CURRENT_SOURCE_DIR}/src/geometry.cpp
)

# Linking
target_link_libraries(awpu
Eigen3::Eigen
${OpenCV_LIBS}
portaudio
mp3lame
${LIBSNDFILE_LIBRARIES}
)

# Add a custom target to generate assembly code for delay.cpp
add_custom_target(assembly
COMMAND ${CMAKE_CXX_COMPILER} -S -fverbose-asm ${CMAKE_CURRENT_SOURCE_DIR}/src/delay.cpp -o ${CMAKE_BINARY_DIR}/delay.s
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/src/delay.cpp
)


add_dependencies(beamformer config)

add_custom_target(test.udp
COMMAND echo "Generating fake stream to localhost"
COMMAND udpreplay -i lo ${CMAKE_CURRENT_SOURCE_DIR}/udp/converted/test.pcap
)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native -mavx2 -Ofast -save-temps -fverbose-asm -ffloat-store -ffast-math -fno-rounding-math")

# Testbench
add_custom_target(test
COMMAND ${PYTHON} -m unittest discover -s ${CMAKE_CURRENT_SOURCE_DIR} -vv

)
set(SOURCES)

# Documentation
add_custom_target(doc
COMMAND doxygen ${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile
)

add_subdirectory(src/geometry)
add_subdirectory(src/fpga)
add_subdirectory(src/dsp)
add_subdirectory(src/audio)
add_subdirectory(src/aw_processing_unit)
add_subdirectory(src/algorithms)
add_subdirectory(src/target_handler)
add_subdirectory(src/aw_control_unit)
2 changes: 1 addition & 1 deletion Doxyfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -864,7 +864,7 @@ WARN_LOGFILE =
# spaces. See also FILE_PATTERNS and EXTENSION_MAPPING
# Note: If this tag is empty the current directory is searched.

INPUT = ../udp ../src ../boot ../README.md
INPUT = ../src ../README.md #../udp ../boot

# This tag can be used to specify the character encoding of the source files
# that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses
Expand Down
Loading

0 comments on commit 3cc84dd

Please sign in to comment.