pipeline debug

llvm · May 17, 2024 · c490e4d · c490e4d
1 parent 74c38e6
commit c490e4d
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/.github/workflows/pycdePublish.yml b/.github/workflows/pycdePublish.yml
@@ -44,8 +44,6 @@ jobs:
           CIBW_BUILD: ${{ matrix.python-env }}
           CIBW_ENVIRONMENT: >
             CMAKE_GENERATOR=Ninja
-            CC=clang
-            CXX=clang++
             SETUPTOOLS_SCM_DEBUG=True
             BUILD_TYPE=RelWithAsserts
             RUN_TESTS=True

diff --git a/frontends/PyCDE/setup.py b/frontends/PyCDE/setup.py
@@ -45,7 +45,6 @@ class CMakeBuild(build_py):
 
   def run(self):
     target_dir = self.build_lib
-    test = os.getenv("RUN_TESTS")
     cmake_build_dir = os.getenv("PYCDE_CMAKE_BUILD_DIR")
     if not cmake_build_dir:
       cmake_build_dir = os.path.join(target_dir, "..", "cmake_build")
@@ -68,6 +67,7 @@ def run(self):
         "-DCIRCT_ENABLE_FRONTENDS=PyCDE",
         "-DLLVM_EXTERNAL_PROJECTS=circt",
         "-DLLVM_EXTERNAL_CIRCT_SOURCE_DIR={}".format(circt_dir),
+        "-DESI_RUNTIME=ON",
     ]
     if "CC" in os.environ:
       cmake_args += [f"-DCMAKE_C_COMPILER={os.environ['CC']}"]
@@ -96,7 +96,8 @@ def run(self):
         "check-pycde",
     ] + build_args,
                           cwd=cmake_build_dir)
-    if test.lower() == "true":
+
+    if "RUN_TESTS" in os.environ and os.environ["RUN_TESTS"] != "false":
       subprocess.check_call([
           "cmake",
           "--build",

diff --git a/lib/Dialect/ESI/runtime/CMakeLists.txt b/lib/Dialect/ESI/runtime/CMakeLists.txt
@@ -241,7 +241,9 @@ if (WHEEL_BUILD)
 endif()
 
 # Pybind11 is used to wrap the ESIRuntime APIs.
-find_package(Python3 COMPONENTS Interpreter Development)
+if(NOT DEFINED Python3_FOUND)
+  find_package(Python3 COMPONENTS Interpreter Development)
+endif()
 if(Python3_FOUND)
   IF(MSVC)
     # Work around an issue with pybind11 and cmake incompatibility on Windows in debug mode.

diff --git a/lib/Dialect/OM/CMakeLists.txt b/lib/Dialect/OM/CMakeLists.txt
@@ -20,6 +20,7 @@ add_circt_dialect_library(
   MLIROMIncGen
   MLIROMAttrIncGen
   MLIROMOpInterfacesIncGen
+  MLIRBuiltinTypeInterfacesIncGen
 
   LINK_COMPONENTS
   Support