url/colibri
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #440 from okuvshynov/test_macpro_2019

Browse Source 
fix: old x86 Mac scalar -> vnni
This commit is contained in:
Vincenzo Fornaro
2026-07-20 17:20:31 +02:00
committed by GitHub
parent 0337697023 5c84b25645
commit 505a0f69aa
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
c/Makefile
+7 -1
View File
@@ -58,9 +58,14 @@ CFLAGS = -O3 $(OMPC) -Wall -Wextra -Wno-unused-parameter -Wno-misleading-indent
# Opt-in: ARCH=native appends -mcpu=native (arm64 clang uses -mcpu, not -march), # Opt-in: ARCH=native appends -mcpu=native (arm64 clang uses -mcpu, not -march),
# which unlocks the i8mm SMMLA int8/int4 dot kernels in colibri.c. ARCH unset -> # which unlocks the i8mm SMMLA int8/int4 dot kernels in colibri.c. ARCH unset ->
# no -mcpu, default build byte-identical. Apple clang knows apple-m4 / native. # no -mcpu, default build byte-identical. Apple clang knows apple-m4 / native.
# For older X86_64 Macs (for example, Mac Pro 2019) we need to use -march
ifneq ($(ARCH),) ifneq ($(ARCH),)
ifneq (,$(X86_64))
CFLAGS += -march=$(ARCH)
else
CFLAGS += -mcpu=$(ARCH) CFLAGS += -mcpu=$(ARCH)
endif endif
endif
LDFLAGS = -lm $(OMPL) LDFLAGS = -lm $(OMPL)
EXE = EXE =
else ifneq ($(IS_WIN),) else ifneq ($(IS_WIN),)
@@ -273,8 +278,9 @@ olmoe$(EXE): olmoe.c st.h json.h compat.h
# Use a baseline that matches the compiler target. macOS already targets a # Use a baseline that matches the compiler target. macOS already targets a
# portable baseline when ARCH is empty; forcing the x86 value there breaks # portable baseline when ARCH is empty; forcing the x86 value there breaks
# Apple Silicon. Unknown targets use native rather than an invalid x86 flag. # Apple Silicon. Unknown targets use native rather than an invalid x86 flag.
# Intel Macs need -march for vector instructions
ifneq (,$(DARWIN)) ifneq (,$(DARWIN))
PORTABLE_ARCH = PORTABLE_ARCH = $(if $(X86_64),x86-64-v3,)
else ifneq (,$(AARCH64)) else ifneq (,$(AARCH64))
PORTABLE_ARCH = armv8-a PORTABLE_ARCH = armv8-a
else ifneq (,$(PPC64)) else ifneq (,$(PPC64))