Skip to content

Commit 8d3ec6c

Browse files
author
Farid Zakaria
committed
Removed more unecessary files
* Simplified GitHub action * Removed uneeded ci scripts now * Fixed whitespace
1 parent ee3b6b8 commit 8d3ec6c

File tree

4 files changed

+3
-149
lines changed

4 files changed

+3
-149
lines changed

.github/workflows/buildAndTestCMake.yml

Lines changed: 2 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,6 @@ jobs:
3737
# Only run scheduled CI on main repo
3838
if: (github.repository == 'openxla/stablehlo' || github.event_name != 'schedule')
3939
name: "cmake-build ${{ github.event_name == 'schedule' && '(llvm-project@HEAD)' || ''}}"
40-
env:
41-
LLVM_PROJECT_DIR: "llvm-project"
42-
LLVM_BUILD_DIR: "llvm-build"
43-
STABLEHLO_BUILD_DIR: "stablehlo-build"
44-
STABLEHLO_PYTHON_BUILD_DIR: "stablehlo-python-build"
4540
strategy:
4641
fail-fast: false
4742
runs-on: ${{ github.repository == 'openxla/stablehlo' && 'ubuntu-22.04-64core' || 'ubuntu-22.04' }}
@@ -66,14 +61,6 @@ jobs:
6661
with:
6762
llvm-version: ${{ steps.llvm-version.outputs.version }}
6863

69-
- name: Configure and Build LLVM
70-
shell: bash
71-
run: |
72-
./build_tools/github_actions/ci_build_cmake_llvm.sh "$LLVM_PROJECT_DIR" "$LLVM_BUILD_DIR"
73-
env:
74-
CMAKE_BUILD_TYPE: Release
75-
MLIR_ENABLE_BINDINGS_PYTHON: ON
76-
7764
- name: Fix kernel mmap rnd bits
7865
# Asan in llvm 14 provided in ubuntu 22.04 is incompatible with
7966
# high-entropy ASLR in much newer kernels that GitHub runners are
@@ -84,16 +71,9 @@ jobs:
8471
- name: Build and Test StableHLO (with AddressSanitizer)
8572
shell: bash
8673
run: |
87-
./build_tools/github_actions/ci_build_cmake.sh "$LLVM_BUILD_DIR" "$STABLEHLO_BUILD_DIR"
88-
env:
89-
CMAKE_BUILD_TYPE: Release
90-
STABLEHLO_ENABLE_BINDINGS_PYTHON: OFF
91-
STABLEHLO_ENABLE_SANITIZER: address
74+
cmake --build --preset debug --target check-stablehlo-ci
9275
9376
- name: Build and Test StableHLO (with Python bindings)
9477
shell: bash
9578
run: |
96-
./build_tools/github_actions/ci_build_cmake.sh "$LLVM_BUILD_DIR" "$STABLEHLO_BUILD_DIR"
97-
env:
98-
CMAKE_BUILD_TYPE: Release
99-
STABLEHLO_ENABLE_BINDINGS_PYTHON: ON
79+
cmake --build --preset debug-python --target check-stablehlo-ci

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ elseif(NOT STABLEHLO_BUILD_EMBEDDED)
116116
set(LLVM_RUNTIME_OUTPUT_INTDIR ${CMAKE_BINARY_DIR}/llvm-project/bin)
117117
set(LLVM_LIBRARY_OUTPUT_INTDIR ${CMAKE_BINARY_DIR}/llvm-project/lib)
118118
set(LLVM_TOOLS_BINARY_DIR ${CMAKE_BINARY_DIR}/llvm-project/bin)
119-
119+
120120
list(APPEND CMAKE_MESSAGE_INDENT " ")
121121
set(_BUNDLED_LLVM_CMAKE_SOURCE_SUBDIR "llvm-project/llvm")
122122
add_subdirectory("${_BUNDLED_LLVM_CMAKE_SOURCE_SUBDIR}" "llvm-project" EXCLUDE_FROM_ALL)

build_tools/github_actions/ci_build_cmake.sh

Lines changed: 0 additions & 63 deletions
This file was deleted.

build_tools/github_actions/ci_build_cmake_llvm.sh

Lines changed: 0 additions & 63 deletions
This file was deleted.

0 commit comments

Comments
 (0)