Skip to content

Commit

Permalink
Correct rnbo.py for faust2rnbo. Set version to 2.78.6.
Browse files Browse the repository at this point in the history
  • Loading branch information
sletz committed Jan 26, 2025
1 parent 28b9ed3 commit 897fa2f
Show file tree
Hide file tree
Showing 17 changed files with 38 additions and 76 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/libfaust.yml
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
2 changes: 1 addition & 1 deletion COPYING.txt
Original file line number Diff line number Diff line change
@@ -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
---------------------------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version := 2.78.5
version := 2.78.6

system ?= $(shell uname -s)

Expand Down
4 changes: 2 additions & 2 deletions architecture/faust/export.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion architecture/max-msp/rnbo.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion build/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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} )
Expand Down
2 changes: 1 addition & 1 deletion build/MakeRelease.bat
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
@echo off


SET VERSION=2.78.5
SET VERSION=2.78.6
SET FAUSTGENVERSION=1.73

SET MYPATH=%cd%
Expand Down
2 changes: 1 addition & 1 deletion build/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
20 changes: 5 additions & 15 deletions compiler/README.md
Original file line number Diff line number Diff line change
@@ -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
====
Expand Down Expand Up @@ -98,19 +98,14 @@ Code generation options:

**-pn** \<name> **--process-name** \<name> specify the name of the dsp entry-point instead of process.

**-mcd** \<n> **--max-copy-delay** \<n> use a copy delay up to max delay \<n> and a dense delay (ocpp only) or a ring buffer above (defaut 16 samples).
**-mcd** \<n> **--max-copy-delay** \<n> use a copy delay up to max delay \<n> 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** \<n> **--max-copy-loop** \<n> when using a copy delay, threshold to switch from an inline to a loop based copy of the samples (defaut 4 samples).

**-mls** \<n> **--min-loop-samples** \<n> loop instead of expanded copy
**-mdd** \<n> **--max-dense-delay** \<n> use a dense delay up to max delay \<n> (if enough density) and a ring buffer delay above (ocpp only, default 1024).

**-mdy** \<n> **--min-density** \<n> minimal density (100*number of delays/max delay) to use a dense delays (ocpp only, default 33).
**-mdy** \<n> **--min-density** \<n> minimal density (100*number of delays/max delay) to use a dense delays (ocpp only, default 33).

**-dlt** \<n> **--delay-line-threshold** \<n> use a mask-based ring buffer delays up to max delay \<n> and a select based ring buffers above (default INT_MAX samples).

**-ss** \<n> **--scheduling-strategy** \<n> 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.
Expand All @@ -127,21 +122,16 @@ Code generation options:

**-inj** \<f> **--inject** \<f> inject source file \<f> 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** \<n> **--vec-size** \<n> size of the vector (default 32 samples).

**-lv** \<n> **--loop-variant** \<n> [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** \<n> **--max-fir-size** \<n> maximum size threshold to reconstruct a FIR. Keep as individual delays otherwise (default 1024)
**-fls** \<n> **--fir-loop-size** \<n> size threshold to start implementing FIRs using a loop instead of unrolled (default 4)
**-irt** \<n> **--iir-ring-threshold** \<n> 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.
Expand Down
2 changes: 1 addition & 1 deletion documentation/compiler/Doxyfile
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion documentation/libfaust/Doxyfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion documentation/libfaustremote/Doxyfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
20 changes: 5 additions & 15 deletions documentation/man/README.md
Original file line number Diff line number Diff line change
@@ -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
====
Expand Down Expand Up @@ -98,19 +98,14 @@ Code generation options:

**-pn** \<name> **--process-name** \<name> specify the name of the dsp entry-point instead of process.

**-mcd** \<n> **--max-copy-delay** \<n> use a copy delay up to max delay \<n> and a dense delay (ocpp only) or a ring buffer above (defaut 16 samples).
**-mcd** \<n> **--max-copy-delay** \<n> use a copy delay up to max delay \<n> 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** \<n> **--max-copy-loop** \<n> when using a copy delay, threshold to switch from an inline to a loop based copy of the samples (defaut 4 samples).

**-mls** \<n> **--min-loop-samples** \<n> loop instead of expanded copy
**-mdd** \<n> **--max-dense-delay** \<n> use a dense delay up to max delay \<n> (if enough density) and a ring buffer delay above (ocpp only, default 1024).

**-mdy** \<n> **--min-density** \<n> minimal density (100*number of delays/max delay) to use a dense delays (ocpp only, default 33).
**-mdy** \<n> **--min-density** \<n> minimal density (100*number of delays/max delay) to use a dense delays (ocpp only, default 33).

**-dlt** \<n> **--delay-line-threshold** \<n> use a mask-based ring buffer delays up to max delay \<n> and a select based ring buffers above (default INT_MAX samples).

**-ss** \<n> **--scheduling-strategy** \<n> 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.
Expand All @@ -127,21 +122,16 @@ Code generation options:

**-inj** \<f> **--inject** \<f> inject source file \<f> 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** \<n> **--vec-size** \<n> size of the vector (default 32 samples).

**-lv** \<n> **--loop-variant** \<n> [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** \<n> **--max-fir-size** \<n> maximum size threshold to reconstruct a FIR. Keep as individual delays otherwise (default 1024)
**-fls** \<n> **--fir-loop-size** \<n> size threshold to start implementing FIRs using a loop instead of unrolled (default 4)
**-irt** \<n> **--iir-ring-threshold** \<n> 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.
Expand Down
2 changes: 1 addition & 1 deletion documentation/man/man-header.txt
Original file line number Diff line number Diff line change
@@ -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
====
Expand Down
32 changes: 7 additions & 25 deletions documentation/man/man1/faust.1
Original file line number Diff line number Diff line change
@@ -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)
Expand Down Expand Up @@ -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] <n> \f[B]\-\-max\-copy\-delay\f[R] <n> use a copy delay
up to max delay <n> and a dense delay (ocpp only) or a ring buffer above
up to max delay <n> 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]
<n> \f[B]\-\-max\-copy\-loop\f[R] <n> 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] <n> \f[B]\-\-min\-loop\-samples\f[R] <n> loop instead
of expanded copy \f[B]\-mdd\f[R] <n> \f[B]\-\-max\-dense\-delay\f[R]
<n> use a dense delay up to max delay <n> (if enough density) and a ring
buffer delay above (ocpp only, default 1024).
\f[B]\-mdd\f[R] <n> \f[B]\-\-max\-dense\-delay\f[R] <n> use a dense
delay up to max delay <n> (if enough density) and a ring buffer delay
above (ocpp only, default 1024).
.PP
\f[B]\-mdy\f[R] <n> \f[B]\-\-min\-density\f[R] <n> minimal density
(100*number of delays/max delay) to use a dense delays (ocpp only,
Expand All @@ -137,9 +130,8 @@ default 33).
mask\-based ring buffer delays up to max delay <n> and a select based
ring buffers above (default INT_MAX samples).
.PP
\f[B]\-ss\f[R] <n> \f[B]\-\-scheduling\-strategy\f[R] <n> 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
Expand Down Expand Up @@ -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] <n> \f[B]\-\-max\-fir\-size\f[R] <n>
maximum size threshold to reconstruct a FIR.
Keep as individual delays otherwise (default 1024) \f[B]\-fls\f[R] <n>
\f[B]\-\-fir\-loop\-size\f[R] <n> size threshold to start implementing
FIRs using a loop instead of unrolled (default 4) \f[B]\-irt\f[R] <n>
\f[B]\-\-iir\-ring\-threshold\f[R] <n> 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
Expand Down
8 changes: 4 additions & 4 deletions windows/faust.rc
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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"
Expand Down
8 changes: 4 additions & 4 deletions windows/faustdll.rc
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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"
Expand Down

0 comments on commit 897fa2f

Please sign in to comment.