Skip to content

Commit

Permalink
Removed more unecessary files
Browse files Browse the repository at this point in the history
* Simplified GitHub action
* Removed uneeded ci scripts now
* Fixed whitespace
  • Loading branch information
fzakaria committed Mar 22, 2024
1 parent ee3b6b8 commit 8d3ec6c
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 149 deletions.
24 changes: 2 additions & 22 deletions .github/workflows/buildAndTestCMake.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,6 @@ jobs:
# Only run scheduled CI on main repo
if: (github.repository == 'openxla/stablehlo' || github.event_name != 'schedule')
name: "cmake-build ${{ github.event_name == 'schedule' && '(llvm-project@HEAD)' || ''}}"
env:
LLVM_PROJECT_DIR: "llvm-project"
LLVM_BUILD_DIR: "llvm-build"
STABLEHLO_BUILD_DIR: "stablehlo-build"
STABLEHLO_PYTHON_BUILD_DIR: "stablehlo-python-build"
strategy:
fail-fast: false
runs-on: ${{ github.repository == 'openxla/stablehlo' && 'ubuntu-22.04-64core' || 'ubuntu-22.04' }}
Expand All @@ -66,14 +61,6 @@ jobs:
with:
llvm-version: ${{ steps.llvm-version.outputs.version }}

- name: Configure and Build LLVM
shell: bash
run: |
./build_tools/github_actions/ci_build_cmake_llvm.sh "$LLVM_PROJECT_DIR" "$LLVM_BUILD_DIR"
env:
CMAKE_BUILD_TYPE: Release
MLIR_ENABLE_BINDINGS_PYTHON: ON

- name: Fix kernel mmap rnd bits
# Asan in llvm 14 provided in ubuntu 22.04 is incompatible with
# high-entropy ASLR in much newer kernels that GitHub runners are
Expand All @@ -84,16 +71,9 @@ jobs:
- name: Build and Test StableHLO (with AddressSanitizer)
shell: bash
run: |
./build_tools/github_actions/ci_build_cmake.sh "$LLVM_BUILD_DIR" "$STABLEHLO_BUILD_DIR"
env:
CMAKE_BUILD_TYPE: Release
STABLEHLO_ENABLE_BINDINGS_PYTHON: OFF
STABLEHLO_ENABLE_SANITIZER: address
cmake --build --preset debug --target check-stablehlo-ci
- name: Build and Test StableHLO (with Python bindings)
shell: bash
run: |
./build_tools/github_actions/ci_build_cmake.sh "$LLVM_BUILD_DIR" "$STABLEHLO_BUILD_DIR"
env:
CMAKE_BUILD_TYPE: Release
STABLEHLO_ENABLE_BINDINGS_PYTHON: ON
cmake --build --preset debug-python --target check-stablehlo-ci
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ elseif(NOT STABLEHLO_BUILD_EMBEDDED)
set(LLVM_RUNTIME_OUTPUT_INTDIR ${CMAKE_BINARY_DIR}/llvm-project/bin)
set(LLVM_LIBRARY_OUTPUT_INTDIR ${CMAKE_BINARY_DIR}/llvm-project/lib)
set(LLVM_TOOLS_BINARY_DIR ${CMAKE_BINARY_DIR}/llvm-project/bin)

list(APPEND CMAKE_MESSAGE_INDENT " ")
set(_BUNDLED_LLVM_CMAKE_SOURCE_SUBDIR "llvm-project/llvm")
add_subdirectory("${_BUNDLED_LLVM_CMAKE_SOURCE_SUBDIR}" "llvm-project" EXCLUDE_FROM_ALL)
Expand Down
63 changes: 0 additions & 63 deletions build_tools/github_actions/ci_build_cmake.sh

This file was deleted.

63 changes: 0 additions & 63 deletions build_tools/github_actions/ci_build_cmake_llvm.sh

This file was deleted.

0 comments on commit 8d3ec6c

Please sign in to comment.