diff --git a/examples/benchmark/advanced-benchmark/defineAdvancedBenchmark.cpp b/examples/benchmark/advanced-benchmark/defineAdvancedBenchmark.cpp index 972e4d3..1b62889 100644 --- a/examples/benchmark/advanced-benchmark/defineAdvancedBenchmark.cpp +++ b/examples/benchmark/advanced-benchmark/defineAdvancedBenchmark.cpp @@ -3,11 +3,11 @@ #include #include -#include "../../../../extras/models/cnn/CNNConfig.h" -#include "../../../../extras/models/cnn/CNNPrePostProcessor.h" -#include "../../../../extras/models/hybrid-nn/HybridNNConfig.h" -#include "../../../../extras/models/hybrid-nn/HybridNNPrePostProcessor.h" -#include "../../../../extras/models/stateful-rnn/StatefulRNNConfig.h" +#include "../../../extras/models/cnn/CNNConfig.h" +#include "../../../extras/models/cnn/CNNPrePostProcessor.h" +#include "../../../extras/models/hybrid-nn/HybridNNConfig.h" +#include "../../../extras/models/hybrid-nn/HybridNNPrePostProcessor.h" +#include "../../../extras/models/stateful-rnn/StatefulRNNConfig.h" #include "ClearCustomProcessor.h" diff --git a/examples/benchmark/cnn-size-benchmark/defineCNNSizeBenchmark.cpp b/examples/benchmark/cnn-size-benchmark/defineCNNSizeBenchmark.cpp index 78628df..3ac440b 100644 --- a/examples/benchmark/cnn-size-benchmark/defineCNNSizeBenchmark.cpp +++ b/examples/benchmark/cnn-size-benchmark/defineCNNSizeBenchmark.cpp @@ -3,10 +3,10 @@ #include #include -#include "../../../../extras/models/cnn/CNNConfig.h" -#include "../../../../extras/models/cnn/Medium_CNNConfig.h" -#include "../../../../extras/models/cnn/Small_CNNConfig.h" -#include "../../../../extras/models/cnn/CNNPrePostProcessor.h" +#include "../../../extras/models/cnn/CNNConfig.h" +#include "../../../extras/models/cnn/Medium_CNNConfig.h" +#include "../../../extras/models/cnn/Small_CNNConfig.h" +#include "../../../extras/models/cnn/CNNPrePostProcessor.h" /* ============================================================ * diff --git a/examples/benchmark/simple-benchmark/defineSimpleBenchmark.cpp b/examples/benchmark/simple-benchmark/defineSimpleBenchmark.cpp index e4e92ca..f905b5f 100644 --- a/examples/benchmark/simple-benchmark/defineSimpleBenchmark.cpp +++ b/examples/benchmark/simple-benchmark/defineSimpleBenchmark.cpp @@ -3,13 +3,13 @@ #include #include -#include "../../../../extras/models/cnn/CNNConfig.h" -#include "../../../../extras/models/cnn/CNNPrePostProcessor.h" -#include "../../../../extras/models/hybrid-nn/HybridNNConfig.h" -#include "../../../../extras/models/hybrid-nn/HybridNNPrePostProcessor.h" -#include "../../../../extras/models/stateful-rnn/StatefulRNNConfig.h" -#include "../../../../extras/models/model-pool/SimpleGainConfig.h" -#include "../../../../extras/models/model-pool/SimpleStereoGainConfig.h" +#include "../../../extras/models/cnn/CNNConfig.h" +#include "../../../extras/models/cnn/CNNPrePostProcessor.h" +#include "../../../extras/models/hybrid-nn/HybridNNConfig.h" +#include "../../../extras/models/hybrid-nn/HybridNNPrePostProcessor.h" +#include "../../../extras/models/stateful-rnn/StatefulRNNConfig.h" +#include "../../../extras/models/model-pool/SimpleGainConfig.h" +#include "../../../extras/models/model-pool/SimpleStereoGainConfig.h" /* ============================================================ * diff --git a/examples/clap-audio-plugin/anira-clap-demo.h b/examples/clap-audio-plugin/anira-clap-demo.h index e58738b..aa013f2 100644 --- a/examples/clap-audio-plugin/anira-clap-demo.h +++ b/examples/clap-audio-plugin/anira-clap-demo.h @@ -13,9 +13,9 @@ #include -#include "../../../extras/models/hybrid-nn/HybridNNConfig.h" -#include "../../../extras/models/hybrid-nn/HybridNNPrePostProcessor.h" -#include "../../../extras/models/hybrid-nn/HybridNNBypassProcessor.h" +#include "../../extras/models/hybrid-nn/HybridNNConfig.h" +#include "../../extras/models/hybrid-nn/HybridNNPrePostProcessor.h" +#include "../../extras/models/hybrid-nn/HybridNNBypassProcessor.h" #include "utils/DryWetMixer.h" diff --git a/examples/juce-audio-plugin/PluginProcessor.h b/examples/juce-audio-plugin/PluginProcessor.h index 29a3082..4d8ba71 100644 --- a/examples/juce-audio-plugin/PluginProcessor.h +++ b/examples/juce-audio-plugin/PluginProcessor.h @@ -6,15 +6,15 @@ #include -#include "../../../extras/models/cnn/CNNConfig.h" -#include "../../../extras/models/cnn/CNNPrePostProcessor.h" -#include "../../../extras/models/cnn/CNNBypassProcessor.h" // This one is only needed for the round trip test, when selecting the Custom backend -#include "../../../extras/models/hybrid-nn/HybridNNConfig.h" -#include "../../../extras/models/hybrid-nn/HybridNNPrePostProcessor.h" -#include "../../../extras/models/hybrid-nn/HybridNNBypassProcessor.h" // Only needed for round trip test -#include "../../../extras/models/stateful-rnn/StatefulRNNConfig.h" -#include "../../../extras/models/model-pool/SimpleGainConfig.h" -#include "../../../extras/models/model-pool/SimpleStereoGainConfig.h" +#include "../../extras/models/cnn/CNNConfig.h" +#include "../../extras/models/cnn/CNNPrePostProcessor.h" +#include "../../extras/models/cnn/CNNBypassProcessor.h" // This one is only needed for the round trip test, when selecting the Custom backend +#include "../../extras/models/hybrid-nn/HybridNNConfig.h" +#include "../../extras/models/hybrid-nn/HybridNNPrePostProcessor.h" +#include "../../extras/models/hybrid-nn/HybridNNBypassProcessor.h" // Only needed for round trip test +#include "../../extras/models/stateful-rnn/StatefulRNNConfig.h" +#include "../../extras/models/model-pool/SimpleGainConfig.h" +#include "../../extras/models/model-pool/SimpleStereoGainConfig.h" //============================================================================== class AudioPluginAudioProcessor : public juce::AudioProcessor, private juce::AudioProcessorValueTreeState::Listener diff --git a/examples/minimal-inference/libtorch/minimal-libtorch.cpp b/examples/minimal-inference/libtorch/minimal-libtorch.cpp index c9e05bf..235445d 100644 --- a/examples/minimal-inference/libtorch/minimal-libtorch.cpp +++ b/examples/minimal-inference/libtorch/minimal-libtorch.cpp @@ -10,14 +10,14 @@ Licence: modified BSD #include #include -#include "../../../../extras/models/stateful-rnn/StatefulRNNConfig.h" -#include "../../../../extras/models/hybrid-nn/HybridNNConfig.h" -#include "../../../../extras/models/cnn/CNNConfig.h" -#include "../../../../extras/models/model-pool/SimpleGainConfig.h" -#include "../../../../extras/models/model-pool/SimpleStereoGainConfig.h" - -#include "../../../../include/anira/utils/MemoryBlock.h" -#include "../../../../include/anira/utils/AudioBuffer.h" +#include "../../../extras/models/stateful-rnn/StatefulRNNConfig.h" +#include "../../../extras/models/hybrid-nn/HybridNNConfig.h" +#include "../../../extras/models/cnn/CNNConfig.h" +#include "../../../extras/models/model-pool/SimpleGainConfig.h" +#include "../../../extras/models/model-pool/SimpleStereoGainConfig.h" + +#include "../../../include/anira/utils/MemoryBlock.h" +#include "../../../include/anira/utils/AudioBuffer.h" // m_ prefix is not used to indicate member variables it is used to be compatible with code in the LibTorchProcessor class diff --git a/examples/minimal-inference/onnxruntime/minimal-onnxruntime.cpp b/examples/minimal-inference/onnxruntime/minimal-onnxruntime.cpp index 368c4a9..9e7964a 100644 --- a/examples/minimal-inference/onnxruntime/minimal-onnxruntime.cpp +++ b/examples/minimal-inference/onnxruntime/minimal-onnxruntime.cpp @@ -8,14 +8,14 @@ Licence: MIT #include #include -#include "../../../../extras/models/stateful-rnn/StatefulRNNConfig.h" -#include "../../../../extras/models/hybrid-nn/HybridNNConfig.h" -#include "../../../../extras/models/cnn/CNNConfig.h" -#include "../../../../extras/models/model-pool/SimpleGainConfig.h" -#include "../../../../extras/models/model-pool/SimpleStereoGainConfig.h" - -#include "../../../../include/anira/utils/MemoryBlock.h" -#include "../../../../include/anira/utils/AudioBuffer.h" +#include "../../../extras/models/stateful-rnn/StatefulRNNConfig.h" +#include "../../../extras/models/hybrid-nn/HybridNNConfig.h" +#include "../../../extras/models/cnn/CNNConfig.h" +#include "../../../extras/models/model-pool/SimpleGainConfig.h" +#include "../../../extras/models/model-pool/SimpleStereoGainConfig.h" + +#include "../../../include/anira/utils/MemoryBlock.h" +#include "../../../include/anira/utils/AudioBuffer.h" void minimal_inference(anira::InferenceConfig m_inference_config) { diff --git a/examples/minimal-inference/tensorflow-lite/minimal-tflite.cpp b/examples/minimal-inference/tensorflow-lite/minimal-tflite.cpp index ea4a368..7a9fee3 100644 --- a/examples/minimal-inference/tensorflow-lite/minimal-tflite.cpp +++ b/examples/minimal-inference/tensorflow-lite/minimal-tflite.cpp @@ -10,14 +10,14 @@ Licence: Apache 2.0 #include #include -#include "../../../../extras/models/stateful-rnn/StatefulRNNConfig.h" -#include "../../../../extras/models/hybrid-nn/HybridNNConfig.h" -#include "../../../../extras/models/cnn/CNNConfig.h" -#include "../../../../extras/models/model-pool/SimpleGainConfig.h" -#include "../../../../extras/models/model-pool/SimpleStereoGainConfig.h" - -#include "../../../../include/anira/utils/MemoryBlock.h" -#include "../../../../include/anira/utils/AudioBuffer.h" +#include "../../../extras/models/stateful-rnn/StatefulRNNConfig.h" +#include "../../../extras/models/hybrid-nn/HybridNNConfig.h" +#include "../../../extras/models/cnn/CNNConfig.h" +#include "../../../extras/models/model-pool/SimpleGainConfig.h" +#include "../../../extras/models/model-pool/SimpleStereoGainConfig.h" + +#include "../../../include/anira/utils/MemoryBlock.h" +#include "../../../include/anira/utils/AudioBuffer.h" #define TFLITE_MINIMAL_CHECK(x) \ if (!(x)) { \ diff --git a/test/test_InferenceHandler.cpp b/test/test_InferenceHandler.cpp index cfbfa2e..62b2565 100644 --- a/test/test_InferenceHandler.cpp +++ b/test/test_InferenceHandler.cpp @@ -8,7 +8,7 @@ #include "../extras/models/hybrid-nn/HybridNNConfig.h" #include "../extras/models/hybrid-nn/HybridNNPrePostProcessor.h" -#include "../../../extras/models/hybrid-nn/HybridNNBypassProcessor.h" // Only needed for round trip test +#include "../extras/models/hybrid-nn/HybridNNBypassProcessor.h" // Only needed for round trip test #include "WavReader.h" #define INFERENCE_TIMEOUT_S 2