Merge remote-tracking branch 'origin/main' into flash_attention

Author: yifeizh2

.github/dockerfiles/env/Dockerfile

@@ -74,7 +74,7 @@ RUN echo "conda prefix after installing jupyterhub: $(du --human-readable --summ
 # install infractl, lit
 RUN set -e; \
     . ${CONDA_PREFIX}/etc/profile.d/conda.sh; \
-    conda create --name python-3.9 python=3.9 ipykernel s3cmd dvc; \
+    conda create --name python-3.9 python=3.9 ipykernel s3cmd dvc numpy; \
     conda activate python-3.9; \
     pip --no-cache-dir install infractl lit
 

.github/dockerfiles/env/build.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 REGISTRY=localhost:5000
-TAG=graph-compiler-env:0.0.11
+TAG=graph-compiler-env:0.0.13
 
 set -e
 

.github/dockerfiles/env/entrypoint.sh

@@ -58,6 +58,4 @@ jupyter kernelspec remove -y python3 || true
 # Remove lost+found
 rm -rf lost+found
 
-find ~/.conda -name '*singleuser'
-
 exec jupyterhub-singleuser

.github/dockerfiles/runner/Dockerfile

@@ -10,13 +10,14 @@ RUN set -ex; \
     curl -sSL https://cli.github.com/packages/githubcli-archive-keyring.gpg > /usr/share/keyrings/githubcli-archive-keyring.gpg; \
     apt-get update -y; \
     apt-get install -y --no-install-recommends --fix-missing \
-      python3-pip \
+      python3-pip python3-dev \
       cmake gcc g++ ninja-build git clang-format \
       gh \
+      libomp-dev \
     ; \
     rm -rf /var/lib/apt/lists/*
 
-RUN pip install lit
+RUN pip install lit numpy
 
 USER runner
 WORKDIR $HOME

.github/dockerfiles/runner/build.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 REGISTRY=localhost:5000
-TAG=graph-compiler-runner:latest
+TAG=graph-compiler-runner:0.0.2
 
 kubectl -n docker-registry port-forward svc/docker-registry 5000:5000 &
 

.github/workflows/build-llvm.yml

@@ -2,6 +2,10 @@ name: LLVM Build
 
 on:
   workflow_dispatch:
+  push:
+    paths:
+      - cmake/llvm-version.txt
+      - .github/workflows/build-llvm.yml
 
 permissions: read-all
 
@@ -24,9 +28,10 @@ jobs:
 
       - name: Build
         run: |
+          python3 -m pip install -r mlir/python/requirements.txt
           mkdir llvm-install
-          cmake -G Ninja llvm -B build -DCMAKE_INSTALL_PREFIX=llvm-install \
-            -DCMAKE_BUILD_TYPE=Release -DLLVM_ENABLE_ASSERTIONS=true -DLLVM_ENABLE_PROJECTS="mlir" -DLLVM_TARGETS_TO_BUILD="X86" -DLLVM_INSTALL_UTILS=true -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DLLVM_INSTALL_GTEST=ON
+          cmake -G Ninja llvm -B build -DCMAKE_INSTALL_PREFIX=llvm-install -DMLIR_ENABLE_BINDINGS_PYTHON=ON -DPython3_EXECUTABLE=$(which python3) \
+            -DCMAKE_BUILD_TYPE=Release -DLLVM_ENABLE_ASSERTIONS=true -DLLVM_ENABLE_PROJECTS="mlir" -DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD="SPIRV" -DLLVM_TARGETS_TO_BUILD="X86" -DLLVM_INSTALL_UTILS=true -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DLLVM_INSTALL_GTEST=ON
           cmake --build build --target install
           cd llvm-install
           tar -zcf ../llvm.tgz .

.github/workflows/build.yml

@@ -1,6 +1,7 @@
 name: Graph Compiler build
 
 on:
+  workflow_dispatch:
   push:
     branches:
       - main
@@ -21,6 +22,22 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
+      - name: Set LLVM hash
+        run: |
+          echo LLVM_HASH=$(cat cmake/llvm-version.txt) >>$GITHUB_ENV
+
+      - name: Fetch requirements for python binding
+        uses: actions/checkout@v4
+        with:
+          repository: llvm/llvm-project
+          ref: ${{ env.LLVM_HASH }}
+          sparse-checkout: mlir/python/requirements.txt
+          sparse-checkout-cone-mode: false
+          path: llvm-dep
+
+      - name: Install requirements
+        run: python3 -m pip install -r llvm-dep/mlir/python/requirements.txt
+
       - name: Build
         run: |
           scripts/compile.sh

.github/workflows/clang-tidy.yml

@@ -62,7 +62,7 @@ jobs:
     - name: Get changed files
       run: |
         cd graph-compiler
-        echo "CHANGED_FILES=$(git diff --name-only $MERGE_BASE ${{ github.event.pull_request.head.sha }} | paste -sd' ')" >> $GITHUB_ENV
+        echo "CHANGED_FILES=$(git diff --name-only --diff-filter=d $MERGE_BASE ${{ github.event.pull_request.head.sha }} | paste -sd' ')" >> $GITHUB_ENV
         
     - name: Prepare Environment
       shell: bash
@@ -102,4 +102,4 @@ jobs:
       shell: bash
       run: |
         cd build
-        python3 ../llvm-project/clang-tools-extra/clang-tidy/tool/run-clang-tidy.py -warnings-as-errors=* -p ./ -config-file ../llvm-project/mlir/.clang-tidy -clang-tidy-binary $(which clang-tidy) ${{ env.CHANGED_FILES }}
+        python3 ../llvm-project/clang-tools-extra/clang-tidy/tool/run-clang-tidy.py -warnings-as-errors=* -p ./ -config-file ../llvm-project/mlir/.clang-tidy -clang-tidy-binary $(which clang-tidy-15) ${{ env.CHANGED_FILES }}

.github/workflows/license.yml

@@ -26,7 +26,7 @@ jobs:
 
       - name: Get changed files
         run: |
-          echo "CHANGED_FILES=`git diff --name-only $MERGE_BASE ${{ github.event.pull_request.head.sha }} | paste -sd,`" >> $GITHUB_ENV
+          echo "CHANGED_FILES=`git diff --name-only --diff-filter=d $MERGE_BASE ${{ github.event.pull_request.head.sha }} | paste -sd,`" >> $GITHUB_ENV
 
       - name: Perform license check
         run: "python scripts/license.py --files $CHANGED_FILES"

CMakeLists.txt

@@ -20,13 +20,15 @@ project(GraphCompiler VERSION "0.1.0" LANGUAGES C CXX)
 
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
+set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -O0")
 
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
 
 option(GC_LEGACY_ENABLE ON)
 option(GC_TEST_ENABLE "Build the tests" ON)
+option(GC_USE_GPU "Enable GPU backend" OFF)
 option(GC_ENABLE_BINDINGS_PYTHON "Enable Graph Complier Python Binding" ON)
 option(GC_DEV_LINK_LLVM_DYLIB "Link dynamic libraries of LLVM and MLIR. For developers only. Do not use it in packing the library." OFF)
 
@@ -51,6 +53,13 @@ include(AddLLVM)
 include(AddMLIR)
 include(HandleLLVMOptions)
 
+if(GC_USE_GPU)
+  include(imex)
+  if(GC_DEV_LINK_LLVM_DYLIB)
+    message(WARN "GPU backend may not be compatible with dynamic linking to LLVM")
+  endif()
+endif()
+
 if(GC_ENABLE_BINDINGS_PYTHON AND NOT MLIR_ENABLE_BINDINGS_PYTHON)
   message(STATUS "Failed to enable Python API due to the 'MLIR_ENABLE_BINDINGS_PYTHON' for LLVM is not ON.")
   set(GC_ENABLE_BINDINGS_PYTHON OFF CACHE BOOL "" FORCE)
@@ -95,13 +104,12 @@ if(GC_ENABLE_BINDINGS_PYTHON)
 endif()
 
 set(GC_LIB_LINKED_LIBS
-        GCPasses
-        GCAnalysis
-        MLIROneDNNGraph
+        GCJitWrapper
+        GCCpuRuntime
 )
-add_library(graph_compiler SHARED ${GC_LIB_SOURCES})
+add_mlir_library(graph_compiler SHARED ${GC_LIB_SOURCES})
 target_include_directories(graph_compiler PUBLIC ${GC_LIB_INCLUDES})
-target_compile_options(graph_compiler PRIVATE -fvisibility=hidden)
+target_compile_options(graph_compiler PRIVATE -fvisibility=hidden -fexceptions)
 target_link_options(graph_compiler PRIVATE -Wl,--gc-sections)
 target_link_libraries(graph_compiler PRIVATE ${GC_LIB_LINKED_LIBS})