[Release] 1.0.0-beta5 (flucoma#138)

* copy the misc folder in installation target

* Add relative path file writing for data objects

In principle consistent with other Max objects (which aren't wholly 
consistent in edge cases)

* reset points if dict is successfully parsed

* crediting (flucoma#78)

crediting the new team

* update kdtree help file

* add fluid.stats~ and change category to statistical analysis

* move stft and add fluid.grid~

* grid out help file real estate

* adds fluid.plotter to the autocomplete objectlist

* adds fluid.waveform~ to objectlist

* first tab beautified

* reorder latency message

* getlatency after changing preset

* Transients Help File (flucoma#82)

* grid out help file

* update transients~ help file

* ci/automatic building (flucoma#29)

* incorporate Ted's changes and recommendations

Revert "fix pre/post cmake"

This reverts commit 7d04ffb.

Create does-it-build.yml

does it build?

consume SDK

curl the 8.0.3 SDK

add a ls stage for sanity

remove cmake flags for OSX architectures

move list cmd

add working directories for steps that urn in build

use macos as runner

use ninja for build process

add specific name for build

will write a text file named foo to the home directory

see if we can headless max patchers

also build on the ci branch

Buf2List: tidy up and add a 'buffer' message for immediate processing

Revert "fat binaries"

This reverts commit 35ef645.

Revert "build script"

This reverts commit 1ee3f5a.

# Conflicts:
#	create.sh

Initialize dumpDictionary pointer in MaxWrapper explicitly, as this is assumed in destructor

removed dangling script naming to buf2list

corrected buf2list use in mlpclass

corrected interface of mds to make it more interactive

updated buf2list2buf helpfiles with doc

dial back automatic patch testing in workflow

* Adjust cmake to handle changes to Max SDK from 8.2 onwards (flucoma#32)

* Adjust cmake to handle changes to Max SDK from 8.2 onwards

* correct typo

* Update macos-build-test.yml

use the latest sdk from github

* you actually have to git clone...

* only build ampslice for now

* test releasing

* make names + commits

* give a proper asset name

* use ref for tag

* Update macos-build-test.yml

* spell prerelease properly

* change convention for naming n stuff

* Update macos-build-test.yml

* add windows-build script

* quotes around path for windows

* test a composite workflow

* update composite

* make a nightly action

* now check to see if we can build and see an external

* update infrastructure

* check with cached outputs too

* pre check in the right place

* dont check a non-existant file

* remove nightly cache workflow

* build and combine

* remove bad line

* do some sanity checks for cleaning

* inspect what is going on

* cleanup ls -R and change to latest macos

* see if we can copy the entire externals folder

* check

* now build fat and see

* remove mistake space

* get uname

* get clang version

* get system info

* try some silicon black magic

* use custom core

* use https

* check if core is there

* core is only one folder up

* make a release again

* make externals early

* 🩴 :burger:

* pass DCMAKE_APPLE flag

* full install of max

* make release builds on windows

* remove pdbs from release-packaging

* dont remove pdb files

* fix paths because they have spaces 👿

* try and deal with the hell that is windows

* now release it!

* try again

* only build on dev and ci branches

* now with DDOCS=ON

* ddocs off

* provide a more detailed tag for nightly builds

* also make docs

* use blas compilation branch (temporarily)

* fix malformed paths

* missing -D

* take max_ref and merge with final compile

* delete nightly before remaking it

* delete extraneous experimental patch

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

* dont use BLAS branch (fixed in pr#67)

* remove dangling line

* use dev branch of flucoma core for ci

* cleanup english and patching on tab 2

* deferlow on file load (was failing before)

* update cosmetics

* point to /reference/sines in the learn platform not ampslice

* add learn and flucoma.org links

* apply 10x10 grid

* cancel previous runs if a new push is made

* Only need 1 outlet

* update outlet assistance

* update outlet 1 assist

* change tag name of nightly to be versionless

* Remove per-PR merge checks

* update bufselect

* add links to top of file

* initial cleanup

* patcher for linking to learn articles more easily

* changes to chroma help file

* remove spaces from installation path name (flucoma#90)

* fix references to spaced package name in CI

* sorted the package-info with a few fun anachronicisms

* missed a space in macbuild target

* only do a release on dev branch

* only do a release on dev branch

* trigger build on PR

* remove per PR building

* remove release checking

* add a deferlow to fluid.learn

* provide a small musical example on first tab

* add chroma frequency calculation

* replace list.change with zl.change

* human unit test maxpat

* make a soundful demonstration on each tab

* fix incorrect refrences to previous help files

* update positioning of online reference/flucoma link

* Fix fluid.learn abstraction not displaying properly (flucoma#101)

* initial cleanup

* changes to chroma help file

* add a deferlow to fluid.learn

* provide a small musical example on first tab

* add chroma frequency calculation

* replace list.change with zl.change

* make a soundful demonstration on each tab

* fix incorrect refrences to previous help files

* update positioning of online reference/flucoma link

* update fluid.learn patch to render more reliably

* Load media files from package abstraction (flucoma#102)

* a preliminary go at the bufloader

* tighten regex and implement auto loading

* add second tab for curating statistics with bufselect

* add cosmetic upgrades to second tab and neaten first tab

* fix loading woes with fluid.learn

* more cosmetic upgrades to patch

* cosmetic upgrades to chroma

* [Review Changes] BufChroma Help File (flucoma#98)

* update fluid.bufchroma~ help file

* Fix fluid.learn abstraction not displaying properly (flucoma#101)

* initial cleanup

* changes to chroma help file

* add a deferlow to fluid.learn

* provide a small musical example on first tab

* add chroma frequency calculation

* replace list.change with zl.change

* make a soundful demonstration on each tab

* fix incorrect refrences to previous help files

* update positioning of online reference/flucoma link

* update fluid.learn patch to render more reliably

* Load media files from package abstraction (flucoma#102)

* a preliminary go at the bufloader

* tighten regex and implement auto loading

* stripping back of first tab

* an interactive playback mechanism with chroma data

* chroma lookup

* add more detail tab

* polish patch

* layout fixes for help patch

* [Review Changes] KDTree Help File (flucoma#92)

* more cleanup on fluid.kdtree

* separate tabs

* add analysis data

* cleanup tab 1

* add presliced corpus points

* add a tab simplifying the explanation

* cosmetic upgrades

* add numbered instructions

* [CI] Refactor and use composite actions (flucoma#106)

* use flucoma actions

* use composite actions to build windows

* remove duplicate env setu

* use maxdocs composite action

* do CI on every ci located branch

* Re-enable building docs as part of ALL

* [CI] Fat Binaries (flucoma#107)

* do CI on every ci located branch

* bump to v3

* [CI] Actions@v4 (flucoma#108)

* do CI on every ci located branch

* use v4 of actions

* update docs

* Re-enable building docs as part of ALL

* [CI] Fat Binaries (flucoma#107)

* do CI on every ci located branch

* bump to v3

* [CI] Actions@v4 (flucoma#108)

* do CI on every ci located branch

* use v4 of actions

* update docs

* indentation

* remove duplicate

* typo

* [CI] Fix Documentation Build (flucoma#115)

* fix ci docs component

* make release all the time

* use ubuntu latest for building docs

* [Enhance] Update fluid.waveform~ (flucoma#116)

* update to translational api layer

* use new api in help file

* buf -> buffer

* alias indicesbuffer to addmarkers

* update help to reflect internal api

* singular for methods

* update waveform help

* fix pluarlisation of methods and arguments

* update help file for fluid.waveform

* various cosmetic upgrades (flucoma#103)

* BufNNDSVD Help File (flucoma#88)

* update bufnndsvd~ helpfile

* add playback to the help file

* [Docs] Fix Layout issues in BufChroma help (flucoma#117)

* fixes layout issues of bufchroma

* fix bufcompose load issue

* Update fluid.sines~.maxhelp

* update dataset help file (flucoma#120)

* labelset cosmetics

* remove frombuffer tab

* [Docs] Blocking Help Tab (flucoma#121)

* add back blocking attribute

* add attribute blocking to bufnndsvd

* add tab to bufstft

* add tab to bufselect

* change release action

* [Docs] BufLoudness Help (flucoma#122)

* griddify help file

* remove js starter

* experiment with waveform-based interface

* first tab done (possibly)

* finish multichannel tab

* PAs changes

* [Docs] Loudness Help File (flucoma#118)

* shell out loudness second tab

* cosmetic updates to second tab

* update second tab

* PA suggestions

* typo

* more typos

* [Docs] Audiotransport Help File (flucoma#105)

* work on audiotransport help file

* add fluid.learn abstraction

* cosmetic updates

* [Enhance] Retrieve toy DataSets (flucoma#126)

* pull datasets from the location specificed in PR 88 of core

* pull datasets to misc

* also add an abstraction for loading datasets

* update help file with new asset names

* add misc to ignore

* copy from Data instead of DataSets

* copy resources on cmake configure

* moved patchers from misc to patchers

* delete the files tracked by mistake

* update bufchroma to have an adaptive number of chroma (flucoma#129)

* AmpSlice Help File (flucoma#81)

* griddify help file

* in progress work for explaining thresholds and curves

* update bpatchers for providing linkage to sites

* update ampslice to be more friendly and clear

* add margin to link helper bpatchers (so they display correctly on load)

* update help file to accomodate bpatcher changes

* make text box way longer than it needs to be.

* update cosmetics

* update with review advice

* update learn subpatchers

* shuffle cosmetics

* update bufaudiotransport names (flucoma#131)

* Update nightly.yaml

Add workflow dispatch for manual launch

* correct docs path variable in CMake

* [Docs] Grid Help File (flucoma#110)

* add datasets that can be reused for examples

* update to fluid.grid helpfile

* try and make learn load in the right order...

* update aesthetics and separation of tabs

* cosmetic upgrades

* Revert "add datasets that can be reused for examples"

This reverts commit 20f58a3e972867a7947ae6946d1862be67afd2f6.

* update dataloader abstraction

* fix layout with new dataset loader

* Max buffer references weren't being freed safely (ASan) (flucoma#132)

* update quickstart

* [Fix] fluid.plotter~ clear label data (flucoma#135)

* fix single quotes

* remove old var

* clear all of the data that we need to clear

* re-order precedence of colouring (flucoma#136)

Co-authored-by: weefuzzy <gungwho@gmail.com>
Co-authored-by: tremblap <info@pierrealexandretremblay.com>
Co-authored-by: Timo Hoogland <timohoogland@gmail.com>
Co-authored-by: James Bradbury <jamesbradbury93@gmail.com>
Co-authored-by: Ted Moore <ted@tedmooremusic.com>

Author: 6 people

.gitignore

@@ -15,6 +15,7 @@ tmp
 **/package-info.json
 media
 docs
+misc
 interfaces/max.db.json
 interfaces/flucoma-obj-qlookup.json
 /.vs

CMakeLists.txt

@@ -68,6 +68,8 @@ FetchContent_GetProperties(flucoma-core)
 if(NOT flucoma-core_POPULATED)
   FetchContent_Populate(flucoma-core)
   add_subdirectory(${flucoma-core_SOURCE_DIR} ${flucoma-core_BINARY_DIR})  
+  file(GLOB FLUCOMA_CORE_RESOURCES ${flucoma-core_SOURCE_DIR}/Resources/Data/*.*)
+  file(COPY ${FLUCOMA_CORE_RESOURCES} DESTINATION ${CMAKE_CURRENT_SOURCE_DIR}/misc)
   include(flucoma_version)
   include(flucoma-buildtools)
   include(flucoma-buildtype)
@@ -78,6 +80,9 @@ set_if_toplevel(VAR CMAKE_LIBRARY_OUTPUT_DIRECTORY
                 SUPERBUILD "${CMAKE_SOURCE_DIR}/max_externals")
 
 if(DOCS)
+  
+  set(MAX_DOC_OUT "${CMAKE_SOURCE_DIR}/docs" CACHE PATH "")
+  
   if(FLUID_DOCS_PATH)
     get_filename_component(
       FETCHCONTENT_SOURCE_DIR_FLUCOMA-DOCS ${FLUID_DOCS_PATH} ABSOLUTE
@@ -92,13 +97,9 @@ if(DOCS)
     add_subdirectory(${flucoma-docs_SOURCE_DIR} ${flucoma-docs_BINARY_DIR})
   endif()
 
-  set(MAX_DOC_PATH "${CMAKE_SOURCE_DIR}/docs" CACHE PATH "")
-  # add_custom_target(MAX_MAKE_DOCS ALL)
-  # add_dependencies(MAX_MAKE_DOCS MAKE_MAX_REF)  
-  # add_custom_command(TARGET MAX_MAKE_DOCS POST_BUILD
-  #   COMMAND ${CMAKE_COMMAND} -E copy_directory "${FLUID_MAX_REF_PATH}"  "${CMAKE_CURRENT_SOURCE_DIR}/docs"
-  #   COMMENT "${MAX_DOC_PATH}"
-  # )
+
+  
+  add_custom_target(MAX_MAKE_DOCS ALL DEPENDS MAKE_MAX_REF)
 endif()
 
 # Misc setup and subroutines
@@ -128,10 +129,10 @@ endforeach ()
 #install bits. Max packages bundle Windows and Mac builds together
 set(CMAKE_INSTALL_PREFIX "${CMAKE_CURRENT_SOURCE_DIR}/release-packaging")
 set(MAX_INSTALL_PREFIX "." CACHE PATH "Prefix for assembling max package")
-set(FLUID_PACKAGE_NAME "Fluid Corpus Manipulation" CACHE STRING "Name for published package")
+set(FLUID_PACKAGE_NAME "FluidCorpusManipulation" CACHE STRING "Name for published package")
 set(MAX_PACKAGE_ROOT ${MAX_INSTALL_PREFIX}/${FLUID_PACKAGE_NAME})
 
-foreach(PACKAGE_DIRECTORY examples;extras;help;init;patchers;interfaces;javascript;jsui)
+foreach(PACKAGE_DIRECTORY examples;extras;help;init;patchers;interfaces;javascript;jsui;misc)
   install(DIRECTORY ${PACKAGE_DIRECTORY} DESTINATION ${MAX_PACKAGE_ROOT})
 endforeach(PACKAGE_DIRECTORY)
 
@@ -140,16 +141,18 @@ install(DIRECTORY ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/
         FILES_MATCHING REGEX "\\.(mxo|mxe|mxe64)")
 
 # install(CODE [[ message(STATUS "${flucoma-core_SOURCE_DIR}") ]])
-install(DIRECTORY "${flucoma-core_SOURCE_DIR}/AudioFiles/" 
-        DESTINATION "${MAX_PACKAGE_ROOT}/media")
+install(DIRECTORY "${flucoma-core_SOURCE_DIR}/Resources/AudioFiles/" 
+        DESTINATION ${MAX_PACKAGE_ROOT}/media)
+install(DIRECTORY "${flucoma-core_SOURCE_DIR}/Resources/Data/"
+        DESTINATION ${MAX_PACKAGE_ROOT}/misc)
 install(FILES icon.png package-info.json QuickStart.md 
         DESTINATION ${MAX_PACKAGE_ROOT})
 install(FILES ${flucoma-core_SOURCE_DIR}/distribution.lic 
         DESTINATION ${MAX_PACKAGE_ROOT} 
         RENAME LICENSE.md)
 
 if(DOCS)
-  install(DIRECTORY "${MAX_DOC_PATH}/" 
+  install(DIRECTORY "${MAX_DOC_OUT}/" 
           DESTINATION "${MAX_PACKAGE_ROOT}/docs"  
           PATTERN "*.xml")
 endif()

QuickStart.md

@@ -6,6 +6,8 @@
 
 There is now an 'extras' giving the overview of the toolbox, and a shortcut (shift-f) to create fluid.* objects. Full documentation, and examples, are also available.
 
+> We use `maxsubstitution` in the various text files of the `init` folder of the package. If you are using Max 7 you will see an error "max doesn't understand definesubstitution". You can ignore this. 
+
 #### Enjoy!
 
 > 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).

README.md

@@ -29,8 +29,8 @@ This will assemble a package in `release-packaging`.
 #### 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
 
 --
 

extras/Fluid Corpus Manipulation Toolkit.maxpat

@@ -10,7 +10,7 @@
 		}
 ,
 		"classnamespace" : "box",
-		"rect" : [ 437.0, 79.0, 935.0, 795.0 ],
+		"rect" : [ 437.0, 87.0, 935.0, 795.0 ],
 		"bglocked" : 0,
 		"openinpresentation" : 1,
 		"default_fontsize" : 12.0,
@@ -330,10 +330,10 @@
 					"maxclass" : "comment",
 					"numinlets" : 1,
 					"numoutlets" : 0,
-					"patching_rect" : [ 664.0, 718.707512999999949, 266.0, 22.0 ],
+					"patching_rect" : [ 664.0, 718.707512999999949, 266.0, 21.0 ],
 					"presentation" : 1,
-					"presentation_rect" : [ 616.020935000000009, 424.19876099999999, 266.0, 22.0 ],
-					"text" : "undocumented😬",
+					"presentation_rect" : [ 616.020935000000009, 424.19876099999999, 266.0, 21.0 ],
+					"text" : "A set of data associated with identifiers.",
 					"textcolor" : [ 0.129412, 0.129412, 0.129412, 0.6 ]
 				}
 
@@ -474,7 +474,7 @@
 					"patching_rect" : [ 657.0, 803.165829000000031, 342.0, 35.0 ],
 					"presentation" : 1,
 					"presentation_rect" : [ 616.020935000000009, 387.19876099999999, 284.479034000000013, 35.0 ],
-					"text" : "fluid.list2buf",
+					"text" : "fluid.dataset~",
 					"textcolor" : [ 0.129412, 0.129412, 0.129412, 0.82 ]
 				}
 
@@ -723,7 +723,7 @@
 					"maxclass" : "bpatcher",
 					"numinlets" : 1,
 					"numoutlets" : 1,
-					"offset" : [ -15.0, -90.0 ],
+					"offset" : [ -1095.0, -555.0 ],
 					"outlettype" : [ "" ],
 					"patcher" : 					{
 						"fileversion" : 1,
@@ -736,7 +736,7 @@
 						}
 ,
 						"classnamespace" : "box",
-						"rect" : [ 35.0, 88.0, 1370.0, 777.0 ],
+						"rect" : [ 35.0, 88.0, 1007.0, 777.0 ],
 						"bglocked" : 1,
 						"openinpresentation" : 1,
 						"default_fontsize" : 12.0,
@@ -1199,7 +1199,7 @@
 									"patching_rect" : [ 1348.274196000000074, 577.580650999999989, 120.0, 21.0 ],
 									"presentation" : 1,
 									"presentation_rect" : [ 1290.0, 570.0, 120.0, 21.0 ],
-									"text" : "Buffer Analysis"
+									"text" : "Statistical Analysis"
 								}
 
 							}
@@ -1712,7 +1712,7 @@
 									"spacing_x" : 1.0,
 									"spacing_y" : 24.0,
 									"tabcolor" : [ 0.012, 0.447, 0.71, 0.5 ],
-									"tabs" : [ "fluid.pca~", "fluid.kmeans~", "fluid.mds~", "fluid.umap~" ]
+									"tabs" : [ "fluid.pca~", "fluid.kmeans~", "fluid.mds~", "fluid.umap~", "fluid.grid~" ]
 								}
 
 							}
@@ -1890,11 +1890,11 @@
 									"parameter_enable" : 0,
 									"patching_rect" : [ 1328.548387000000048, 602.903228000000013, 149.193547999999993, 119.967742999999999 ],
 									"presentation" : 1,
-									"presentation_rect" : [ 1290.0, 585.0, 149.193542000000008, 59.967742999999999 ],
+									"presentation_rect" : [ 1290.0, 585.0, 149.193541999999979, 119.967743000000041 ],
 									"spacing_x" : 1.0,
 									"spacing_y" : 24.0,
 									"tabcolor" : [ 0.012, 0.447, 0.71, 0.5 ],
-									"tabs" : [ "fluid.bufstats~" ]
+									"tabs" : [ "fluid.bufstats~", "fluid.stats~" ]
 								}
 
 							}
@@ -2157,7 +2157,7 @@
 									"numoutlets" : 1,
 									"outlettype" : [ "" ],
 									"patching_rect" : [ 590.903226000000018, 21.0, 50.0, 35.0 ],
-									"text" : "fluid.list2buf"
+									"text" : "fluid.dataset~"
 								}
 
 							}
@@ -2387,7 +2387,7 @@
 									"spacing_x" : 1.0,
 									"spacing_y" : 24.0,
 									"tabcolor" : [ 0.012, 0.447, 0.71, 0.5 ],
-									"tabs" : [ "fluid.bufsines~", "fluid.buftransients~", "fluid.bufhpss~", "fluid.bufnmf~", "fluid.bufstft~" ]
+									"tabs" : [ "fluid.bufsines~", "fluid.buftransients~", "fluid.bufhpss~", "fluid.bufnmf~" ]
 								}
 
 							}
@@ -2431,7 +2431,7 @@
 									"spacing_x" : 1.0,
 									"spacing_y" : 24.0,
 									"tabcolor" : [ 0.012, 0.447, 0.71, 0.5 ],
-									"tabs" : [ "fluid.bufpitch~", "fluid.bufloudness~", "fluid.bufmelbands~", "fluid.bufmfcc~", "fluid.bufspectralshape~", "fluid.bufchroma~", "fluid.bufnndsvd~" ]
+									"tabs" : [ "fluid.bufpitch~", "fluid.bufloudness~", "fluid.bufmelbands~", "fluid.bufmfcc~", "fluid.bufspectralshape~", "fluid.bufchroma~", "fluid.bufnndsvd~", "fluid.bufstft~" ]
 								}
 
 							}
@@ -3872,9 +3872,9 @@
 		"styles" : [ 			{
 				"name" : "max6box",
 				"default" : 				{
+					"textcolor_inverse" : [ 0.0, 0.0, 0.0, 1.0 ],
 					"bgcolor" : [ 1.0, 1.0, 1.0, 0.5 ],
-					"accentcolor" : [ 0.8, 0.839216, 0.709804, 1.0 ],
-					"textcolor_inverse" : [ 0.0, 0.0, 0.0, 1.0 ]
+					"accentcolor" : [ 0.8, 0.839216, 0.709804, 1.0 ]
 				}
 ,
 				"parentstyle" : "",
@@ -3892,6 +3892,7 @@
 , 			{
 				"name" : "max6message",
 				"default" : 				{
+					"textcolor_inverse" : [ 0.0, 0.0, 0.0, 1.0 ],
 					"bgfillcolor" : 					{
 						"type" : "gradient",
 						"color1" : [ 0.866667, 0.866667, 0.866667, 1.0 ],
@@ -3901,8 +3902,7 @@
 						"proportion" : 0.39,
 						"autogradient" : 0
 					}
-,
-					"textcolor_inverse" : [ 0.0, 0.0, 0.0, 1.0 ]
+
 				}
 ,
 				"parentstyle" : "max6box",