Merge pull request #34 from t3tra-dev/feat/ci-workflow

Author: t3tra

.github/workflows/ci.yml

@@ -0,0 +1,72 @@
+name: CI
+
+on:
+  push:
+  pull_request:
+
+  workflow_dispatch:
+
+jobs:
+  ci:
+    name: CI
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+          submodules: recursive
+
+      - name: Set up Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: "3.12"
+
+      - name: Install uv
+        uses: astral-sh/setup-uv@v4
+
+      - name: Install Dependencies
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y clang cmake ninja-build
+          wget https://github.com/sharkdp/hyperfine/releases/download/v1.20.0/hyperfine_1.20.0_amd64.deb
+          sudo dpkg -i hyperfine_1.20.0_amd64.deb
+          pip install nanobind pybind11
+          uv sync
+
+      - name: Cache LLVM/MLIR build
+        id: cache-llvm
+        uses: actions/cache@v4
+        with:
+          path: third_party/llvm-project/build
+          key: llvm-mlir-${{ runner.os }}-${{ hashFiles('third_party/CMakeLists.txt', 'third_party/llvm-project/llvm/CMakeLists.txt') }}
+
+      - name: Build LLVM/MLIR
+        if: steps.cache-llvm.outputs.cache-hit != 'true'
+        run: |
+          cmake -B third_party/build -S third_party
+          cmake --build third_party/build
+
+      - name: Vendor MLIR Python modules
+        run: |
+          cmake \
+            -DSRC_DIR=third_party/llvm-project/build/tools/mlir/python_packages/mlir_core/mlir \
+            -DDEST_DIR=src/lython/mlir \
+            -P third_party/cmake/vendor_mlir.cmake
+
+      - name: Build Lython
+        run: |
+          export pybind11_DIR=$(python -c "import pybind11; print(pybind11.get_cmake_dir())")
+          uv run cmake -B build -S . -Dpybind11_DIR=$pybind11_DIR
+          uv run cmake --build build
+
+      - name: Test
+        run: |
+          ./build/bin/lyc jit examples/hello.py
+          ./build/bin/lyc jit examples/oop.py
+
+      - name: Benchmarks
+        run: |
+          ./build/bin/lyc examples/fib.py -o fib_aot
+          ./build/bin/lyc examples/fib_prim.py -o fib_prim_aot
+          hyperfine -w 1 -r 5 "python3 examples/fib.py" "./build/bin/lyc jit examples/fib.py" "./fib_aot" "./fib_prim_aot"

CMakeLists.txt

@@ -10,8 +10,20 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 
-set(MLIR_DIR "${CMAKE_CURRENT_SOURCE_DIR}/third_party/llvm-project/build/lib/cmake/mlir")
-set(LLVM_DIR "${CMAKE_CURRENT_SOURCE_DIR}/third_party/llvm-project/build/lib/cmake/llvm")
+find_package(Python3 3.12 EXACT REQUIRED COMPONENTS Interpreter Development)
+message(STATUS "Python3_EXECUTABLE: ${Python3_EXECUTABLE}")
+message(STATUS "Python3_VERSION: ${Python3_VERSION}")
+
+if(NOT Python3_VERSION_MAJOR EQUAL 3 OR NOT Python3_VERSION_MINOR EQUAL 12)
+    message(FATAL_ERROR "Python 3.12 is required, but found ${Python3_VERSION}")
+endif()
+
+set(LLVM_PROJECT_BUILD_DIR "${CMAKE_CURRENT_SOURCE_DIR}/third_party/llvm-project/build")
+set(MLIR_DIR "${LLVM_PROJECT_BUILD_DIR}/lib/cmake/mlir")
+set(LLVM_DIR "${LLVM_PROJECT_BUILD_DIR}/lib/cmake/llvm")
+
+set(LLVM_TABLEGEN_EXE "${LLVM_PROJECT_BUILD_DIR}/bin/llvm-tblgen" CACHE FILEPATH "llvm-tblgen executable")
+set(MLIR_TABLEGEN_EXE "${LLVM_PROJECT_BUILD_DIR}/bin/mlir-tblgen" CACHE FILEPATH "mlir-tblgen executable")
 
 find_package(MLIR REQUIRED CONFIG)
 find_package(LLVM REQUIRED CONFIG)

README.md

@@ -9,17 +9,38 @@
 
 ---
 
-セットアップ
+## セットアップ
+
+### 必要なもの
+
+- Python 3.12
+- CMake 3.20+
+- Ninja
+- C++17 対応コンパイラ
+- uv (Python パッケージマネージャ)
+- nanobind, pybind11
+
+### ビルド手順
 
 ```bash
 git clone --recurse-submodules https://github.com/t3tra-dev/lython.git
 cd lython
 uv sync
-source ./.venv/bin/activate
-./build_mlir.sh
-./build.sh
-./vendor_mlir.sh
-uv build
+
+# LLVM/MLIR (初回のみ、時間がかかります)
+uv run cmake -B third_party/build -S third_party
+uv run cmake --build third_party/build
+
+# Lython 本体
+uv run cmake -B build -S .
+uv run cmake --build build
+```
+
+### 実行
+
+```bash
+./build/bin/lyc jit examples/hello.py
+./build/bin/lyc jit examples/fib.py
 ```
 
 ---

build.sh

@@ -1,6 +1,13 @@
-set(PYBIND11_FINDPYTHON ON)
+set(PYBIND11_FINDPYTHON OFF)
+set(PYTHON_EXECUTABLE ${Python3_EXECUTABLE})
+set(PYTHON_INCLUDE_DIRS ${Python3_INCLUDE_DIRS})
+set(PYTHON_LIBRARIES ${Python3_LIBRARIES})
+set(PYBIND11_PYTHON_VERSION ${Python3_VERSION})
+
 find_package(pybind11 CONFIG REQUIRED)
 
+message(STATUS "Building PyDialectInitializer for Python ${Python3_VERSION} (${Python3_EXECUTABLE})")
+
 pybind11_add_module(PyDialectInitializer MODULE
   PyDialectPythonBindings.cpp
 )
@@ -12,9 +19,17 @@ set_target_properties(PyDialectInitializer
     LIBRARY_OUTPUT_DIRECTORY "${CMAKE_SOURCE_DIR}/src/lython/mlir/_mlir_libs"
 )
 
+set(MLIR_PYTHON_CAPI_LIB "${CMAKE_SOURCE_DIR}/src/lython/mlir/_mlir_libs")
+
 target_link_libraries(PyDialectInitializer
   PRIVATE
     PyDialect
+    "${MLIR_PYTHON_CAPI_LIB}/libMLIRPythonCAPI${CMAKE_SHARED_LIBRARY_SUFFIX}"
+)
+
+set_target_properties(PyDialectInitializer PROPERTIES
+    BUILD_RPATH "${MLIR_PYTHON_CAPI_LIB}"
+    INSTALL_RPATH "${MLIR_PYTHON_CAPI_LIB}"
 )
 
 target_include_directories(PyDialectInitializer

build_mlir.sh

@@ -2,6 +2,8 @@
 
 #include <cstdint>
 
+#include "objects/bool.h"
+#include "objects/dict.h"
 #include "objects/float.h"
 #include "objects/function.h"
 #include "objects/long.h"