Skip to content

Commit ba24128

Browse files
tremblaptremblap
authored
Merge pull request #194 from flucoma/pre-production
[release] 1.0.9
2 parents 25b1383 + f2bd6e6 commit ba24128

File tree

17 files changed

+168
-47
lines changed

17 files changed

+168
-47
lines changed

‎.github/workflows/feature.yml‎

Lines changed: 82 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,82 @@
1+
name: feature
2+
3+
on:
4+
workflow_dispatch:
5+
6+
7+
concurrency:
8+
group: environment-${{ github.ref }}
9+
cancel-in-progress: true
10+
11+
jobs:
12+
macbuild:
13+
runs-on: macos-latest
14+
steps:
15+
- uses: actions/checkout@v3
16+
- uses: flucoma/actions/env@main
17+
- uses: flucoma/actions/sc@main
18+
with:
19+
branch: origin/main
20+
core_branch: origin/${{ github.ref_name }}
21+
build_type: "Test"
22+
23+
- name: sign binaries
24+
uses: flucoma/actions/distribution@main
25+
with:
26+
glob: '-e scx'
27+
package: 'install'
28+
output_type: 'dmg'
29+
output: FluCoMa-SC-Mac-nightly
30+
cert: ${{ secrets.CERT }}
31+
certpwd: ${{ secrets.CERTPWD }}
32+
teamid: ${{ secrets.WWDRTEAMID }}
33+
apppwd: ${{ secrets.APPSTORECONNECTPWD }}
34+
appusr: ${{ secrets.APPSTORECONNECTUSERNAME }}
35+
36+
- uses: actions/[email protected]
37+
with:
38+
name: macbuild
39+
path: install/FluCoMa-SC-Mac-nightly.dmg
40+
41+
winbuild:
42+
runs-on: windows-latest
43+
steps:
44+
- uses: actions/checkout@v3
45+
- uses: flucoma/actions/env@main
46+
- uses: flucoma/actions/sc@main
47+
with:
48+
branch: origin/main
49+
core_branch: origin/${{ github.ref_name }}
50+
build_type: "Test"
51+
52+
- name: remove pdb files
53+
run: Remove-Item install -Recurse -Include *.pdb
54+
55+
- name: compress archive
56+
run: 7z a FluCoMa-SC-Windows-x64-nightly.zip FluidCorpusManipulation
57+
working-directory: install
58+
59+
- uses: actions/[email protected]
60+
with:
61+
name: winbuild
62+
path: install/FluCoMa-SC-Windows-x64-nightly.zip
63+
64+
65+
linuxbuild:
66+
runs-on: ubuntu-22.04
67+
steps:
68+
- uses: actions/checkout@v3
69+
- uses: flucoma/actions/env@main
70+
- uses: flucoma/actions/sc@main
71+
with:
72+
branch: origin/main
73+
core_branch: origin/${{ github.ref_name }}
74+
build_type: "Test"
75+
76+
- name: compress archive
77+
run: tar -zcvf FluCoMa-SC-Linux-x64-nightly.tar.gz FluidCorpusManipulation
78+
working-directory: install
79+
- uses: actions/[email protected]
80+
with:
81+
name: linuxbuild
82+
path: install/FluCoMa-SC-Linux-x64-nightly.tar.gz

‎.github/workflows/nightly.yaml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -50,17 +50,17 @@ jobs:
5050
run: Remove-Item install -Recurse -Include *.pdb
5151

5252
- name: compress archive
53-
run: 7z a FluCoMa-SC-Windows-nightly.zip FluidCorpusManipulation
53+
run: 7z a FluCoMa-SC-Windows-x64-nightly.zip FluidCorpusManipulation
5454
working-directory: install
5555

5656
- uses: actions/[email protected]
5757
with:
5858
name: winbuild
59-
path: install/FluCoMa-SC-Windows-nightly.zip
59+
path: install/FluCoMa-SC-Windows-x64-nightly.zip
6060

6161

6262
linuxbuild:
63-
runs-on: ubuntu-20.04
63+
runs-on: ubuntu-22.04
6464
steps:
6565
- uses: actions/checkout@v3
6666
- uses: flucoma/actions/env@main
@@ -69,15 +69,15 @@ jobs:
6969
branch: origin/main
7070

7171
- name: compress archive
72-
run: tar -zcvf FluCoMa-SC-Linux-nightly.tar.gz FluidCorpusManipulation
72+
run: tar -zcvf FluCoMa-SC-Linux-x64-nightly.tar.gz FluidCorpusManipulation
7373
working-directory: install
7474
- uses: actions/[email protected]
7575
with:
7676
name: linuxbuild
77-
path: install/FluCoMa-SC-Linux-nightly.tar.gz
77+
path: install/FluCoMa-SC-Linux-x64-nightly.tar.gz
7878

7979
release:
80-
runs-on: ubuntu-20.04
80+
runs-on: ubuntu-22.04
8181
needs: [macbuild, winbuild, linuxbuild]
8282
steps:
8383

‎.github/workflows/release.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -44,16 +44,16 @@ jobs:
4444
run: Remove-Item install -Recurse -Include *.pdb
4545

4646
- name: compress archive
47-
run: 7z a FluCoMa-SC-Windows.zip FluidCorpusManipulation
47+
run: 7z a FluCoMa-SC-Windows-x64.zip FluidCorpusManipulation
4848
working-directory: install
4949

5050
- uses: actions/[email protected]
5151
with:
5252
name: winbuild
53-
path: install/FluCoMa-SC-Windows.zip
53+
path: install/FluCoMa-SC-Windows-x64.zip
5454

5555
linuxbuild:
56-
runs-on: ubuntu-20.04
56+
runs-on: ubuntu-22.04
5757
outputs:
5858
version: ${{ steps.get-version.outputs.version }}
5959
steps:
@@ -64,20 +64,20 @@ jobs:
6464
branch: origin/${{ github.ref_name }}
6565

6666
- name: compress archive
67-
run: tar -zcvf FluCoMa-SC-Linux.tar.gz FluidCorpusManipulation
67+
run: tar -zcvf FluCoMa-SC-Linux-x64.tar.gz FluidCorpusManipulation
6868
working-directory: install
6969

7070
- uses: actions/[email protected]
7171
with:
7272
name: linuxbuild
73-
path: install/FluCoMa-SC-Linux.tar.gz
73+
path: install/FluCoMa-SC-Linux-x64.tar.gz
7474

7575
- id: get-version
7676
run: echo "version=$(cat flucoma.version.rc)" >> $GITHUB_OUTPUT
7777
working-directory: build/_deps/flucoma-core-src
7878

7979
release:
80-
runs-on: ubuntu-20.04
80+
runs-on: ubuntu-22.04
8181
needs: [macbuild, winbuild, linuxbuild]
8282

8383
steps:

‎README.md‎

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,24 @@ Also, with CMake you have a choice of which build system you use.
3333

3434
- The default on macOS and Linux is `Unix Makefiles`. On macOS you can also use Xcode by passing `-GXcode` to CMake when you first run it.
3535
- The default on Windows is the latest version of Visual Studio installed. However, Visual Studio can open CMake files directly as projects, which has some upsides. When used this way, CMake variables have to be set via a JSON file that MSVC will use to configure CMake.
36+
## The `DOCS` option
37+
The CMake option `DOCS` controls whether or not to generate the documentation for the FluCoMa objects. It is on by default. However, building the documentation is slightly involved and requires that you have a working Python 3 installation, among other things (see https://github.com/flucoma/flucoma-docs).
38+
39+
If you just want some binaries, it could be simpler to disable this and just take some documentation from a release download:
40+
41+
```bash
42+
mkdir -p build && cd build
43+
cmake -DSC_PATH=</path/to/sc> -DDOCS=OFF ..
44+
make install
45+
```
46+
47+
48+
49+
50+
51+
52+
53+
3654

3755
## Using Manual Dependencies
3856

@@ -51,16 +69,17 @@ cmake -DSC_PATH=<location of your SC source> -DFLUID_PATH=<location of Fluid Cor
5169

5270
To find out which branches / tags / commits of these we use, look in the top level `CMakeLists.txt` of the Fluid Corpus Manipulation Library for the `FetchContent_Declare` statements for each dependency.
5371

72+
5473
## Compiling for different CPUs
5574

56-
The build system generally assumes an x86 cpu with AVX instructions (most modern x86 CPUs). To build on another kind of CPU (e.g. older than 2012) you can use the `FLUID_ARCH` cache variable to pass specific flags to your compiler. For example use `-DFLUID_ARCH=-mcpu=native` to optimize for your particular CPU.
75+
The build system generally assumes an x86/x64 cpu with SSE instructions or Apple Silicon. To build on another kind of CPU (e.g. older than 2012) you can use the `FLUID_ARCH` cache variable to pass specific flags to your compiler. For example use `-DFLUID_ARCH=-mcpu=native` to optimize for your particular CPU.
5776

5877
For ARM, we use the following default set of flags (with the Bela in mind):
5978

6079
```
6180
-march=armv7-a -mtune=cortex-a8 -mfloat-abi=hard -mfpu=neon
6281
```
63-
=======
82+
6483
This will assemble a package in `release-packaging`.
6584

6685
## Credits

‎include/FluidSCWrapper.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ under the European Union’s Horizon 2020 research and innovation programme
1414
#include "wrapper/DeriveBaseClass.hpp"
1515
#include "wrapper/NonRealtime.hpp"
1616
#include "wrapper/Realtime.hpp"
17-
#include <FluidVersion.hpp>
17+
#include <flucoma/FluidVersion.hpp>
1818

1919
namespace fluid {
2020
namespace client {

‎include/SCBufferAdaptor.hpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ under the European Union’s Horizon 2020 research and innovation programme
1111
#pragma once
1212

1313
#include <boost/align/aligned_alloc.hpp>
14-
#include <clients/common/BufferAdaptor.hpp>
15-
#include <data/FluidTensor.hpp>
14+
#include <flucoma/clients/common/BufferAdaptor.hpp>
15+
#include <flucoma/data/FluidTensor.hpp>
1616
#include <SC_Errors.h>
1717
#include <SC_PlugIn.h>
1818
#include <cctype>

‎include/clients/rt/FluidDataSetWr.hpp‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
#pragma once
22

3-
#include <clients/common/FluidBaseClient.hpp>
4-
#include <clients/common/FluidNRTClientWrapper.hpp>
5-
#include <clients/common/MessageSet.hpp>
6-
#include <clients/common/OfflineClient.hpp>
7-
#include <clients/common/ParameterSet.hpp>
8-
#include <clients/common/ParameterTypes.hpp>
9-
#include <clients/common/Result.hpp>
10-
#include <clients/common/SharedClientUtils.hpp>
11-
#include <clients/nrt/CommonResults.hpp>
12-
#include <clients/nrt/DataSetClient.hpp>
13-
#include <data/FluidDataSet.hpp>
14-
#include <data/FluidIndex.hpp>
15-
#include <data/FluidTensor.hpp>
16-
#include <data/TensorTypes.hpp>
3+
#include <flucoma/clients/common/FluidBaseClient.hpp>
4+
#include <flucoma/clients/common/FluidNRTClientWrapper.hpp>
5+
#include <flucoma/clients/common/MessageSet.hpp>
6+
#include <flucoma/clients/common/OfflineClient.hpp>
7+
#include <flucoma/clients/common/ParameterSet.hpp>
8+
#include <flucoma/clients/common/ParameterTypes.hpp>
9+
#include <flucoma/clients/common/Result.hpp>
10+
#include <flucoma/clients/common/SharedClientUtils.hpp>
11+
#include <flucoma/clients/nrt/CommonResults.hpp>
12+
#include <flucoma/clients/nrt/DataSetClient.hpp>
13+
#include <flucoma/data/FluidDataSet.hpp>
14+
#include <flucoma/data/FluidIndex.hpp>
15+
#include <flucoma/data/FluidTensor.hpp>
16+
#include <flucoma/data/TensorTypes.hpp>
1717
#include <string>
1818

1919
namespace fluid {

‎include/wrapper/ArgsFromClient.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#pragma once
22

33
#include "Meta.hpp"
4-
#include <data/FluidMemory.hpp>
4+
#include <flucoma/data/FluidMemory.hpp>
55
#include <fmt/format.h>
66

77
namespace fluid {

‎include/wrapper/ArgsToClient.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#pragma once
22

3-
#include <data/FluidMemory.hpp>
3+
#include <flucoma/data/FluidMemory.hpp>
44

55
namespace fluid {
66
namespace client {

‎include/wrapper/Meta.hpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#pragma once
22

3-
#include <clients/nrt/FluidSharedInstanceAdaptor.hpp>
4-
#include <clients/common/FluidNRTClientWrapper.hpp>
5-
#include <clients/common/SharedClientUtils.hpp>
3+
#include <flucoma/clients/nrt/FluidSharedInstanceAdaptor.hpp>
4+
#include <flucoma/clients/common/FluidNRTClientWrapper.hpp>
5+
#include <flucoma/clients/common/SharedClientUtils.hpp>
66

77
namespace fluid {
88
namespace client {

0 commit comments

Comments
 (0)