Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
ad385e5
Add pointwise inversion to PCA
weefuzzy Sep 30, 2021
321fd63
Use `operator<<=` for copy to / from FluidTensorView
weefuzzy Feb 12, 2022
aa69bce
update all instances of FluidTensorView copying
weefuzzy Feb 12, 2022
5972173
Signals.cpp.in fix lingering copy assignment
weefuzzy Feb 14, 2022
57046c0
Add conventional, shallow copy / move assignment to FluidTensorView
weefuzzy Feb 14, 2022
6c921e1
`SliceIterator::end()` fix (#97)
weefuzzy Feb 14, 2022
2ec78d3
annotate datasets
Feb 14, 2022
18fc8b1
add mfcc for fluid_corpus
Feb 14, 2022
3cf746d
update mfcc dataset
Feb 14, 2022
5a9691e
bump version to beta5 (#101)
Feb 16, 2022
cdbe03c
[Release] 1.0.0-beta5 (#102)
Feb 16, 2022
6314901
Add pointwise inversion to PCA
weefuzzy Sep 30, 2021
3a785e5
Merge branch 'feature/invert-pca' of https://github.com/flucoma/fluco…
weefuzzy Mar 8, 2022
973961d
Enhance `ParameterSet` (#103)
weefuzzy Mar 10, 2022
ebbae04
Merge pull request #112 from flucoma/feature/invert-pca
tedmoore Mar 11, 2022
0bbd7ae
[Fix] Make error language more consistent (#118)
Mar 28, 2022
b7c81c3
Enhance/slicer detection curves (#114)
weefuzzy Mar 29, 2022
efcb373
more information on failing test thx
weefuzzy Mar 29, 2022
19837a9
Merge branch 'main' into dev
weefuzzy Mar 30, 2022
47f57c7
[Release] 1.0.0-beta6 (#126)
Mar 30, 2022
5b77e67
Update FlucomaVersion.cmake
Mar 30, 2022
b585a83
Enhance/fewer warnings (#85)
weefuzzy Mar 31, 2022
59abaaa
Merge branch 'main' into dev
weefuzzy Mar 31, 2022
9ac0e45
json: stop embedding nlohmann library and instead fetch at configure …
weefuzzy Mar 31, 2022
f9c37f6
ParameterDescriptors: make more composable by adding insert function …
weefuzzy Apr 1, 2022
a789a4b
FluidJSON: Avoid some implicit conversion on import that could confus…
weefuzzy Apr 1, 2022
c7708cb
Deal with some warnings
weefuzzy Apr 1, 2022
ae4eae4
EnvelopeSegmentation: pass correct params to Envelope
weefuzzy Apr 1, 2022
309f7d5
Merge branch 'enhance/fluidtensorview-copy' into dev
weefuzzy Apr 1, 2022
be78a60
update with new FluidTensorView copying ops
weefuzzy Apr 1, 2022
8251bcc
Use Windows 2019 in CI
weefuzzy Apr 1, 2022
61c66fa
Parallel tests seem unreliable on windows
weefuzzy Apr 1, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions .github/workflows/flucoma-core-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [ubuntu-18.04, windows-latest, macOS-latest]
os: [ubuntu-18.04, windows-2019, macOS-latest]
fail-fast: false

steps:
Expand All @@ -35,5 +35,6 @@ jobs:

- name: Test
working-directory: ${{github.workspace}}/build
run: ctest -C ${{env.BUILD_TYPE}} -j3

run: ctest -C ${{env.BUILD_TYPE}} --output-on-failure

27 changes: 24 additions & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,16 @@ FetchContent_Declare(
GIT_TAG "v0.9.0"
)

FetchContent_Declare(
json
GIT_SHALLOW TRUE
# GIT_REPOSITORY https://github.com/nlohmann/json.git
# advice on nlohmann repo is to use this mirror unless we really want ~150 meg of test data as well as headers:
GIT_REPOSITORY https://github.com/ArthurSonzogni/nlohmann_json_cmake_fetchcontent
GIT_PROGRESS TRUE
GIT_TAG v3.10.5
)
set(JSON_SystemInclude ON CACHE BOOL "")
if(HISS_PATH) #if hiss path is set, this will stop it downloading
get_filename_component(FETCHCONTENT_SOURCE_DIR_HISSTOOLS ${HISS_PATH} ABSOLUTE)
endif()
Expand All @@ -79,6 +89,9 @@ if(SPECTRA_PATH) #if spectra path is set, this will stop it downloading
get_filename_component(FETCHCONTENT_SOURCE_DIR_SPECTRA ${SPECTRA_PATH} ABSOLUTE)
endif()

if(JSON_PATH)
get_filename_component(FETCHCONTENT_SOURCE_DIR_JSON ${JSON_PATH} ABSOLUTE)
endif()

FetchContent_GetProperties(HISSTools)
if(NOT hisstools_POPULATED)
Expand All @@ -95,6 +108,12 @@ if(NOT spectra_POPULATED)
FetchContent_Populate(Spectra)
endif()

FetchContent_GetProperties(json)
if(NOT json_POPULATED)
FetchContent_Populate(json)
endif()

add_subdirectory(${json_SOURCE_DIR} ${json_BINARY_DIR} EXCLUDE_FROM_ALL)

# HISSTools FFT target
add_library(
Expand Down Expand Up @@ -143,7 +162,7 @@ set_target_properties(HISSTools_AudioFile PROPERTIES
add_library(FLUID_DECOMPOSITION INTERFACE)

target_include_directories(
FLUID_DECOMPOSITION INTERFACE "${CMAKE_CURRENT_SOURCE_DIR}/include" "${CMAKE_CURRENT_SOURCE_DIR}/thirdparty"
FLUID_DECOMPOSITION INTERFACE "${CMAKE_CURRENT_SOURCE_DIR}/include"
)
target_include_directories(
FLUID_DECOMPOSITION SYSTEM INTERFACE #we don't want warnings from Eigen or HissTools
Expand All @@ -153,6 +172,10 @@ target_include_directories(
)
target_link_libraries(
FLUID_DECOMPOSITION INTERFACE HISSTools_FFT flucoma_VERSION_LIB
FLUID_DECOMPOSITION INTERFACE
HISSTools_FFT
flucoma_VERSION_LIB
nlohmann_json::nlohmann_json
)
target_sources(
FLUID_DECOMPOSITION INTERFACE ${HEADERS}
Expand All @@ -177,8 +200,6 @@ if(APPLE)
target_compile_options(HISSTools_AudioFile PUBLIC -stdlib=libc++)
target_compile_options(FLUID_DECOMPOSITION INTERFACE -stdlib=libc++)
target_link_libraries(FLUID_DECOMPOSITION INTERFACE -stdlib=libc++)


endif()

#Apply any vector instruction flags
Expand Down
2 changes: 1 addition & 1 deletion FlucomaVersion.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ find_package(Git REQUIRED)
set(flucoma_VERSION_MAJOR 1)
set(flucoma_VERSION_MINOR 0)
set(flucoma_VERSION_PATCH 0)
set(flucoma_VERSION_SUFFIX TB2.beta4)
set(flucoma_VERSION_SUFFIX TB2.beta6)

function(make_flucoma_version_string output_variable)
set(${output_variable}
Expand Down
Loading