From 897fa2f25771b23b2eac5d7421cf4627f25df5cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Letz?= Date: Sun, 26 Jan 2025 13:36:12 +0100 Subject: [PATCH] Correct rnbo.py for faust2rnbo. Set version to 2.78.6. --- .github/workflows/libfaust.yml | 2 +- COPYING.txt | 2 +- Makefile | 2 +- architecture/faust/export.h | 4 ++-- architecture/max-msp/rnbo.py | 2 +- build/CMakeLists.txt | 2 +- build/MakeRelease.bat | 2 +- build/Makefile | 2 +- compiler/README.md | 20 +++++------------ documentation/compiler/Doxyfile | 2 +- documentation/libfaust/Doxyfile | 2 +- documentation/libfaustremote/Doxyfile | 2 +- documentation/man/README.md | 20 +++++------------ documentation/man/man-header.txt | 2 +- documentation/man/man1/faust.1 | 32 ++++++--------------------- windows/faust.rc | 8 +++---- windows/faustdll.rc | 8 +++---- 17 files changed, 38 insertions(+), 76 deletions(-) diff --git a/.github/workflows/libfaust.yml b/.github/workflows/libfaust.yml index 54ce1fa405..c217d616d9 100644 --- a/.github/workflows/libfaust.yml +++ b/.github/workflows/libfaust.yml @@ -1,7 +1,7 @@ name: libfaust env: - FAUST_VERSION: 2.78.5 + FAUST_VERSION: 2.78.6 FAUSTGEN_VERSION: "1.73" LLVM_PACKAGE_VERSION: "15.0.7" CMAKE_OSX_DEPLOYMENT_TARGET: "10.15" diff --git a/COPYING.txt b/COPYING.txt index bd2971e609..0165d9376d 100644 --- a/COPYING.txt +++ b/COPYING.txt @@ -1,4 +1,4 @@ - FAUST compiler, Version 2.78.5 + FAUST compiler, Version 2.78.6 Copyright (C) 2003-2024 GRAME, Centre National de Creation Musicale Copyright (C) 2023-2024 INRIA --------------------------------------------------------------------- diff --git a/Makefile b/Makefile index 1e62bb2e31..88d2b4d21e 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -version := 2.78.5 +version := 2.78.6 system ?= $(shell uname -s) diff --git a/architecture/faust/export.h b/architecture/faust/export.h index 27a3df5db4..37811396f7 100644 --- a/architecture/faust/export.h +++ b/architecture/faust/export.h @@ -26,12 +26,12 @@ #define __export__ // Version as a global string -#define FAUSTVERSION "2.78.5" +#define FAUSTVERSION "2.78.6" // Version as separated [major,minor,patch] values #define FAUSTMAJORVERSION 2 #define FAUSTMINORVERSION 78 -#define FAUSTPATCHVERSION 5 +#define FAUSTPATCHVERSION 6 // Use FAUST_API for code that is part of the external API but is also compiled in faust and libfaust // Use LIBFAUST_API for code that is compiled in faust and libfaust diff --git a/architecture/max-msp/rnbo.py b/architecture/max-msp/rnbo.py index 366f5b62c0..08bf211aa6 100644 --- a/architecture/max-msp/rnbo.py +++ b/architecture/max-msp/rnbo.py @@ -1490,7 +1490,7 @@ def load_files_create_rnbo_patch( with open(effect_codebox_path) as codebox_file: effect_codebox_code = codebox_file.read() - with open(effect_json_path) as json_file: + with open(effect_json_path, encoding="utf-8") as json_file: json_data = json.load(json_file) effect_items_info_list = extract_items_info(json_data) # print(effect_items_info_list) diff --git a/build/CMakeLists.txt b/build/CMakeLists.txt index e6956f6165..7490c197db 100644 --- a/build/CMakeLists.txt +++ b/build/CMakeLists.txt @@ -3,7 +3,7 @@ project (faust) ####################################### # versions management -set (VERSION 2.78.5) +set (VERSION 2.78.6) macro (get_major_minor_patch version) string( REGEX REPLACE "([0-9]*)\\.([0-9]*)\\.([0-9]*)" "\\1" VERSION_MAJOR ${version} ) string( REGEX REPLACE "([0-9]*)\\.([0-9]*)\\.([0-9]*)" "\\2" VERSION_MINOR ${version} ) diff --git a/build/MakeRelease.bat b/build/MakeRelease.bat index 73054cf213..30496e5935 100644 --- a/build/MakeRelease.bat +++ b/build/MakeRelease.bat @@ -1,7 +1,7 @@ @echo off -SET VERSION=2.78.5 +SET VERSION=2.78.6 SET FAUSTGENVERSION=1.73 SET MYPATH=%cd% diff --git a/build/Makefile b/build/Makefile index ae41f3158a..2ab664c111 100644 --- a/build/Makefile +++ b/build/Makefile @@ -28,7 +28,7 @@ system := $(shell echo $(system) | grep MINGW > /dev/null && echo MINGW || echo # output directories FAUSTDIR ?= faustdir IOSDIR := iosdir -VERSION := 2.78.5 +VERSION := 2.78.6 #=============================================================== # current generator and backends diff --git a/compiler/README.md b/compiler/README.md index f15de85c1a..57118d7c90 100644 --- a/compiler/README.md +++ b/compiler/README.md @@ -1,4 +1,4 @@ -% man(1) Version 2.78.5 (21-January-2025) | Faust man page +% man(1) Version 2.78.6 (26-January-2025) | Faust man page NAME ==== @@ -98,19 +98,14 @@ Code generation options: **-pn** \ **--process-name** \ specify the name of the dsp entry-point instead of process. - **-mcd** \ **--max-copy-delay** \ use a copy delay up to max delay \ and a dense delay (ocpp only) or a ring buffer above (defaut 16 samples). + **-mcd** \ **--max-copy-delay** \ use a copy delay up to max delay \ and a dense delay above (ocpp only) or a ring buffer (defaut 16 samples). - **-udd** \<0|1> **--use-dense-delay** \<0|1> allow use of dense delay instead of short ring buffers (default 1) - **-mcl** \ **--max-copy-loop** \ when using a copy delay, threshold to switch from an inline to a loop based copy of the samples (defaut 4 samples). - - **-mls** \ **--min-loop-samples** \ loop instead of expanded copy **-mdd** \ **--max-dense-delay** \ use a dense delay up to max delay \ (if enough density) and a ring buffer delay above (ocpp only, default 1024). - **-mdy** \ **--min-density** \ minimal density (100*number of delays/max delay) to use a dense delays (ocpp only, default 33). + **-mdy** \ **--min-density** \ minimal density (100*number of delays/max delay) to use a dense delays (ocpp only, default 33). **-dlt** \ **--delay-line-threshold** \ use a mask-based ring buffer delays up to max delay \ and a select based ring buffers above (default INT_MAX samples). - **-ss** \ **--scheduling-strategy** \ 0=deep first, 1=breadth first **-mem** **--memory-manager** allocations done using a custom memory manager. **-mem1** **--memory-manager1** allocations done using a custom memory manager, using the iControl/fControl and iZone/fZone model. @@ -127,21 +122,16 @@ Code generation options: **-inj** \ **--inject** \ inject source file \ into architecture file instead of compiling a dsp file. - **-scal** **--scalar** generate non-vectorized code (default). + **-scal** **--scalar** generate non-vectorized code (default). **-inpl** **--in-place** generates code working when input and output buffers are the same (scalar mode only). - **-vec** **--vectorize** generate easier to vectorize code. + **-vec** **--vectorize** generate easier to vectorize code. **-vs** \ **--vec-size** \ size of the vector (default 32 samples). **-lv** \ **--loop-variant** \ [0:fastest, fixed vector size and a remaining loop (default), 1:simple, variable vector size, 2:fixed, fixed vector size]. - **-fir** **--fir-iir** activate the reconstruction of FIRs and IIRs internally - **-ff** **--factorize-fir-iir** find common factor in FIRs or IIRs coefficients - **-mfs** \ **--max-fir-size** \ maximum size threshold to reconstruct a FIR. Keep as individual delays otherwise (default 1024) - **-fls** \ **--fir-loop-size** \ size threshold to start implementing FIRs using a loop instead of unrolled (default 4) - **-irt** \ **--iir-ring-threshold** \ size threshold to start implementing IIRs using ring buffers instead of copying (default 4) **-omp** **--openmp** generate OpenMP pragmas, activates --vectorize option. **-pl** **--par-loop** generate parallel loops in --openmp mode. diff --git a/documentation/compiler/Doxyfile b/documentation/compiler/Doxyfile index 8c447ad048..4d2975be9f 100644 --- a/documentation/compiler/Doxyfile +++ b/documentation/compiler/Doxyfile @@ -31,7 +31,7 @@ PROJECT_NAME = "FAUST compiler" # This could be handy for archiving the generated documentation or # if some version control system is used. -PROJECT_NUMBER = 2.78.5 +PROJECT_NUMBER = 2.78.6 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) # base path where the generated documentation will be put. diff --git a/documentation/libfaust/Doxyfile b/documentation/libfaust/Doxyfile index 5e6712a3a3..06a6624315 100644 --- a/documentation/libfaust/Doxyfile +++ b/documentation/libfaust/Doxyfile @@ -5,7 +5,7 @@ #--------------------------------------------------------------------------- DOXYFILE_ENCODING = UTF-8 PROJECT_NAME = libfaust -PROJECT_NUMBER = 2.78.5 +PROJECT_NUMBER = 2.78.6 OUTPUT_DIRECTORY = . CREATE_SUBDIRS = NO OUTPUT_LANGUAGE = English diff --git a/documentation/libfaustremote/Doxyfile b/documentation/libfaustremote/Doxyfile index 7e109071dc..ea0db7b1cc 100644 --- a/documentation/libfaustremote/Doxyfile +++ b/documentation/libfaustremote/Doxyfile @@ -5,7 +5,7 @@ #--------------------------------------------------------------------------- DOXYFILE_ENCODING = UTF-8 PROJECT_NAME = libfaustremote -PROJECT_NUMBER = 2.78.5 +PROJECT_NUMBER = 2.78.6 OUTPUT_DIRECTORY = . CREATE_SUBDIRS = NO OUTPUT_LANGUAGE = English diff --git a/documentation/man/README.md b/documentation/man/README.md index f15de85c1a..57118d7c90 100644 --- a/documentation/man/README.md +++ b/documentation/man/README.md @@ -1,4 +1,4 @@ -% man(1) Version 2.78.5 (21-January-2025) | Faust man page +% man(1) Version 2.78.6 (26-January-2025) | Faust man page NAME ==== @@ -98,19 +98,14 @@ Code generation options: **-pn** \ **--process-name** \ specify the name of the dsp entry-point instead of process. - **-mcd** \ **--max-copy-delay** \ use a copy delay up to max delay \ and a dense delay (ocpp only) or a ring buffer above (defaut 16 samples). + **-mcd** \ **--max-copy-delay** \ use a copy delay up to max delay \ and a dense delay above (ocpp only) or a ring buffer (defaut 16 samples). - **-udd** \<0|1> **--use-dense-delay** \<0|1> allow use of dense delay instead of short ring buffers (default 1) - **-mcl** \ **--max-copy-loop** \ when using a copy delay, threshold to switch from an inline to a loop based copy of the samples (defaut 4 samples). - - **-mls** \ **--min-loop-samples** \ loop instead of expanded copy **-mdd** \ **--max-dense-delay** \ use a dense delay up to max delay \ (if enough density) and a ring buffer delay above (ocpp only, default 1024). - **-mdy** \ **--min-density** \ minimal density (100*number of delays/max delay) to use a dense delays (ocpp only, default 33). + **-mdy** \ **--min-density** \ minimal density (100*number of delays/max delay) to use a dense delays (ocpp only, default 33). **-dlt** \ **--delay-line-threshold** \ use a mask-based ring buffer delays up to max delay \ and a select based ring buffers above (default INT_MAX samples). - **-ss** \ **--scheduling-strategy** \ 0=deep first, 1=breadth first **-mem** **--memory-manager** allocations done using a custom memory manager. **-mem1** **--memory-manager1** allocations done using a custom memory manager, using the iControl/fControl and iZone/fZone model. @@ -127,21 +122,16 @@ Code generation options: **-inj** \ **--inject** \ inject source file \ into architecture file instead of compiling a dsp file. - **-scal** **--scalar** generate non-vectorized code (default). + **-scal** **--scalar** generate non-vectorized code (default). **-inpl** **--in-place** generates code working when input and output buffers are the same (scalar mode only). - **-vec** **--vectorize** generate easier to vectorize code. + **-vec** **--vectorize** generate easier to vectorize code. **-vs** \ **--vec-size** \ size of the vector (default 32 samples). **-lv** \ **--loop-variant** \ [0:fastest, fixed vector size and a remaining loop (default), 1:simple, variable vector size, 2:fixed, fixed vector size]. - **-fir** **--fir-iir** activate the reconstruction of FIRs and IIRs internally - **-ff** **--factorize-fir-iir** find common factor in FIRs or IIRs coefficients - **-mfs** \ **--max-fir-size** \ maximum size threshold to reconstruct a FIR. Keep as individual delays otherwise (default 1024) - **-fls** \ **--fir-loop-size** \ size threshold to start implementing FIRs using a loop instead of unrolled (default 4) - **-irt** \ **--iir-ring-threshold** \ size threshold to start implementing IIRs using ring buffers instead of copying (default 4) **-omp** **--openmp** generate OpenMP pragmas, activates --vectorize option. **-pl** **--par-loop** generate parallel loops in --openmp mode. diff --git a/documentation/man/man-header.txt b/documentation/man/man-header.txt index 3908fa8936..d4cc45ca7b 100644 --- a/documentation/man/man-header.txt +++ b/documentation/man/man-header.txt @@ -1,4 +1,4 @@ -% man(1) Version 2.78.5 (21-January-2025) | Faust man page +% man(1) Version 2.78.6 (26-January-2025) | Faust man page NAME ==== diff --git a/documentation/man/man1/faust.1 b/documentation/man/man1/faust.1 index 371080dede..9e7849f7f9 100644 --- a/documentation/man/man1/faust.1 +++ b/documentation/man/man1/faust.1 @@ -1,6 +1,6 @@ .\" Automatically generated by Pandoc 3.1.12.3 .\" -.TH "man" "1" "" "Version 2.78.5 (21\-January\-2025)" "Faust man page" +.TH "man" "1" "" "Version 2.78.6 (26\-January\-2025)" "Faust man page" .SH NAME Faust \- DSP to C/C++, CMajor, Codebox, CSharp, DLang, Interpreter, Java, LLVM IR, Julia, JSFX, Rust and WebAssembly (wast/wasm) @@ -115,19 +115,12 @@ the name of the super class to be used instead of dsp. name of the dsp entry\-point instead of process. .PP \f[B]\-mcd\f[R] \f[B]\-\-max\-copy\-delay\f[R] use a copy delay -up to max delay and a dense delay (ocpp only) or a ring buffer above +up to max delay and a dense delay above (ocpp only) or a ring buffer (defaut 16 samples). .PP -\f[B]\-udd\f[R] <0|1> \f[B]\-\-use\-dense\-delay\f[R] <0|1> allow use -of dense delay instead of short ring buffers (default 1) \f[B]\-mcl\f[R] - \f[B]\-\-max\-copy\-loop\f[R] when using a copy delay, -threshold to switch from an inline to a loop based copy of the samples -(defaut 4 samples). -.PP -\f[B]\-mls\f[R] \f[B]\-\-min\-loop\-samples\f[R] loop instead -of expanded copy \f[B]\-mdd\f[R] \f[B]\-\-max\-dense\-delay\f[R] - use a dense delay up to max delay (if enough density) and a ring -buffer delay above (ocpp only, default 1024). +\f[B]\-mdd\f[R] \f[B]\-\-max\-dense\-delay\f[R] use a dense +delay up to max delay (if enough density) and a ring buffer delay +above (ocpp only, default 1024). .PP \f[B]\-mdy\f[R] \f[B]\-\-min\-density\f[R] minimal density (100*number of delays/max delay) to use a dense delays (ocpp only, @@ -137,9 +130,8 @@ default 33). mask\-based ring buffer delays up to max delay and a select based ring buffers above (default INT_MAX samples). .PP -\f[B]\-ss\f[R] \f[B]\-\-scheduling\-strategy\f[R] 0=deep first, -1=breadth first \f[B]\-mem\f[R] \f[B]\-\-memory\-manager\f[R] -allocations done using a custom memory manager. +\f[B]\-mem\f[R] \f[B]\-\-memory\-manager\f[R] allocations done using a +custom memory manager. .PP \f[B]\-mem1\f[R] \f[B]\-\-memory\-manager1\f[R] allocations done using a custom memory manager, using the iControl/fControl and iZone/fZone @@ -181,16 +173,6 @@ code. vector size and a remaining loop (default), 1:simple, variable vector size, 2:fixed, fixed vector size]. .PP -\f[B]\-fir\f[R] \f[B]\-\-fir\-iir\f[R] activate the reconstruction of -FIRs and IIRs internally \f[B]\-ff\f[R] -\f[B]\-\-factorize\-fir\-iir\f[R] find common factor in FIRs or IIRs -coefficients \f[B]\-mfs\f[R] \f[B]\-\-max\-fir\-size\f[R] -maximum size threshold to reconstruct a FIR. -Keep as individual delays otherwise (default 1024) \f[B]\-fls\f[R] -\f[B]\-\-fir\-loop\-size\f[R] size threshold to start implementing -FIRs using a loop instead of unrolled (default 4) \f[B]\-irt\f[R] -\f[B]\-\-iir\-ring\-threshold\f[R] size threshold to start -implementing IIRs using ring buffers instead of copying (default 4) \f[B]\-omp\f[R] \f[B]\-\-openmp\f[R] generate OpenMP pragmas, activates \-\-vectorize option. .PP diff --git a/windows/faust.rc b/windows/faust.rc index 6d36b22ca8..a64990ff64 100644 --- a/windows/faust.rc +++ b/windows/faust.rc @@ -51,8 +51,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 2,78,5,0 - PRODUCTVERSION 2,78,5,0 + FILEVERSION 2,78,6,0 + PRODUCTVERSION 2,78,6,0 FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x1L @@ -68,12 +68,12 @@ BEGIN BLOCK "040c04b0" BEGIN VALUE "FileDescription", "Faust compiler" - VALUE "FileVersion", "2, 78, 5, 0" + VALUE "FileVersion", "2, 78, 6, 0" VALUE "InternalName", "Faust" VALUE "LegalCopyright", "Copyright (C) 2009-2019 - Grame" VALUE "OriginalFilename", "faust.exe" VALUE "ProductName", "Faust" - VALUE "ProductVersion", "2, 78, 5, 0" + VALUE "ProductVersion", "2, 78, 6, 0" END END BLOCK "VarFileInfo" diff --git a/windows/faustdll.rc b/windows/faustdll.rc index 6d36b22ca8..a64990ff64 100644 --- a/windows/faustdll.rc +++ b/windows/faustdll.rc @@ -51,8 +51,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 2,78,5,0 - PRODUCTVERSION 2,78,5,0 + FILEVERSION 2,78,6,0 + PRODUCTVERSION 2,78,6,0 FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x1L @@ -68,12 +68,12 @@ BEGIN BLOCK "040c04b0" BEGIN VALUE "FileDescription", "Faust compiler" - VALUE "FileVersion", "2, 78, 5, 0" + VALUE "FileVersion", "2, 78, 6, 0" VALUE "InternalName", "Faust" VALUE "LegalCopyright", "Copyright (C) 2009-2019 - Grame" VALUE "OriginalFilename", "faust.exe" VALUE "ProductName", "Faust" - VALUE "ProductVersion", "2, 78, 5, 0" + VALUE "ProductVersion", "2, 78, 6, 0" END END BLOCK "VarFileInfo"