From 0987fade80a7cf3700518fcc0adbc8bdeb55ae99 Mon Sep 17 00:00:00 2001
From: youben11 <ayoub.benaissa@zama.ai>
Date: Fri, 7 Oct 2022 16:57:50 +0100
Subject: [PATCH] fix: parameterize DATAFLOW_EXECUTION in python wheel

---
 .github/workflows/continuous-integration.yml | 4 +++-
 compiler/setup.py                            | 5 ++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
index f4812db09..024818d67 100644
--- a/.github/workflows/continuous-integration.yml
+++ b/.github/workflows/continuous-integration.yml
@@ -257,6 +257,7 @@ jobs:
           cd compiler
           echo "Debug: ccache statistics (prior to the tests):"
           ccache -s
+          export CONCRETE_COMPILER_DATAFLOW_EXECUTION_ENABLED=OFF
           pip3 wheel --no-deps -w ${{ github.workspace }}/wheels .
           delocate-wheel -v $(find ${{ github.workspace }}/wheels/ -name '*macosx*.whl')
           pip3 install $(find ${{ github.workspace }}/wheels/ -name '*macosx*.whl')
@@ -537,7 +538,8 @@ jobs:
         id: build-wheel-macos
         run: |
           cd compiler
-          make Python3_EXECUTABLE=$(which python) python-bindings
+          make Python3_EXECUTABLE=$(which python) DATAFLOW_EXECUTION_ENABLED=OFF python-bindings
+          export CONCRETE_COMPILER_DATAFLOW_EXECUTION_ENABLED=OFF
           pip wheel --no-deps -w ${{ github.workspace }}/wheels .
           delocate-wheel -v $(find ${{ github.workspace }}/wheels/ -name '*macosx*.whl')
           echo "::set-output name=ASSET_NAME::$(find ${{ github.workspace }}/wheels/ -name '*macosx*.whl' | rev |cut -d "/" -f 1 |rev )"
diff --git a/compiler/setup.py b/compiler/setup.py
index 6c16b857d..2618f1a09 100644
--- a/compiler/setup.py
+++ b/compiler/setup.py
@@ -35,7 +35,10 @@ class MakeBuild(build_ext):
             self.build_extension(ext)
 
     def build_extension(self, ext):
-        cmd = ["make", "DATAFLOW_EXECUTION_ENABLED=ON", "CCACHE=ON"]
+        cmd = ["make", "CCACHE=ON"]
+        # default to dataflow_exec to ON
+        dataflow_build = os.environ.get("CONCRETE_COMPILER_DATAFLOW_EXECUTION_ENABLED", "ON")
+        cmd.append(f"DATAFLOW_EXECUTION_ENABLED={dataflow_build}")
         py_exec = os.environ.get("CONCRETE_COMPILER_Python3_EXECUTABLE")
         if py_exec:
             cmd.append(f"Python3_EXECUTABLE={py_exec}")