[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 <[email protected]>
Co-authored-by: weefuzzy <[email protected]>
Co-authored-by: g-roma <[email protected]>
Co-authored-by: Ted Moore <[email protected]>

Author: 5 people

.gitattributes

@@ -0,0 +1 @@
+*.wav binary

.github/workflows/flucoma-core-ci.yml

@@ -0,0 +1,39 @@
+name: Flucoma Core CI 
+
+on:
+  workflow_dispatch:
+  push:
+    branches: [ main, dev ]
+  pull_request:
+    branches: [ main, dev ]
+
+env:  
+  BUILD_TYPE: Release
+
+jobs: 
+  build:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-18.04, windows-latest, macOS-latest]
+      fail-fast: false 
+      
+    steps:  
+    - uses: actions/checkout@v2
+    
+    # - name: Cache Build Folder 
+    #   uses: actions/cache@v2
+    #   with: 
+    #     path: ${{github.workspace}}/build
+    #     key: ${{ runner.os }}-buildcache
+
+    - name: Configure CMake
+      run: cmake -B ${{github.workspace}}/build -DFLUCOMA_TESTS=On -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}}
+
+    - name: Build
+      run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}}
+
+    - name: Test
+      working-directory: ${{github.workspace}}/build
+      run: ctest -C ${{env.BUILD_TYPE}} -j3
+      

.gitignore

@@ -1,4 +1,7 @@
-build
+*build*
 **/.DS_Store
 /examples/out*.wav
 .vs/
+.dsp_cache
+FluidVersion.cpp
+flucoma.version.rc

CMakeLists.txt

@@ -24,6 +24,7 @@ endif()
 project (flucoma-core LANGUAGES CXX)
 
 include("${CMAKE_CURRENT_SOURCE_DIR}/script/flucoma-buildtype.cmake")
+include("${CMAKE_CURRENT_SOURCE_DIR}/FlucomaVersion.cmake")
 
 include(FetchContent)
 set(HISS_PATH "" CACHE PATH "The path to a HISSTools_Library folder. Will pull from github if not set")
@@ -51,10 +52,11 @@ FetchContent_Declare(
 
 FetchContent_Declare(
   Eigen
+  GIT_SHALLOW TRUE
   GIT_REPOSITORY https://gitlab.com/libeigen/eigen
   GIT_PROGRESS TRUE
-  GIT_BRANCH "3.3"
-  GIT_TAG "3.3.5"
+  GIT_BRANCH "3.4"
+  GIT_TAG "3.4.0"
 )
 
 FetchContent_Declare(
@@ -150,7 +152,7 @@ target_include_directories(
   "${hisstools_SOURCE_DIR}"
 )
 target_link_libraries(
-  FLUID_DECOMPOSITION INTERFACE HISSTools_FFT
+  FLUID_DECOMPOSITION INTERFACE HISSTools_FFT flucoma_VERSION_LIB
 )
 target_sources(
   FLUID_DECOMPOSITION INTERFACE ${HEADERS}
@@ -170,7 +172,6 @@ endif()
 target_compile_definitions(FLUID_DECOMPOSITION INTERFACE EIGEN_MPL2_ONLY=1)
 
 if(APPLE)
-  target_compile_definitions(FLUID_DECOMPOSITION INTERFACE EIGEN_USE_BLAS=1)
   #targeting <= 10.9, need to really emphasise that we want libc++ both to compiler and linker
   target_compile_options(HISSTools_FFT PUBLIC -stdlib=libc++)
   target_compile_options(HISSTools_AudioFile PUBLIC -stdlib=libc++)
@@ -191,3 +192,9 @@ endif()
 add_subdirectory(
    "${CMAKE_CURRENT_SOURCE_DIR}/examples"
 )
+
+enable_testing()
+
+if(FLUCOMA_TESTS)
+  add_subdirectory("${CMAKE_CURRENT_SOURCE_DIR}/tests")
+endif()

FlucomaVersion.cmake

@@ -0,0 +1,67 @@
+# Part of the Fluid Corpus Manipulation Project (http://www.flucoma.org/)
+# Copyright 2017-2019 University of Huddersfield.
+# Licensed under the BSD-3 License.
+# See license.md file in the project root for full license information.
+# This project has received funding from the European Research Council (ERC)
+# under the European Union’s Horizon 2020 research and innovation programme
+# (grant agreement No 725899).
+
+cmake_minimum_required (VERSION 3.11)
+
+find_package(Git REQUIRED)
+
+set(flucoma_VERSION_MAJOR 1)
+set(flucoma_VERSION_MINOR 0)
+set(flucoma_VERSION_PATCH 0)
+set(flucoma_VERSION_SUFFIX TB2.beta5)
+
+function(make_flucoma_version_string output_variable)
+  set(${output_variable}    
+      "${flucoma_VERSION_MAJOR}.${flucoma_VERSION_MINOR}.${flucoma_VERSION_PATCH}-${flucoma_VERSION_SUFFIX}"
+  PARENT_SCOPE)    
+endfunction()
+
+function(make_flucoma_version_string_with_sha output_variable)
+  
+  make_flucoma_version_string(${output_variable})
+  
+  if(NOT flucoma_CORESHA_ERR AND NOT flucoma_VERSIONSHA_ERR)
+    string(APPEND 
+      ${output_variable}
+      "+sha.${flucoma_VERSION_SHA}.core.sha.${flucoma_CORE_SHA}"
+    )
+  endif()   
+  set(${output_variable} ${${output_variable}} PARENT_SCOPE)
+endfunction()
+
+macro(getsha working_dir output_variable result_variable)
+  execute_process( 
+    COMMAND ${GIT_EXECUTABLE} log -1 --format=%h
+    WORKING_DIRECTORY ${${working_dir}}
+    OUTPUT_VARIABLE ${output_variable}
+    RESULT_VARIABLE ${result_variable}
+    ERROR_QUIET
+    OUTPUT_STRIP_TRAILING_WHITESPACE  
+  )
+endmacro() 
+
+getSha(CMAKE_CURRENT_LIST_DIR flucoma_CORE_SHA flucoma_CORESHA_ERR)
+getSha(CMAKE_SOURCE_DIR flucoma_VERSION_SHA flucoma_VERSIONSHA_ERR)
+
+make_flucoma_version_string(flucoma_VERSION_STRING)
+
+make_flucoma_version_string_with_sha(flucoma_VERSION_STRING_SHA)
+
+file(WRITE 
+  "${CMAKE_CURRENT_SOURCE_DIR}/flucoma.version.rc" "${flucoma_VERSION_STRING}"
+)
+
+configure_file("${CMAKE_CURRENT_LIST_DIR}/script/FluidVersion.cpp.in" "${CMAKE_CURRENT_LIST_DIR}/FluidVersion.cpp" @ONLY)
+
+add_library(flucoma_VERSION_LIB STATIC 
+  "${CMAKE_CURRENT_LIST_DIR}/FluidVersion.cpp"   
+)
+
+target_include_directories(flucoma_VERSION_LIB PRIVATE  
+  "${CMAKE_CURRENT_LIST_DIR}/include"
+)

README.md

@@ -5,7 +5,7 @@ This library comprises a suite of C++ algorithms used by the Fluid Corpus Manipu
 # Dependencies
 
 * [CMake](http://cmake.org) (>=3.11)
-* [Eigen](https://gitlab.com/libeigen/eigen) (3.3.5)
+* [Eigen](https://gitlab.com/libeigen/eigen) (3.4)
 * [HISSTools Library](https://github.com/AlexHarker/HISSTools_Library)
 
 # Building
@@ -65,7 +65,7 @@ If your Intel / AMD chip is too old to support AVX, it probably still supports S
 #### FluCoMa core development team (in alphabetical order)
 Owen Green, Gerard Roma, Pierre Alexandre Tremblay
 
-#### Other contributors:
-Alex Harker, Francesco Cameli
+#### Other contributors (in alphabetical order):
+James Bradbury, Francesco Cameli, Alex Harker, Ted Moore
 
 > This project has received funding from the European Research Council (ERC) under the European Union’s Horizon 2020 research and innovation programme (grant agreement No 725899).