Skip to content

Commit fab75e7

Browse files
tremblapweefuzzy
andauthored
Dev (#44)
* Wrapper: Update for allocator changes (#40) * Update nightly.yaml * Update release.yml * Update release.yml * Update nightly.yaml Co-authored-by: Owen Green <gungwho@gmail.com>
1 parent c2767c2 commit fab75e7

3 files changed

Lines changed: 8 additions & 7 deletions

File tree

.github/workflows/nightly.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ jobs:
5757
path: release-packaging/FluCoMa-CLI-Mac-nightly.dmg
5858

5959
linux:
60-
runs-on: ubuntu-latest
60+
runs-on: ubuntu-20.04
6161
steps:
6262
- uses: actions/checkout@v3
6363
- uses: flucoma/actions/env@main
@@ -75,7 +75,7 @@ jobs:
7575
path: release-packaging/FluCoMa-CLI-Linux-nightly.tar.gz
7676

7777
release:
78-
runs-on: ubuntu-latest
78+
runs-on: ubuntu-20.04
7979
needs: [windows, linux, macos]
8080
steps:
8181
- uses: actions/download-artifact@v2

.github/workflows/release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ jobs:
5050
path: release-packaging/FluCoMa-CLI-Mac.dmg
5151

5252
linux:
53-
runs-on: ubuntu-latest
53+
runs-on: ubuntu-20.04
5454
outputs:
5555
version: ${{ steps.get-version.outputs.version }}
5656
steps:
@@ -76,7 +76,7 @@ jobs:
7676
working-directory: build/_deps/flucoma-core-src
7777

7878
release:
79-
runs-on: ubuntu-latest
79+
runs-on: ubuntu-20.04
8080
needs: [mac, windows, linux]
8181

8282
steps:

include/FluidCLIWrapper.hpp

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ under the European Union’s Horizon 2020 research and innovation programme
1616
#include <clients/common/OfflineClient.hpp>
1717
#include <clients/common/ParameterSet.hpp>
1818
#include <clients/common/ParameterTypes.hpp>
19+
#include <data/FluidMemory.hpp>
1920
#include <FluidVersion.hpp>
2021
#include <cctype>
2122
#include <chrono>
@@ -402,7 +403,7 @@ class CLIWrapper
402403

403404
static int run(index argc, const char* argv[])
404405
{
405-
ParamSetType params(descriptors());
406+
ParamSetType params(descriptors(), FluidDefaultAllocator());
406407
FlagsType flags;
407408
flags.fill(false);
408409

@@ -460,8 +461,8 @@ class CLIWrapper
460461

461462
// Create client after all parameters are set
462463

463-
ClientType client(params);
464-
Result result;
464+
ClientType client(params, FluidContext());
465+
Result result;
465466

466467
client.enqueue(params);
467468
result = client.process();

0 commit comments

Comments
 (0)