Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

NMFClient: Add resynth mode to de-magic interface #133

Merged
merged 1 commit into from
May 3, 2022

Conversation

weefuzzy
Copy link
Member

In anticipation of the buffer management PR, this changes the interface of NMF to add a resynthMode signalling whether or not resynthesis should occur. Whilst it introduces verbosity, it reduces the amount of magic in the object.

Also now allow resynth from fixed bases + activations (which, e.g., allows post processing analysis results and then resynthesizing components).

Finally, diagnostic messages are updated to use the same terminology as the interface.

There will be an accompanying PR for SC

Also allow resynth from fixed bases + activations
@weefuzzy
Copy link
Member Author

SC PR at flucoma/flucoma-sc#94

@jamesb93
Copy link
Member

I didn't fully realise how cool this could be with the new resynth options! Testing coming...

@jamesb93
Copy link
Member

jamesb93 commented May 2, 2022

First thing I've noticed is that the default resynthMode is not the old behaviour. My is that it's going to get frustrating constantly changing that attribute when the common usage is to get some resynth from a source buffer given some components.

@weefuzzy
Copy link
Member Author

weefuzzy commented May 2, 2022

Don't know how you could recreate the old behaviour. Either it's different when the resynth buffer is present and the flag is 0, or it's different when it isn't present and the flag is 1.

@jamesb93
Copy link
Member

jamesb93 commented May 2, 2022

Also now allow resynth from fixed bases + activations (which, e.g., allows post processing analysis results and then resynthesizing components).

I was experimenting with something like this. It's not particularly useful (though I anticipate some more refined patching might lead somewhere) but it proves that it works.

image

@jamesb93
Copy link
Member

jamesb93 commented May 2, 2022

Don't know how you could recreate the old behaviour. Either it's different when the resynth buffer is present and the flag is 0, or it's different when it isn't present and the flag is 1.

I guess I just misunderstand the attribute then.

@weefuzzy
Copy link
Member Author

weefuzzy commented May 2, 2022

I guess I just misunderstand the attribute then.

It means 'should I try and resynthesize' (at which point the resynth buffer will actually be checked to see if anything is assigned, and whether it's actually a buffer etc)

@jamesb93
Copy link
Member

jamesb93 commented May 2, 2022

In that case, is it not the case that the default behaviour was mode 1?

@weefuzzy
Copy link
Member Author

weefuzzy commented May 2, 2022

No, because it depended on whether resynth was assigned. If it was, then this is the equivalent of resynthMode 1 but otherwise, it would be the equivalent of resynthMode 0. There's no way of perfectly replicating that now. The issue being that, with the buffer managment PR, if resynth isn't assigned by the user, it will be assigned by the the wrapper so we need some way of being able to not resynthesise.

i.e.
[fluid.bufnmf~ @bases bar @activations foobar] used to implicitly mean don't resynthesize. But now (with the PR), @resynth would be internally given a managed buffer~ u127373744 or whatever, so would unconditionally resynthesise.

@jamesb93
Copy link
Member

jamesb93 commented May 2, 2022

if resynth isn't assigned by the user, it will be assigned by the the wrapper so we need some way of being able to not resynthesise.

Right! This makes sense to me now.

@weefuzzy weefuzzy merged commit 70d8aa1 into flucoma:dev May 3, 2022
@weefuzzy weefuzzy deleted the enhance/nmf-interface branch May 3, 2022 13:38
jamesb93 added a commit that referenced this pull request Jun 14, 2022
* Add pointwise inversion to PCA

* batchsize was not capped down, leading to hilarious crashes (#63)

* updating credits with the new team

* Include SHAs for flucoma-core and current project in version string

* Conform version string with SHAs to semantic versioning spec

* add chroma feature to NoveltySlice

* Toggle BLAS settings for compiling on APPLE (#67)

* disable blas for compiling on macos

* remove line according to O's suggestion

* error in the client of (buf)noveltyslice since introducing chroma as feature

* Enhance/versioning (#75)

* Remove old header template

* Add in TU template and declaration header

* update CMake to new version scheme

* Get SHA from top level source folder

* ensure git is found

* fix issue #23 - zeroing the output vector in the mTracker loop (#82)

* fix issue #23 - zeroing the output vector in the mTracker loop

* now really corrected thanks to @weefuzzy

* Initial unit tests for `include/data` (#83)

* initial FluidTensor tests

* add assert death test to cmake

* more assert death

* fix compile tests

* Working assertion tests, it seems

* Add first FluidTensorView tests

* tidy up cmake a bit

* factor out EqualRange matcher to own header

* Add FluidTensorSupport tests

* rollback to Catch2 

for compatability with approvaltests.cpp

* add tests for FluidDataSet

bubba's first approval test ✨

* test print for bigger range as well

* tidy cmake

* make building tests optional

* remove spurious files from tracking

* add workflow for CI

* make workflow manually triggerable

* correct workflow file extention

* pleading and bargaining with github

* getting event name right

* FluidTensorSlice: fix terrible and aged typename mistake

* workflow: try and cache whole build folder

* wotkflow: unbreak yaml

* workflow: disable fail-fast

* Amend upper frequency limit of mel bands in NoveltySlice to 20kHz

* [Enhance] FluCoMa-wide DataSets as a resource (#88)

* treat wav files as binary

* move audio files to resources folder

* add datasets

* add pre-trained neural networks

* add flucoma corpus

* move datasets to data

* BufAudioTransport now has A-B based arguments

* fix mistakenly fixed type signature in FluidSink

* Tests for framing and overlap add bits

* remove build folder caching as a bad job 

(failing forever once cache goes bad)

* Test/sc ports/slicers (#91)

* Working port of SC NoveltySlice tests

* formatting and constifying

* use generated path for test signal loading

* update testsignals header and cmake

* Add TestOnsetSegmention, update TestNoveltySeg for new resource loading

* Add Onsets and update novelty in CMake

* Add EnvelopeSeg tests and some missing headers

* Add EnvelopeGate tests

* Add TransientSlice tests

* update location of audio files

* add missing function to signals.cpp.in

* Fix test signal for AmpSlice test

* try and speed up test run

* FluidSource test blackholed on MSVC

It doesn't like GENERATE_REF nested in GENERATE. Nosir.

* ignore all build folders for a quieter life

* bump Eigen version (#93)

* bump Eigen version

* note new Eigen version in readme

* add mammoth dataset

* OnsetSlice and NoveltySlice clients: fix block size dependency (#96)

Makes tracking of `frameOffset` stateful across calls to `process` so that odd hop sizes are handled correctly

* Use `operator<<=` for copy to / from FluidTensorView

* update all instances of FluidTensorView copying

* Signals.cpp.in fix lingering copy assignment

* Add conventional, shallow copy / move assignment to FluidTensorView

* `SliceIterator::end()` fix (#97)

* fix problem with 0-size slices and end() sentinels

* adds basic test for slice ietrator fix

* annotate datasets

* add mfcc for fluid_corpus

* update mfcc dataset

* bump version to beta5 (#101)

* Add pointwise inversion to PCA

* Enhance `ParameterSet` (#103)

* Meta: Add HO function to apply function only to select indicies of a tuple

* ParameterSet: Easier application of functions by type with lambdas + discovering the count of params by type

* BufStats: Weights should be an input buffer

* [Fix] Make error language more consistent (#118)

* replace incorrect use of label where identifier is intended

* dont shorten identifier to id

* rename DuplicateLabel to DuplicateIdentifier

* Enhance/slicer detection curves (#114)

* EnvelopeSegmentation: refactor into feature curve + detector

* NoveltySegementation: refactor into feature curve + detector

* OnsetSegmentation: refactor into feature curve + detector

* Add OnsetFeatureClient

* Add NoveltyFeatureClient

* Add AmpFeatureClient

* correct novelty and onset curves for nrt

* fix longstanding assumption in NRT wrapper that client latency == window size

* Update NoveltyFeatureClient to new analysisSettings method

* remove old FIXME comment

* fix cout call killing test on windows

* Missing update change to OnsetFeatureClient::analysisSettings()

* algorithms: NoveltyCurve -> NoveltyFeature

* Novelty: Update algorihtm class name, and change 'feature' param to algorithm

* Also update names in NovletySegmentation

* BufOnsetFeature correct output buffer name

* Novelty / OnsetFeature - cache descriptor values for when sigvs < hop

* more information on failing test thx

* Enhance/fewer warnings (#85)

* excess semicolons

* unused variables

* type narrowing / signed-unsigned

* integer conversions: new Eigen::Array alias for index rather than int

* json: stop embedding nlohmann library and instead fetch at configure time (#105)

* ParameterDescriptors: make more composable by adding insert function (#107)

* FluidJSON: Avoid some implicit conversion on import that could confuse compiler

* Deal with some warnings

* EnvelopeSegmentation: pass correct params to Envelope

* FluidTensorView deep copy gets distinct operator (#100)

* Add pointwise inversion to PCA

* Use `operator<<=` for copy to / from FluidTensorView

* update all instances of FluidTensorView copying

* Signals.cpp.in fix lingering copy assignment

* Add conventional, shallow copy / move assignment to FluidTensorView

* `SliceIterator::end()` fix (#97)

* fix problem with 0-size slices and end() sentinels

* adds basic test for slice ietrator fix

* annotate datasets

* add mfcc for fluid_corpus

* update mfcc dataset

* bump version to beta5 (#101)

* [Release] 1.0.0-beta5 (#102)

* batchsize was not capped down, leading to hilarious crashes (#63)

* updating credits with the new team

* Include SHAs for flucoma-core and current project in version string

* Conform version string with SHAs to semantic versioning spec

* add chroma feature to NoveltySlice

* Toggle BLAS settings for compiling on APPLE (#67)

* disable blas for compiling on macos

* remove line according to O's suggestion

* error in the client of (buf)noveltyslice since introducing chroma as feature

* Enhance/versioning (#75)

* Remove old header template

* Add in TU template and declaration header

* update CMake to new version scheme

* Get SHA from top level source folder

* ensure git is found

* fix issue #23 - zeroing the output vector in the mTracker loop (#82)

* fix issue #23 - zeroing the output vector in the mTracker loop

* now really corrected thanks to @weefuzzy

* Initial unit tests for `include/data` (#83)

* initial FluidTensor tests

* add assert death test to cmake

* more assert death

* fix compile tests

* Working assertion tests, it seems

* Add first FluidTensorView tests

* tidy up cmake a bit

* factor out EqualRange matcher to own header

* Add FluidTensorSupport tests

* rollback to Catch2 

for compatability with approvaltests.cpp

* add tests for FluidDataSet

bubba's first approval test ✨

* test print for bigger range as well

* tidy cmake

* make building tests optional

* remove spurious files from tracking

* add workflow for CI

* make workflow manually triggerable

* correct workflow file extention

* pleading and bargaining with github

* getting event name right

* FluidTensorSlice: fix terrible and aged typename mistake

* workflow: try and cache whole build folder

* wotkflow: unbreak yaml

* workflow: disable fail-fast

* Amend upper frequency limit of mel bands in NoveltySlice to 20kHz

* [Enhance] FluCoMa-wide DataSets as a resource (#88)

* treat wav files as binary

* move audio files to resources folder

* add datasets

* add pre-trained neural networks

* add flucoma corpus

* move datasets to data

* BufAudioTransport now has A-B based arguments

* fix mistakenly fixed type signature in FluidSink

* Tests for framing and overlap add bits

* remove build folder caching as a bad job 

(failing forever once cache goes bad)

* Test/sc ports/slicers (#91)

* Working port of SC NoveltySlice tests

* formatting and constifying

* use generated path for test signal loading

* update testsignals header and cmake

* Add TestOnsetSegmention, update TestNoveltySeg for new resource loading

* Add Onsets and update novelty in CMake

* Add EnvelopeSeg tests and some missing headers

* Add EnvelopeGate tests

* Add TransientSlice tests

* update location of audio files

* add missing function to signals.cpp.in

* Fix test signal for AmpSlice test

* try and speed up test run

* FluidSource test blackholed on MSVC

It doesn't like GENERATE_REF nested in GENERATE. Nosir.

* ignore all build folders for a quieter life

* bump Eigen version (#93)

* bump Eigen version

* note new Eigen version in readme

* add mammoth dataset

* OnsetSlice and NoveltySlice clients: fix block size dependency (#96)

Makes tracking of `frameOffset` stateful across calls to `process` so that odd hop sizes are handled correctly

* `SliceIterator::end()` fix (#97)

* fix problem with 0-size slices and end() sentinels

* adds basic test for slice ietrator fix

* annotate datasets

* add mfcc for fluid_corpus

* update mfcc dataset

* bump version to beta5 (#101)

Co-authored-by: tremblap <info@pierrealexandretremblay.com>
Co-authored-by: weefuzzy <gungwho@gmail.com>
Co-authored-by: g-roma <gerard.roma@gmail.com>
Co-authored-by: Ted Moore <ted@tedmooremusic.com>

* Add pointwise inversion to PCA

* Enhance `ParameterSet` (#103)

* Meta: Add HO function to apply function only to select indicies of a tuple

* ParameterSet: Easier application of functions by type with lambdas + discovering the count of params by type

* BufStats: Weights should be an input buffer

* [Fix] Make error language more consistent (#118)

* replace incorrect use of label where identifier is intended

* dont shorten identifier to id

* rename DuplicateLabel to DuplicateIdentifier

* Enhance/slicer detection curves (#114)

* EnvelopeSegmentation: refactor into feature curve + detector

* NoveltySegementation: refactor into feature curve + detector

* OnsetSegmentation: refactor into feature curve + detector

* Add OnsetFeatureClient

* Add NoveltyFeatureClient

* Add AmpFeatureClient

* correct novelty and onset curves for nrt

* fix longstanding assumption in NRT wrapper that client latency == window size

* Update NoveltyFeatureClient to new analysisSettings method

* remove old FIXME comment

* fix cout call killing test on windows

* Missing update change to OnsetFeatureClient::analysisSettings()

* algorithms: NoveltyCurve -> NoveltyFeature

* Novelty: Update algorihtm class name, and change 'feature' param to algorithm

* Also update names in NovletySegmentation

* BufOnsetFeature correct output buffer name

* Novelty / OnsetFeature - cache descriptor values for when sigvs < hop

* more information on failing test thx

* [Release] 1.0.0-beta6 (#126)

* Add pointwise inversion to PCA

* batchsize was not capped down, leading to hilarious crashes (#63)

* updating credits with the new team

* Include SHAs for flucoma-core and current project in version string

* Conform version string with SHAs to semantic versioning spec

* add chroma feature to NoveltySlice

* Toggle BLAS settings for compiling on APPLE (#67)

* disable blas for compiling on macos

* remove line according to O's suggestion

* error in the client of (buf)noveltyslice since introducing chroma as feature

* Enhance/versioning (#75)

* Remove old header template

* Add in TU template and declaration header

* update CMake to new version scheme

* Get SHA from top level source folder

* ensure git is found

* fix issue #23 - zeroing the output vector in the mTracker loop (#82)

* fix issue #23 - zeroing the output vector in the mTracker loop

* now really corrected thanks to @weefuzzy

* Initial unit tests for `include/data` (#83)

* initial FluidTensor tests

* add assert death test to cmake

* more assert death

* fix compile tests

* Working assertion tests, it seems

* Add first FluidTensorView tests

* tidy up cmake a bit

* factor out EqualRange matcher to own header

* Add FluidTensorSupport tests

* rollback to Catch2 

for compatability with approvaltests.cpp

* add tests for FluidDataSet

bubba's first approval test ✨

* test print for bigger range as well

* tidy cmake

* make building tests optional

* remove spurious files from tracking

* add workflow for CI

* make workflow manually triggerable

* correct workflow file extention

* pleading and bargaining with github

* getting event name right

* FluidTensorSlice: fix terrible and aged typename mistake

* workflow: try and cache whole build folder

* wotkflow: unbreak yaml

* workflow: disable fail-fast

* Amend upper frequency limit of mel bands in NoveltySlice to 20kHz

* [Enhance] FluCoMa-wide DataSets as a resource (#88)

* treat wav files as binary

* move audio files to resources folder

* add datasets

* add pre-trained neural networks

* add flucoma corpus

* move datasets to data

* BufAudioTransport now has A-B based arguments

* fix mistakenly fixed type signature in FluidSink

* Tests for framing and overlap add bits

* remove build folder caching as a bad job 

(failing forever once cache goes bad)

* Test/sc ports/slicers (#91)

* Working port of SC NoveltySlice tests

* formatting and constifying

* use generated path for test signal loading

* update testsignals header and cmake

* Add TestOnsetSegmention, update TestNoveltySeg for new resource loading

* Add Onsets and update novelty in CMake

* Add EnvelopeSeg tests and some missing headers

* Add EnvelopeGate tests

* Add TransientSlice tests

* update location of audio files

* add missing function to signals.cpp.in

* Fix test signal for AmpSlice test

* try and speed up test run

* FluidSource test blackholed on MSVC

It doesn't like GENERATE_REF nested in GENERATE. Nosir.

* ignore all build folders for a quieter life

* bump Eigen version (#93)

* bump Eigen version

* note new Eigen version in readme

* add mammoth dataset

* OnsetSlice and NoveltySlice clients: fix block size dependency (#96)

Makes tracking of `frameOffset` stateful across calls to `process` so that odd hop sizes are handled correctly

* `SliceIterator::end()` fix (#97)

* fix problem with 0-size slices and end() sentinels

* adds basic test for slice ietrator fix

* annotate datasets

* add mfcc for fluid_corpus

* update mfcc dataset

* bump version to beta5 (#101)

* Add pointwise inversion to PCA

* Enhance `ParameterSet` (#103)

* Meta: Add HO function to apply function only to select indicies of a tuple

* ParameterSet: Easier application of functions by type with lambdas + discovering the count of params by type

* BufStats: Weights should be an input buffer

* [Fix] Make error language more consistent (#118)

* replace incorrect use of label where identifier is intended

* dont shorten identifier to id

* rename DuplicateLabel to DuplicateIdentifier

* Enhance/slicer detection curves (#114)

* EnvelopeSegmentation: refactor into feature curve + detector

* NoveltySegementation: refactor into feature curve + detector

* OnsetSegmentation: refactor into feature curve + detector

* Add OnsetFeatureClient

* Add NoveltyFeatureClient

* Add AmpFeatureClient

* correct novelty and onset curves for nrt

* fix longstanding assumption in NRT wrapper that client latency == window size

* Update NoveltyFeatureClient to new analysisSettings method

* remove old FIXME comment

* fix cout call killing test on windows

* Missing update change to OnsetFeatureClient::analysisSettings()

* algorithms: NoveltyCurve -> NoveltyFeature

* Novelty: Update algorihtm class name, and change 'feature' param to algorithm

* Also update names in NovletySegmentation

* BufOnsetFeature correct output buffer name

* Novelty / OnsetFeature - cache descriptor values for when sigvs < hop

* more information on failing test thx

Co-authored-by: Owen Green <gungwho@gmail.com>
Co-authored-by: tremblap <info@pierrealexandretremblay.com>
Co-authored-by: g-roma <gerard.roma@gmail.com>
Co-authored-by: James Bradbury <me@jamesbradbury.net>
Co-authored-by: Ted Moore <ted@tedmooremusic.com>

* Update FlucomaVersion.cmake

* Enhance/fewer warnings (#85)

* excess semicolons

* unused variables

* type narrowing / signed-unsigned

* integer conversions: new Eigen::Array alias for index rather than int

* json: stop embedding nlohmann library and instead fetch at configure time (#105)

* ParameterDescriptors: make more composable by adding insert function (#107)

* FluidJSON: Avoid some implicit conversion on import that could confuse compiler

* Deal with some warnings

* EnvelopeSegmentation: pass correct params to Envelope

* update with new FluidTensorView copying ops

* Use Windows 2019 in CI

* Parallel tests seem unreliable on windows

Co-authored-by: James Bradbury <me@jamesbradbury.net>
Co-authored-by: tremblap <info@pierrealexandretremblay.com>
Co-authored-by: g-roma <gerard.roma@gmail.com>
Co-authored-by: Ted Moore <ted@tedmooremusic.com>
Co-authored-by: James Bradbury <github@jamesbradbury.net>

* Enhance/const correct(er) dataobjects (#115)

* Const correct arguments for data object messages; actually const object refs for RT usage

* MLP const update

* SharedClient const updates

* workflow: Disable parallel test runner and turn up verbosity

* remove std::cout access from segfaulting test (just in case)

* NoveltySlice: ensure frame offset is reset when win / hop changes

* correcting the long definition for novelty clients

* NoveltySegmentation: Correct order of arguments in constructor

* Assign2D: Make UNASSIGNED constexpr to solve strange linker error

* Assign2D: still needs out-of-class declaration for UNASSIGNED to link reliably

* corrected and augmented the credits/info of Data

* flucoma_corpus_files: typo in the file names

* Sound bank change (#135)

* removed redundant files and added constanzo

* new dataset to load in help files

* saved norm

* BufFlatten: Workaround PD-release builds problem with temporary buffer views

* add pca whitening (#98)

* add pca whitening

* actually add pca whitening

* PCA: add de-whitening to inverseTransformPoint

* PCAClient: update call to inverseTransformPoint

Co-authored-by: weefuzzy <gungwho@gmail.com>

* Enhance/optional message args (#106)

* Add dependency for Sy Brand's `optional` backport

* include optional in MessageSet

add alias (in case we need to switch between `std::` and `tl::`)

* try out optional arg in `KDTreeClient::kNearest`

* compile-time enforce that optional args must follow mandatory ones

* stop tl:optional doing its tests

* PoC: Enhance/choices param (#108)

* Add ChoiceT parameter type

* Add `select` control to `BufStatsClient` to road test `ChoicesParam`

* Choices params: Don't use a set because it breaks ordering

* SpectralShape: Add select param

* add dataset version of inverse PCA (#125)

* add dataset version of inverse PCA

* PCA: Add whitening to batch inverse transform

* Enhance/max params (#132)

* CMake: Centralise C++ version and set to 17

* Introduce long param type with a user-defined maximum + 'primary' params
 – e.g. max coeffs for MFCC)
 - decoupling Max/PD arguments from 'fixed' params
–

* MFCC: Proof of concept for new way of expressing runtime max for certain params

* CMake: Missing C++ version adjustments

* CMake: Another rogue C++ version flag

* Try to get catch to build on OS 12 whilst targetting 10.8

* NMFClient: Add resynth mode to de-magic interface (#133)

Also allow resynth from fixed bases + activations

* All Scalers: Replace `invert` parameter with `inverseTransform` messages

* Stop being too clever in LongRuntimeMaxParam 

(thought I'd already done this...)

* Convert remaining `max<X>` parameters and `maxFFTsize` to new order of things

* SpectralShape: Ensure output channel count responds to select param

* MLPClassifier: Missing const in type alias

* MLP clients: change 'hidden' to 'hiddenlayers'. fixes #143

to work around name clash with special attribute in Max

* [Enhance] ChoicesParam for LoudnessClient and PitchClient (#141)

* update loudness client to have a ChoicesParam

* rename truepeak selection to peak

* replace mMaxOutPutSize with fixed value of 2

* Add / fix select for Loudness and Pitch clients

Harmonize SpectralShape code
Adjust FluidBufLoudness hack in NRT wrapper

* adds a patch to redo the included demo dataset (in pd)

* MaxParams: toughen up

* dealing with scaler range near 0 (#144)

* makes a function that compares the range to 10*lambda - in line with SciKit Learn

* aesthetic include order to be like the other 2 scalers

* NRTWrapper: Fix for multichannel behaviour with @select

* OnsetSliceClient: Reset frame offset when FFT params change, fixes #145

* CMake: Make version data globally available via properties

* CMake: add the big ol list of core clients plus support code

* Add new features to central CMake, plus small improvements and version bump

* CMake: Turn down the volume for FetchContent

* CMake: Get rid of old diagnostic messages

* CMake: quote module path

* CMake: Set module path correctly when there is parent project

* CMake: Debug module path logic

* CMake: Superstitous attempt to fix 403 errors when cloning eigen on CI

* zap typo Maxiumm

* fised typo Magnitdue

* MaxParam: correct initialization order

* RunningStats: change `size` to `history`

* CMake: We need to be able to declare IO properties of clients up front

* MLP* camel case hiddenLayers

* NMFCrossClient: Prevent buffer overrun crashes by ensuring polyphony <= rank

* Chroma: Fix Eigen variable aliasing causing UB

* NMFMorph: avoid crash

if OptimalTransport fails to segment spectrum

* CMake: Enable PIC to make Linux CI happier.

I hope

* BufNNDSVD -> BufNMFSeed (#173)

* change the client name - kept the algo name as it does what it says

* algo name confounded with client name in the code

* change parameter name in client to interpolation (#174)

* Feature/skmeans (#99)

* add pca whitening

* actually add pca whitening

* add spherical kmeans

* actually add spherical kmeans

* SKMeans fixes, change KMeans getDistances to transform

* adding RT query class

* <fit>transform<point> -> <fit>encode<point>

Co-authored-by: tremblap <info@pierrealexandretremblay.com>

* ChoicesT: Correct for faulty use of `static`

fixes #175

* `(S)KMeansClient`: Track `numClusters` and clear if it changes before fitting

fixes #176

* KMeansClient: Work around over agressive optimisation

* bump flucoma version
jamesb93 added a commit that referenced this pull request Jun 24, 2022
* Add pointwise inversion to PCA

* batchsize was not capped down, leading to hilarious crashes (#63)

* updating credits with the new team

* Include SHAs for flucoma-core and current project in version string

* Conform version string with SHAs to semantic versioning spec

* add chroma feature to NoveltySlice

* Toggle BLAS settings for compiling on APPLE (#67)

* disable blas for compiling on macos

* remove line according to O's suggestion

* error in the client of (buf)noveltyslice since introducing chroma as feature

* Enhance/versioning (#75)

* Remove old header template

* Add in TU template and declaration header

* update CMake to new version scheme

* Get SHA from top level source folder

* ensure git is found

* fix issue #23 - zeroing the output vector in the mTracker loop (#82)

* fix issue #23 - zeroing the output vector in the mTracker loop

* now really corrected thanks to @weefuzzy

* Initial unit tests for `include/data` (#83)

* initial FluidTensor tests

* add assert death test to cmake

* more assert death

* fix compile tests

* Working assertion tests, it seems

* Add first FluidTensorView tests

* tidy up cmake a bit

* factor out EqualRange matcher to own header

* Add FluidTensorSupport tests

* rollback to Catch2 

for compatability with approvaltests.cpp

* add tests for FluidDataSet

bubba's first approval test ✨

* test print for bigger range as well

* tidy cmake

* make building tests optional

* remove spurious files from tracking

* add workflow for CI

* make workflow manually triggerable

* correct workflow file extention

* pleading and bargaining with github

* getting event name right

* FluidTensorSlice: fix terrible and aged typename mistake

* workflow: try and cache whole build folder

* wotkflow: unbreak yaml

* workflow: disable fail-fast

* Amend upper frequency limit of mel bands in NoveltySlice to 20kHz

* [Enhance] FluCoMa-wide DataSets as a resource (#88)

* treat wav files as binary

* move audio files to resources folder

* add datasets

* add pre-trained neural networks

* add flucoma corpus

* move datasets to data

* BufAudioTransport now has A-B based arguments

* fix mistakenly fixed type signature in FluidSink

* Tests for framing and overlap add bits

* remove build folder caching as a bad job 

(failing forever once cache goes bad)

* Test/sc ports/slicers (#91)

* Working port of SC NoveltySlice tests

* formatting and constifying

* use generated path for test signal loading

* update testsignals header and cmake

* Add TestOnsetSegmention, update TestNoveltySeg for new resource loading

* Add Onsets and update novelty in CMake

* Add EnvelopeSeg tests and some missing headers

* Add EnvelopeGate tests

* Add TransientSlice tests

* update location of audio files

* add missing function to signals.cpp.in

* Fix test signal for AmpSlice test

* try and speed up test run

* FluidSource test blackholed on MSVC

It doesn't like GENERATE_REF nested in GENERATE. Nosir.

* ignore all build folders for a quieter life

* bump Eigen version (#93)

* bump Eigen version

* note new Eigen version in readme

* add mammoth dataset

* OnsetSlice and NoveltySlice clients: fix block size dependency (#96)

Makes tracking of `frameOffset` stateful across calls to `process` so that odd hop sizes are handled correctly

* Use `operator<<=` for copy to / from FluidTensorView

* update all instances of FluidTensorView copying

* Signals.cpp.in fix lingering copy assignment

* Add conventional, shallow copy / move assignment to FluidTensorView

* `SliceIterator::end()` fix (#97)

* fix problem with 0-size slices and end() sentinels

* adds basic test for slice ietrator fix

* annotate datasets

* add mfcc for fluid_corpus

* update mfcc dataset

* bump version to beta5 (#101)

* Add pointwise inversion to PCA

* Enhance `ParameterSet` (#103)

* Meta: Add HO function to apply function only to select indicies of a tuple

* ParameterSet: Easier application of functions by type with lambdas + discovering the count of params by type

* BufStats: Weights should be an input buffer

* [Fix] Make error language more consistent (#118)

* replace incorrect use of label where identifier is intended

* dont shorten identifier to id

* rename DuplicateLabel to DuplicateIdentifier

* Enhance/slicer detection curves (#114)

* EnvelopeSegmentation: refactor into feature curve + detector

* NoveltySegementation: refactor into feature curve + detector

* OnsetSegmentation: refactor into feature curve + detector

* Add OnsetFeatureClient

* Add NoveltyFeatureClient

* Add AmpFeatureClient

* correct novelty and onset curves for nrt

* fix longstanding assumption in NRT wrapper that client latency == window size

* Update NoveltyFeatureClient to new analysisSettings method

* remove old FIXME comment

* fix cout call killing test on windows

* Missing update change to OnsetFeatureClient::analysisSettings()

* algorithms: NoveltyCurve -> NoveltyFeature

* Novelty: Update algorihtm class name, and change 'feature' param to algorithm

* Also update names in NovletySegmentation

* BufOnsetFeature correct output buffer name

* Novelty / OnsetFeature - cache descriptor values for when sigvs < hop

* more information on failing test thx

* Enhance/fewer warnings (#85)

* excess semicolons

* unused variables

* type narrowing / signed-unsigned

* integer conversions: new Eigen::Array alias for index rather than int

* json: stop embedding nlohmann library and instead fetch at configure time (#105)

* ParameterDescriptors: make more composable by adding insert function (#107)

* FluidJSON: Avoid some implicit conversion on import that could confuse compiler

* Deal with some warnings

* EnvelopeSegmentation: pass correct params to Envelope

* FluidTensorView deep copy gets distinct operator (#100)

* Add pointwise inversion to PCA

* Use `operator<<=` for copy to / from FluidTensorView

* update all instances of FluidTensorView copying

* Signals.cpp.in fix lingering copy assignment

* Add conventional, shallow copy / move assignment to FluidTensorView

* `SliceIterator::end()` fix (#97)

* fix problem with 0-size slices and end() sentinels

* adds basic test for slice ietrator fix

* annotate datasets

* add mfcc for fluid_corpus

* update mfcc dataset

* bump version to beta5 (#101)

* [Release] 1.0.0-beta5 (#102)

* batchsize was not capped down, leading to hilarious crashes (#63)

* updating credits with the new team

* Include SHAs for flucoma-core and current project in version string

* Conform version string with SHAs to semantic versioning spec

* add chroma feature to NoveltySlice

* Toggle BLAS settings for compiling on APPLE (#67)

* disable blas for compiling on macos

* remove line according to O's suggestion

* error in the client of (buf)noveltyslice since introducing chroma as feature

* Enhance/versioning (#75)

* Remove old header template

* Add in TU template and declaration header

* update CMake to new version scheme

* Get SHA from top level source folder

* ensure git is found

* fix issue #23 - zeroing the output vector in the mTracker loop (#82)

* fix issue #23 - zeroing the output vector in the mTracker loop

* now really corrected thanks to @weefuzzy

* Initial unit tests for `include/data` (#83)

* initial FluidTensor tests

* add assert death test to cmake

* more assert death

* fix compile tests

* Working assertion tests, it seems

* Add first FluidTensorView tests

* tidy up cmake a bit

* factor out EqualRange matcher to own header

* Add FluidTensorSupport tests

* rollback to Catch2 

for compatability with approvaltests.cpp

* add tests for FluidDataSet

bubba's first approval test ✨

* test print for bigger range as well

* tidy cmake

* make building tests optional

* remove spurious files from tracking

* add workflow for CI

* make workflow manually triggerable

* correct workflow file extention

* pleading and bargaining with github

* getting event name right

* FluidTensorSlice: fix terrible and aged typename mistake

* workflow: try and cache whole build folder

* wotkflow: unbreak yaml

* workflow: disable fail-fast

* Amend upper frequency limit of mel bands in NoveltySlice to 20kHz

* [Enhance] FluCoMa-wide DataSets as a resource (#88)

* treat wav files as binary

* move audio files to resources folder

* add datasets

* add pre-trained neural networks

* add flucoma corpus

* move datasets to data

* BufAudioTransport now has A-B based arguments

* fix mistakenly fixed type signature in FluidSink

* Tests for framing and overlap add bits

* remove build folder caching as a bad job 

(failing forever once cache goes bad)

* Test/sc ports/slicers (#91)

* Working port of SC NoveltySlice tests

* formatting and constifying

* use generated path for test signal loading

* update testsignals header and cmake

* Add TestOnsetSegmention, update TestNoveltySeg for new resource loading

* Add Onsets and update novelty in CMake

* Add EnvelopeSeg tests and some missing headers

* Add EnvelopeGate tests

* Add TransientSlice tests

* update location of audio files

* add missing function to signals.cpp.in

* Fix test signal for AmpSlice test

* try and speed up test run

* FluidSource test blackholed on MSVC

It doesn't like GENERATE_REF nested in GENERATE. Nosir.

* ignore all build folders for a quieter life

* bump Eigen version (#93)

* bump Eigen version

* note new Eigen version in readme

* add mammoth dataset

* OnsetSlice and NoveltySlice clients: fix block size dependency (#96)

Makes tracking of `frameOffset` stateful across calls to `process` so that odd hop sizes are handled correctly

* `SliceIterator::end()` fix (#97)

* fix problem with 0-size slices and end() sentinels

* adds basic test for slice ietrator fix

* annotate datasets

* add mfcc for fluid_corpus

* update mfcc dataset

* bump version to beta5 (#101)

Co-authored-by: tremblap <info@pierrealexandretremblay.com>
Co-authored-by: weefuzzy <gungwho@gmail.com>
Co-authored-by: g-roma <gerard.roma@gmail.com>
Co-authored-by: Ted Moore <ted@tedmooremusic.com>

* Add pointwise inversion to PCA

* Enhance `ParameterSet` (#103)

* Meta: Add HO function to apply function only to select indicies of a tuple

* ParameterSet: Easier application of functions by type with lambdas + discovering the count of params by type

* BufStats: Weights should be an input buffer

* [Fix] Make error language more consistent (#118)

* replace incorrect use of label where identifier is intended

* dont shorten identifier to id

* rename DuplicateLabel to DuplicateIdentifier

* Enhance/slicer detection curves (#114)

* EnvelopeSegmentation: refactor into feature curve + detector

* NoveltySegementation: refactor into feature curve + detector

* OnsetSegmentation: refactor into feature curve + detector

* Add OnsetFeatureClient

* Add NoveltyFeatureClient

* Add AmpFeatureClient

* correct novelty and onset curves for nrt

* fix longstanding assumption in NRT wrapper that client latency == window size

* Update NoveltyFeatureClient to new analysisSettings method

* remove old FIXME comment

* fix cout call killing test on windows

* Missing update change to OnsetFeatureClient::analysisSettings()

* algorithms: NoveltyCurve -> NoveltyFeature

* Novelty: Update algorihtm class name, and change 'feature' param to algorithm

* Also update names in NovletySegmentation

* BufOnsetFeature correct output buffer name

* Novelty / OnsetFeature - cache descriptor values for when sigvs < hop

* more information on failing test thx

* [Release] 1.0.0-beta6 (#126)

* Add pointwise inversion to PCA

* batchsize was not capped down, leading to hilarious crashes (#63)

* updating credits with the new team

* Include SHAs for flucoma-core and current project in version string

* Conform version string with SHAs to semantic versioning spec

* add chroma feature to NoveltySlice

* Toggle BLAS settings for compiling on APPLE (#67)

* disable blas for compiling on macos

* remove line according to O's suggestion

* error in the client of (buf)noveltyslice since introducing chroma as feature

* Enhance/versioning (#75)

* Remove old header template

* Add in TU template and declaration header

* update CMake to new version scheme

* Get SHA from top level source folder

* ensure git is found

* fix issue #23 - zeroing the output vector in the mTracker loop (#82)

* fix issue #23 - zeroing the output vector in the mTracker loop

* now really corrected thanks to @weefuzzy

* Initial unit tests for `include/data` (#83)

* initial FluidTensor tests

* add assert death test to cmake

* more assert death

* fix compile tests

* Working assertion tests, it seems

* Add first FluidTensorView tests

* tidy up cmake a bit

* factor out EqualRange matcher to own header

* Add FluidTensorSupport tests

* rollback to Catch2 

for compatability with approvaltests.cpp

* add tests for FluidDataSet

bubba's first approval test ✨

* test print for bigger range as well

* tidy cmake

* make building tests optional

* remove spurious files from tracking

* add workflow for CI

* make workflow manually triggerable

* correct workflow file extention

* pleading and bargaining with github

* getting event name right

* FluidTensorSlice: fix terrible and aged typename mistake

* workflow: try and cache whole build folder

* wotkflow: unbreak yaml

* workflow: disable fail-fast

* Amend upper frequency limit of mel bands in NoveltySlice to 20kHz

* [Enhance] FluCoMa-wide DataSets as a resource (#88)

* treat wav files as binary

* move audio files to resources folder

* add datasets

* add pre-trained neural networks

* add flucoma corpus

* move datasets to data

* BufAudioTransport now has A-B based arguments

* fix mistakenly fixed type signature in FluidSink

* Tests for framing and overlap add bits

* remove build folder caching as a bad job 

(failing forever once cache goes bad)

* Test/sc ports/slicers (#91)

* Working port of SC NoveltySlice tests

* formatting and constifying

* use generated path for test signal loading

* update testsignals header and cmake

* Add TestOnsetSegmention, update TestNoveltySeg for new resource loading

* Add Onsets and update novelty in CMake

* Add EnvelopeSeg tests and some missing headers

* Add EnvelopeGate tests

* Add TransientSlice tests

* update location of audio files

* add missing function to signals.cpp.in

* Fix test signal for AmpSlice test

* try and speed up test run

* FluidSource test blackholed on MSVC

It doesn't like GENERATE_REF nested in GENERATE. Nosir.

* ignore all build folders for a quieter life

* bump Eigen version (#93)

* bump Eigen version

* note new Eigen version in readme

* add mammoth dataset

* OnsetSlice and NoveltySlice clients: fix block size dependency (#96)

Makes tracking of `frameOffset` stateful across calls to `process` so that odd hop sizes are handled correctly

* `SliceIterator::end()` fix (#97)

* fix problem with 0-size slices and end() sentinels

* adds basic test for slice ietrator fix

* annotate datasets

* add mfcc for fluid_corpus

* update mfcc dataset

* bump version to beta5 (#101)

* Add pointwise inversion to PCA

* Enhance `ParameterSet` (#103)

* Meta: Add HO function to apply function only to select indicies of a tuple

* ParameterSet: Easier application of functions by type with lambdas + discovering the count of params by type

* BufStats: Weights should be an input buffer

* [Fix] Make error language more consistent (#118)

* replace incorrect use of label where identifier is intended

* dont shorten identifier to id

* rename DuplicateLabel to DuplicateIdentifier

* Enhance/slicer detection curves (#114)

* EnvelopeSegmentation: refactor into feature curve + detector

* NoveltySegementation: refactor into feature curve + detector

* OnsetSegmentation: refactor into feature curve + detector

* Add OnsetFeatureClient

* Add NoveltyFeatureClient

* Add AmpFeatureClient

* correct novelty and onset curves for nrt

* fix longstanding assumption in NRT wrapper that client latency == window size

* Update NoveltyFeatureClient to new analysisSettings method

* remove old FIXME comment

* fix cout call killing test on windows

* Missing update change to OnsetFeatureClient::analysisSettings()

* algorithms: NoveltyCurve -> NoveltyFeature

* Novelty: Update algorihtm class name, and change 'feature' param to algorithm

* Also update names in NovletySegmentation

* BufOnsetFeature correct output buffer name

* Novelty / OnsetFeature - cache descriptor values for when sigvs < hop

* more information on failing test thx

Co-authored-by: Owen Green <gungwho@gmail.com>
Co-authored-by: tremblap <info@pierrealexandretremblay.com>
Co-authored-by: g-roma <gerard.roma@gmail.com>
Co-authored-by: James Bradbury <me@jamesbradbury.net>
Co-authored-by: Ted Moore <ted@tedmooremusic.com>

* Update FlucomaVersion.cmake

* Enhance/fewer warnings (#85)

* excess semicolons

* unused variables

* type narrowing / signed-unsigned

* integer conversions: new Eigen::Array alias for index rather than int

* json: stop embedding nlohmann library and instead fetch at configure time (#105)

* ParameterDescriptors: make more composable by adding insert function (#107)

* FluidJSON: Avoid some implicit conversion on import that could confuse compiler

* Deal with some warnings

* EnvelopeSegmentation: pass correct params to Envelope

* update with new FluidTensorView copying ops

* Use Windows 2019 in CI

* Parallel tests seem unreliable on windows

Co-authored-by: James Bradbury <me@jamesbradbury.net>
Co-authored-by: tremblap <info@pierrealexandretremblay.com>
Co-authored-by: g-roma <gerard.roma@gmail.com>
Co-authored-by: Ted Moore <ted@tedmooremusic.com>
Co-authored-by: James Bradbury <github@jamesbradbury.net>

* Enhance/const correct(er) dataobjects (#115)

* Const correct arguments for data object messages; actually const object refs for RT usage

* MLP const update

* SharedClient const updates

* workflow: Disable parallel test runner and turn up verbosity

* remove std::cout access from segfaulting test (just in case)

* NoveltySlice: ensure frame offset is reset when win / hop changes

* correcting the long definition for novelty clients

* NoveltySegmentation: Correct order of arguments in constructor

* Assign2D: Make UNASSIGNED constexpr to solve strange linker error

* Assign2D: still needs out-of-class declaration for UNASSIGNED to link reliably

* corrected and augmented the credits/info of Data

* flucoma_corpus_files: typo in the file names

* Sound bank change (#135)

* removed redundant files and added constanzo

* new dataset to load in help files

* saved norm

* BufFlatten: Workaround PD-release builds problem with temporary buffer views

* add pca whitening (#98)

* add pca whitening

* actually add pca whitening

* PCA: add de-whitening to inverseTransformPoint

* PCAClient: update call to inverseTransformPoint

Co-authored-by: weefuzzy <gungwho@gmail.com>

* Enhance/optional message args (#106)

* Add dependency for Sy Brand's `optional` backport

* include optional in MessageSet

add alias (in case we need to switch between `std::` and `tl::`)

* try out optional arg in `KDTreeClient::kNearest`

* compile-time enforce that optional args must follow mandatory ones

* stop tl:optional doing its tests

* PoC: Enhance/choices param (#108)

* Add ChoiceT parameter type

* Add `select` control to `BufStatsClient` to road test `ChoicesParam`

* Choices params: Don't use a set because it breaks ordering

* SpectralShape: Add select param

* add dataset version of inverse PCA (#125)

* add dataset version of inverse PCA

* PCA: Add whitening to batch inverse transform

* Enhance/max params (#132)

* CMake: Centralise C++ version and set to 17

* Introduce long param type with a user-defined maximum + 'primary' params
 – e.g. max coeffs for MFCC)
 - decoupling Max/PD arguments from 'fixed' params
–

* MFCC: Proof of concept for new way of expressing runtime max for certain params

* CMake: Missing C++ version adjustments

* CMake: Another rogue C++ version flag

* Try to get catch to build on OS 12 whilst targetting 10.8

* NMFClient: Add resynth mode to de-magic interface (#133)

Also allow resynth from fixed bases + activations

* All Scalers: Replace `invert` parameter with `inverseTransform` messages

* Stop being too clever in LongRuntimeMaxParam 

(thought I'd already done this...)

* Convert remaining `max<X>` parameters and `maxFFTsize` to new order of things

* SpectralShape: Ensure output channel count responds to select param

* MLPClassifier: Missing const in type alias

* MLP clients: change 'hidden' to 'hiddenlayers'. fixes #143

to work around name clash with special attribute in Max

* [Enhance] ChoicesParam for LoudnessClient and PitchClient (#141)

* update loudness client to have a ChoicesParam

* rename truepeak selection to peak

* replace mMaxOutPutSize with fixed value of 2

* Add / fix select for Loudness and Pitch clients

Harmonize SpectralShape code
Adjust FluidBufLoudness hack in NRT wrapper

* adds a patch to redo the included demo dataset (in pd)

* MaxParams: toughen up

* dealing with scaler range near 0 (#144)

* makes a function that compares the range to 10*lambda - in line with SciKit Learn

* aesthetic include order to be like the other 2 scalers

* NRTWrapper: Fix for multichannel behaviour with @select

* OnsetSliceClient: Reset frame offset when FFT params change, fixes #145

* CMake: Make version data globally available via properties

* CMake: add the big ol list of core clients plus support code

* Add new features to central CMake, plus small improvements and version bump

* CMake: Turn down the volume for FetchContent

* CMake: Get rid of old diagnostic messages

* CMake: quote module path

* CMake: Set module path correctly when there is parent project

* CMake: Debug module path logic

* CMake: Superstitous attempt to fix 403 errors when cloning eigen on CI

* zap typo Maxiumm

* fised typo Magnitdue

* MaxParam: correct initialization order

* RunningStats: change `size` to `history`

* CMake: We need to be able to declare IO properties of clients up front

* MLP* camel case hiddenLayers

* NMFCrossClient: Prevent buffer overrun crashes by ensuring polyphony <= rank

* Chroma: Fix Eigen variable aliasing causing UB

* NMFMorph: avoid crash

if OptimalTransport fails to segment spectrum

* CMake: Enable PIC to make Linux CI happier.

I hope

* BufNNDSVD -> BufNMFSeed (#173)

* change the client name - kept the algo name as it does what it says

* algo name confounded with client name in the code

* change parameter name in client to interpolation (#174)

* Feature/skmeans (#99)

* add pca whitening

* actually add pca whitening

* add spherical kmeans

* actually add spherical kmeans

* SKMeans fixes, change KMeans getDistances to transform

* adding RT query class

* <fit>transform<point> -> <fit>encode<point>

Co-authored-by: tremblap <info@pierrealexandretremblay.com>

* ChoicesT: Correct for faulty use of `static`

fixes #175

* `(S)KMeansClient`: Track `numClusters` and clear if it changes before fitting

fixes #176

* KMeansClient: Work around over agressive optimisation

* bump flucoma version

* make capitalisation consistent

* SKMeans: Apply same fix as 1e668d5

* update version to 1.0.0
fearn-e pushed a commit to fearn-e/flucoma-core that referenced this pull request Aug 15, 2023
* update normalize

* add fluid.learn

* update second tab description

* PA review

Co-authored-by: James Bradbury <me@jamesbradbury.net>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants