Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix CI #752

Merged
merged 1 commit into from
Jan 6, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ jobs:
runner: [ ubuntu-latest, macos-14 ]
include:
- runner: ubuntu-latest
CC: clang-15
CXX: clang++-15
CLANG: clang-15
CC: clang-17
CXX: clang++-17
CLANG: clang-17
- runner: macos-14
CC: clang # This will be system AppleClang
CXX: clang++ # This will be system AppleClang
Expand Down Expand Up @@ -46,16 +46,16 @@ jobs:
if: runner.os != 'macOS'
uses: petarpetrovt/setup-sde@v2.3

- name: Install Clang 15 (Linux)
- name: Install Clang 17 (Linux)
if: runner.os == 'Linux'
run: |
wget https://apt.llvm.org/llvm.sh
chmod +x llvm.sh
sudo ./llvm.sh 15
sudo ./llvm.sh 17

- name: Install Clang 15 (macOS)
- name: Install Clang 17 (macOS)
if: runner.os == 'macOS'
run: brew install llvm@15
run: brew install llvm@17

- name: Run tox
run: tox
Expand Down
4 changes: 2 additions & 2 deletions apps/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ ROOT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." >/dev/null 2>&1 && pwd)"

## Compiler configuration

: "${CC:=clang-15}"
: "${CXX:=clang++-15}"
: "${CC:=clang-17}"
: "${CXX:=clang++-17}"
: "${CFLAGS:=-march=native}"
: "${CXXFLAGS:=$CFLAGS}"
: "${CMAKE_BUILD_TYPE:=Release}"
Expand Down
12 changes: 6 additions & 6 deletions tests/amx/test_amx_instr.py
Original file line number Diff line number Diff line change
Expand Up @@ -682,7 +682,7 @@ def nine_amx_tiles():
):
test_exe = compiler.compile(
[nine_amx_tiles],
CMAKE_C_COMPILER=os.getenv("CLANG", os.getenv("CC", "clang-15")),
CMAKE_C_COMPILER=os.getenv("CLANG", os.getenv("CC", "clang-17")),
CMAKE_C_FLAGS="-mamx-int8 -mamx-tile",
)

Expand Down Expand Up @@ -812,7 +812,7 @@ def too_many_bytes_i32():
with pytest.raises(MemGenError, match="Number of tile rows must"):
test_exe = compiler.compile(
[too_many_rows],
CMAKE_C_COMPILER=os.getenv("CLANG", os.getenv("CC", "clang-15")),
CMAKE_C_COMPILER=os.getenv("CLANG", os.getenv("CC", "clang-17")),
CMAKE_C_FLAGS="-mamx-int8 -mamx-tile",
)
AMX_TILE.reset_allocations()
Expand All @@ -821,7 +821,7 @@ def too_many_bytes_i32():
with pytest.raises(MemGenError, match="Number of bytes per row"):
test_exe = compiler.compile(
[bad_byte_proc],
CMAKE_C_COMPILER=os.getenv("CLANG", os.getenv("CC", "clang-15")),
CMAKE_C_COMPILER=os.getenv("CLANG", os.getenv("CC", "clang-17")),
CMAKE_C_FLAGS="-mamx-int8 -mamx-tile",
)
AMX_TILE.reset_allocations()
Expand All @@ -839,15 +839,15 @@ def proc_outer():

test_exe = compiler.compile(
[proc_inner],
CMAKE_C_COMPILER=os.getenv("CLANG", os.getenv("CC", "clang-15")),
CMAKE_C_COMPILER=os.getenv("CLANG", os.getenv("CC", "clang-17")),
CMAKE_C_FLAGS="-mamx-int8 -mamx-tile",
)
with pytest.raises(
MemGenError, match="Cannot generate static memory in non-leaf procs"
):
test_exe = compiler.compile(
[proc_outer],
CMAKE_C_COMPILER=os.getenv("CLANG", os.getenv("CC", "clang-15")),
CMAKE_C_COMPILER=os.getenv("CLANG", os.getenv("CC", "clang-17")),
CMAKE_C_FLAGS="-mamx-int8 -mamx-tile",
)
AMX_TILE.reset_allocations()
Expand All @@ -857,7 +857,7 @@ def _run_amx(compiler, sde64, procs, test_source):
test_exe = compiler.compile(
procs,
test_files={"main.c": str(test_source)},
CMAKE_C_COMPILER=os.getenv("CLANG", os.getenv("CC", "clang-15")),
CMAKE_C_COMPILER=os.getenv("CLANG", os.getenv("CC", "clang-17")),
CMAKE_C_FLAGS="-mamx-int8 -mamx-tile",
)

Expand Down
Loading