From 5dc10a9613d2f7550904f57c308c75f6ca377ab2 Mon Sep 17 00:00:00 2001 From: Connor Date: Mon, 21 Oct 2024 11:17:22 +0100 Subject: [PATCH 1/3] DO NOT MERGE Try TSFC branch --- .github/workflows/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0fff428f43..f3e781358a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -83,6 +83,7 @@ jobs: --install defcon \ --install gadopt \ --install asQ \ + --package-branch tsfc connorjward/pyop3 \ || (cat firedrake-install.log && /bin/false) - name: Install test dependencies run: | From cc16879ad450682b3a518429bc969ff9bf6a8c61 Mon Sep 17 00:00:00 2001 From: Connor Date: Mon, 21 Oct 2024 16:12:14 +0100 Subject: [PATCH 2/3] Fix entrypoint logic in SLATE --- firedrake/slate/slac/utils.py | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/firedrake/slate/slac/utils.py b/firedrake/slate/slac/utils.py index cb38dd3a16..bd5c81e23b 100644 --- a/firedrake/slate/slac/utils.py +++ b/firedrake/slate/slac/utils.py @@ -247,13 +247,17 @@ def merge_loopy(slate_loopy, output_arg, builder, var2terminal, name): for tsfc_loopy in tsfc_kernels: slate_wrapper = merge([slate_wrapper, tsfc_loopy]) - names = tsfc_loopy.callables_table - for name in names: + slate_wrapper = merge([slate_wrapper, slate_loopy]) + + # At this point the individual subkernels are no longer callable, we + # only want to access the generated code via the wrapper. + slate_wrapper = slate_wrapper.with_entrypoints({name}) + + for tsfc_loopy in tsfc_kernels: + for name in tsfc_loopy.callables_table: if isinstance(slate_wrapper.callables_table[name], CallableKernel): slate_wrapper = _match_caller_callee_argument_dimension_(slate_wrapper, name) - slate_wrapper = merge([slate_wrapper, slate_loopy]) - names = slate_loopy.callables_table - for name in names: + for name in slate_loopy.callables_table: if isinstance(slate_wrapper.callables_table[name], CallableKernel): slate_wrapper = _match_caller_callee_argument_dimension_(slate_wrapper, name) From f10d158ecd11c2bc58a24f9a7ae7b069aa207643 Mon Sep 17 00:00:00 2001 From: Connor Date: Tue, 22 Oct 2024 15:50:45 +0100 Subject: [PATCH 3/3] fix build.yml --- .github/workflows/build.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f3e781358a..0fff428f43 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -83,7 +83,6 @@ jobs: --install defcon \ --install gadopt \ --install asQ \ - --package-branch tsfc connorjward/pyop3 \ || (cat firedrake-install.log && /bin/false) - name: Install test dependencies run: |