Skip to content

Add changes necessary to build and run with deleted files.

Timothy Davies requested to merge tdv-fix-2-1-build into tdv-delete-bank-gen-and-defunct-kernel

This MR amends 2.1 with changes from the overall Py3 branch to work with the deleted files.

It turned out to be more changes than I'd expected, so there's some overlap with other review items.

Changes

This includes:

  • Add some deleted functions from spiirbank/spiir_utils.py to a new file, pipemodules/spiir_utils.py.
    • Compared to the Py3 version, this file needed some imports to be changed.
  • Remove references to 'spiir/spiir.h' and 'cuda_iirbank' from cuda_plugin.c (which defines our custom gstreamer elements).
  • Removes an old function mkBuildBossSPIIR from spiirparts.py, which was related to bankgen.
  • Adds/Removes references to new/deleted files in configure.ac and some makefile.
  • Updates imports for any files using spiir_utils.

Tests

I've built successfully, and completed a 2 hour injection test. I've compared the 'zerolag' files it produced to a run on spiir-O4b-review, and the results are identical.

O4b-vs-2-1.log

Run with configs: 2-1-config.txt

O4b-config.txt

Edited by Timothy Davies

Merge request reports