Skip to content

Commit 5e99c22

Browse files
committed
test
1 parent 8b9f4db commit 5e99c22

File tree

11 files changed

+15
-9
lines changed

11 files changed

+15
-9
lines changed

.github/workflows/llvm-build.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,17 +63,21 @@ jobs:
6363
run: |
6464
set -euo pipefail
6565
set -x
66-
cd .github/mlir-tensorrt-llvm-distribution-builder
66+
cd mlir-tensorrt/build_tools/mlir-tensorrt-llvm-distribution-builder
6767
# set up pixi environment
6868
apt-get update && apt-get install -y curl mold
6969
curl -fsSL https://pixi.sh/install.sh | bash
7070
export PATH="$HOME/.pixi/bin:$PATH"
71-
pixi install
71+
7272
# Activate pixi environment non-interactively (for CI)
7373
# pixi shell doesn't work in non-interactive environments, so we use eval
7474
eval "$(pixi shell-hook)"
75+
# import mlir python dependencies
7576
export LLVM_PROJECT_DIR=${{ env.LLVM_TARGET_DIR }} && pixi run install-mlir-deps
7677
78+
# install pixi dependencies
79+
pixi install
80+
7781
export CMAKE_BUILD_TYPE=Release
7882
./scripts/build-llvm.sh --target-dir ${{ env.LLVM_TARGET_DIR }} --install-dir ${{ env.LLVM_INSTALL_DIR }}
7983

.github/mlir-tensorrt-llvm-distribution-builder/.gitattributes renamed to mlir-tensorrt/build_tools/mlir-tensorrt-llvm-distribution-builder/.gitattributes

File renamed without changes.

.github/mlir-tensorrt-llvm-distribution-builder/.gitignore renamed to mlir-tensorrt/build_tools/mlir-tensorrt-llvm-distribution-builder/.gitignore

File renamed without changes.

.github/mlir-tensorrt-llvm-distribution-builder/README.md renamed to mlir-tensorrt/build_tools/mlir-tensorrt-llvm-distribution-builder/README.md

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ The llvm package build can be run on a vanilla ubuntu22.04, with cpu only enviro
88

99
```shell
1010
# Clones llvm-project to `./llvm-project` subdirectory and checks out the correct branch
11-
cd TensorRT-Incubator
12-
./mlir-tenosrrt/build_tools/scripts/setup-llvm-dev.sh \
13-
--target-dir ./mlir-tensorrt-llvm-distribution-builder/llvm-project
11+
cd TensorRT-Incubator/mlir-tensorrt
12+
./build_tools/scripts/setup-llvm-dev.sh \
13+
--target-dir ./build_tools/mlir-tensorrt-llvm-distribution-builder/llvm-project
1414
```
1515

1616
## Building
@@ -23,14 +23,16 @@ apt-get update && apt-get install -y curl mold
2323
curl -fsSL https://pixi.sh/install.sh | bash
2424
export PATH="$HOME/.pixi/bin:$PATH"
2525

26-
cd ./.github/mlir-tensorrt-llvm-distribution-builder
27-
# Install dependencies
28-
pixi install
26+
cd ./build_tools/mlir-tensorrt-llvm-distribution-builder
27+
2928
# start pixi shell environment
3029
pixi shell
3130
# install mlir python requirements file
3231
export LLVM_PROJECT_DIR=llvm-project && pixi run install-mlir-deps
3332

33+
# Install dependencies
34+
pixi install
35+
3436
# Builds llvm-project
3537
export CMAKE_BUILD_TYPE=Release
3638
./scripts/build-llvm.sh

.github/mlir-tensorrt-llvm-distribution-builder/cmake/caches/LLVMBuildConfig.cmake renamed to mlir-tensorrt/build_tools/mlir-tensorrt-llvm-distribution-builder/cmake/caches/LLVMBuildConfig.cmake

File renamed without changes.

.github/mlir-tensorrt-llvm-distribution-builder/cmake/toolchains/darmin-aarch64.cmake renamed to mlir-tensorrt/build_tools/mlir-tensorrt-llvm-distribution-builder/cmake/toolchains/darmin-aarch64.cmake

File renamed without changes.

.github/mlir-tensorrt-llvm-distribution-builder/cmake/toolchains/linux-aarch64.cmake renamed to mlir-tensorrt/build_tools/mlir-tensorrt-llvm-distribution-builder/cmake/toolchains/linux-aarch64.cmake

File renamed without changes.

.github/mlir-tensorrt-llvm-distribution-builder/cmake/toolchains/linux-x86_64.cmake renamed to mlir-tensorrt/build_tools/mlir-tensorrt-llvm-distribution-builder/cmake/toolchains/linux-x86_64.cmake

File renamed without changes.

.github/mlir-tensorrt-llvm-distribution-builder/pixi.lock renamed to mlir-tensorrt/build_tools/mlir-tensorrt-llvm-distribution-builder/pixi.lock

File renamed without changes.

.github/mlir-tensorrt-llvm-distribution-builder/pixi.toml renamed to mlir-tensorrt/build_tools/mlir-tensorrt-llvm-distribution-builder/pixi.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ version = "0.1.0"
1111
# Usage: LLVM_PROJECT_DIR=<path> pixi run install-mlir-deps
1212
# Or from within pixi shell: export LLVM_PROJECT_DIR=<path> && pixi run install-mlir-deps
1313
install-mlir-deps = { cmd = ["bash", "-c", "pixi import --format=pypi-txt --feature=mlir-reqs --environment=default \"${LLVM_PROJECT_DIR:-llvm-project}/mlir/python/requirements.txt\""] }
14+
#install-mlir-deps = { cmd = ["bash", "-c", "pip install -r \"${LLVM_PROJECT_DIR:-llvm-project}/mlir/python/requirements.txt\""] }
1415

1516
[dependencies]
1617
clang = ">=21.1.8,<22"
@@ -21,4 +22,3 @@ cmake = ">=4.2.3,<5"
2122
ninja = ">=1.13.2,<2"
2223
clangxx = ">=21.1.8,<22"
2324
pip = "*"
24-

0 commit comments

Comments
 (0)