Delete Makefile and make workflows
This commit is contained in:
saharNooby
parent
b2bdeb1d95
commit
28e354c183
|
|
@ -9,34 +9,15 @@ on:
|
||||||
required: true
|
required: true
|
||||||
type: boolean
|
type: boolean
|
||||||
push:
|
push:
|
||||||
paths: ['.github/workflows/**', '**/CMakeLists.txt', '**/Makefile', '**/*.h', '**/*.c', '**/*.cpp']
|
paths: ['.github/workflows/**', '**/CMakeLists.txt', '**/*.h', '**/*.c', '**/*.cpp']
|
||||||
pull_request:
|
pull_request:
|
||||||
types: [opened, synchronize, edited, reopened, review_requested, ready_for_review]
|
types: [opened, synchronize, edited, reopened, review_requested, ready_for_review]
|
||||||
paths: ['**/CMakeLists.txt', '**/Makefile', '**/*.h', '**/*.c', '**/*.cpp']
|
paths: ['**/CMakeLists.txt', '**/*.h', '**/*.c', '**/*.cpp']
|
||||||
|
|
||||||
env:
|
env:
|
||||||
BRANCH_NAME: ${{ github.head_ref || github.ref_name }}
|
BRANCH_NAME: ${{ github.head_ref || github.ref_name }}
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
ubuntu-latest-make:
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
|
|
||||||
steps:
|
|
||||||
- name: Clone
|
|
||||||
id: checkout
|
|
||||||
uses: actions/checkout@v1
|
|
||||||
|
|
||||||
- name: Dependencies
|
|
||||||
id: depends
|
|
||||||
run: |
|
|
||||||
sudo apt-get update
|
|
||||||
sudo apt-get install build-essential
|
|
||||||
|
|
||||||
- name: Build
|
|
||||||
id: make_build
|
|
||||||
run: |
|
|
||||||
make
|
|
||||||
|
|
||||||
ubuntu-latest-cmake:
|
ubuntu-latest-cmake:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
|
|
||||||
|
|
@ -85,24 +66,6 @@ jobs:
|
||||||
path: |
|
path: |
|
||||||
rwkv-${{ env.BRANCH_NAME }}-${{ steps.commit.outputs.short }}-bin-${{ steps.system-info.outputs.OS_TYPE }}-${{ steps.system-info.outputs.OS_NAME }}-${{ steps.system-info.outputs.OS_VERSION }}-${{ steps.system-info.outputs.CPU_ARCH }}.zip
|
rwkv-${{ env.BRANCH_NAME }}-${{ steps.commit.outputs.short }}-bin-${{ steps.system-info.outputs.OS_TYPE }}-${{ steps.system-info.outputs.OS_NAME }}-${{ steps.system-info.outputs.OS_VERSION }}-${{ steps.system-info.outputs.CPU_ARCH }}.zip
|
||||||
|
|
||||||
macOS-latest-make:
|
|
||||||
runs-on: macos-latest
|
|
||||||
|
|
||||||
steps:
|
|
||||||
- name: Clone
|
|
||||||
id: checkout
|
|
||||||
uses: actions/checkout@v1
|
|
||||||
|
|
||||||
- name: Dependencies
|
|
||||||
id: depends
|
|
||||||
run: |
|
|
||||||
brew update
|
|
||||||
|
|
||||||
- name: Build
|
|
||||||
id: make_build
|
|
||||||
run: |
|
|
||||||
make
|
|
||||||
|
|
||||||
macOS-latest-cmake:
|
macOS-latest-cmake:
|
||||||
runs-on: macOS-latest
|
runs-on: macOS-latest
|
||||||
|
|
||||||
|
|
@ -222,9 +185,7 @@ jobs:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
|
|
||||||
needs:
|
needs:
|
||||||
- ubuntu-latest-make
|
|
||||||
- ubuntu-latest-cmake
|
- ubuntu-latest-cmake
|
||||||
- macOS-latest-make
|
|
||||||
- macOS-latest-cmake
|
- macOS-latest-cmake
|
||||||
- windows-latest-cmake
|
- windows-latest-cmake
|
||||||
|
|
||||||
|
|
|
||||||
229
Makefile
229
Makefile
|
|
@ -1,229 +0,0 @@
|
||||||
ifndef UNAME_S
|
|
||||||
UNAME_S := $(shell uname -s)
|
|
||||||
endif
|
|
||||||
|
|
||||||
ifndef UNAME_P
|
|
||||||
UNAME_P := $(shell uname -p)
|
|
||||||
endif
|
|
||||||
|
|
||||||
ifndef UNAME_M
|
|
||||||
UNAME_M := $(shell uname -m)
|
|
||||||
endif
|
|
||||||
|
|
||||||
CCV := $(shell $(CC) --version | head -n 1)
|
|
||||||
CXXV := $(shell $(CXX) --version | head -n 1)
|
|
||||||
|
|
||||||
# Mac OS + Arm can report x86_64
|
|
||||||
# ref: https://github.com/ggerganov/whisper.cpp/issues/66#issuecomment-1282546789
|
|
||||||
ifeq ($(UNAME_S),Darwin)
|
|
||||||
ifneq ($(UNAME_P),arm)
|
|
||||||
SYSCTL_M := $(shell sysctl -n hw.optional.arm64 2>/dev/null)
|
|
||||||
ifeq ($(SYSCTL_M),1)
|
|
||||||
# UNAME_P := arm
|
|
||||||
# UNAME_M := arm64
|
|
||||||
warn := $(warning Your arch is announced as x86_64, but it seems to actually be ARM64. Not fixing that can lead to bad performance. For more info see: https://github.com/ggerganov/whisper.cpp/issues/66\#issuecomment-1282546789)
|
|
||||||
endif
|
|
||||||
endif
|
|
||||||
endif
|
|
||||||
|
|
||||||
#
|
|
||||||
# Compile flags
|
|
||||||
#
|
|
||||||
|
|
||||||
# keep standard at C11 and C++11
|
|
||||||
CFLAGS = -I. -O3 -DNDEBUG -std=c11 -fPIC
|
|
||||||
CXXFLAGS = -I. -I./examples -O3 -DNDEBUG -std=c++11 -fPIC
|
|
||||||
LDFLAGS =
|
|
||||||
|
|
||||||
# warnings
|
|
||||||
CFLAGS += -Wall -Wextra -Wpedantic -Wcast-qual -Wdouble-promotion -Wshadow -Wstrict-prototypes -Wpointer-arith -Wno-unused-function
|
|
||||||
CXXFLAGS += -Wall -Wextra -Wpedantic -Wcast-qual -Wno-unused-function
|
|
||||||
|
|
||||||
# OS specific
|
|
||||||
# TODO: support Windows
|
|
||||||
ifeq ($(UNAME_S),Linux)
|
|
||||||
CFLAGS += -pthread
|
|
||||||
CXXFLAGS += -pthread
|
|
||||||
endif
|
|
||||||
ifeq ($(UNAME_S),Darwin)
|
|
||||||
CFLAGS += -pthread
|
|
||||||
CXXFLAGS += -pthread
|
|
||||||
endif
|
|
||||||
ifeq ($(UNAME_S),FreeBSD)
|
|
||||||
CFLAGS += -pthread
|
|
||||||
CXXFLAGS += -pthread
|
|
||||||
endif
|
|
||||||
ifeq ($(UNAME_S),NetBSD)
|
|
||||||
CFLAGS += -pthread
|
|
||||||
CXXFLAGS += -pthread
|
|
||||||
endif
|
|
||||||
ifeq ($(UNAME_S),OpenBSD)
|
|
||||||
CFLAGS += -pthread
|
|
||||||
CXXFLAGS += -pthread
|
|
||||||
endif
|
|
||||||
ifeq ($(UNAME_S),Haiku)
|
|
||||||
CFLAGS += -pthread
|
|
||||||
CXXFLAGS += -pthread
|
|
||||||
endif
|
|
||||||
|
|
||||||
# Architecture specific
|
|
||||||
# TODO: probably these flags need to be tweaked on some architectures
|
|
||||||
# feel free to update the Makefile for your architecture and send a pull request or issue
|
|
||||||
ifeq ($(UNAME_M),$(filter $(UNAME_M),x86_64 i686))
|
|
||||||
ifeq ($(UNAME_S),Darwin)
|
|
||||||
CFLAGS += -mf16c
|
|
||||||
AVX1_M := $(shell sysctl machdep.cpu.features)
|
|
||||||
ifneq (,$(findstring FMA,$(AVX1_M)))
|
|
||||||
CFLAGS += -mfma
|
|
||||||
endif
|
|
||||||
ifneq (,$(findstring AVX1.0,$(AVX1_M)))
|
|
||||||
CFLAGS += -mavx
|
|
||||||
endif
|
|
||||||
AVX2_M := $(shell sysctl machdep.cpu.leaf7_features)
|
|
||||||
ifneq (,$(findstring AVX2,$(AVX2_M)))
|
|
||||||
CFLAGS += -mavx2
|
|
||||||
endif
|
|
||||||
else ifeq ($(UNAME_S),Linux)
|
|
||||||
AVX1_M := $(shell grep "avx " /proc/cpuinfo)
|
|
||||||
ifneq (,$(findstring avx,$(AVX1_M)))
|
|
||||||
CFLAGS += -mavx
|
|
||||||
endif
|
|
||||||
AVX2_M := $(shell grep "avx2 " /proc/cpuinfo)
|
|
||||||
ifneq (,$(findstring avx2,$(AVX2_M)))
|
|
||||||
CFLAGS += -mavx2
|
|
||||||
endif
|
|
||||||
FMA_M := $(shell grep "fma " /proc/cpuinfo)
|
|
||||||
ifneq (,$(findstring fma,$(FMA_M)))
|
|
||||||
CFLAGS += -mfma
|
|
||||||
endif
|
|
||||||
F16C_M := $(shell grep "f16c " /proc/cpuinfo)
|
|
||||||
ifneq (,$(findstring f16c,$(F16C_M)))
|
|
||||||
CFLAGS += -mf16c
|
|
||||||
endif
|
|
||||||
SSE3_M := $(shell grep "sse3 " /proc/cpuinfo)
|
|
||||||
ifneq (,$(findstring sse3,$(SSE3_M)))
|
|
||||||
CFLAGS += -msse3
|
|
||||||
endif
|
|
||||||
AVX512F_M := $(shell grep "avx512f " /proc/cpuinfo)
|
|
||||||
ifneq (,$(findstring avx512f,$(AVX512F_M)))
|
|
||||||
CFLAGS += -mavx512f
|
|
||||||
endif
|
|
||||||
AVX512BW_M := $(shell grep "avx512bw " /proc/cpuinfo)
|
|
||||||
ifneq (,$(findstring avx512bw,$(AVX512BW_M)))
|
|
||||||
CFLAGS += -mavx512bw
|
|
||||||
endif
|
|
||||||
AVX512DQ_M := $(shell grep "avx512dq " /proc/cpuinfo)
|
|
||||||
ifneq (,$(findstring avx512dq,$(AVX512DQ_M)))
|
|
||||||
CFLAGS += -mavx512dq
|
|
||||||
endif
|
|
||||||
AVX512VL_M := $(shell grep "avx512vl " /proc/cpuinfo)
|
|
||||||
ifneq (,$(findstring avx512vl,$(AVX512VL_M)))
|
|
||||||
CFLAGS += -mavx512vl
|
|
||||||
endif
|
|
||||||
AVX512CD_M := $(shell grep "avx512cd " /proc/cpuinfo)
|
|
||||||
ifneq (,$(findstring avx512cd,$(AVX512CD_M)))
|
|
||||||
CFLAGS += -mavx512cd
|
|
||||||
endif
|
|
||||||
AVX512ER_M := $(shell grep "avx512er " /proc/cpuinfo)
|
|
||||||
ifneq (,$(findstring avx512er,$(AVX512ER_M)))
|
|
||||||
CFLAGS += -mavx512er
|
|
||||||
endif
|
|
||||||
AVX512IFMA_M := $(shell grep "avx512ifma " /proc/cpuinfo)
|
|
||||||
ifneq (,$(findstring avx512ifma,$(AVX512IFMA_M)))
|
|
||||||
CFLAGS += -mavx512ifma
|
|
||||||
endif
|
|
||||||
AVX512PF_M := $(shell grep "avx512pf " /proc/cpuinfo)
|
|
||||||
ifneq (,$(findstring avx512pf,$(AVX512PF_M)))
|
|
||||||
CFLAGS += -mavx512pf
|
|
||||||
endif
|
|
||||||
else ifeq ($(UNAME_S),Haiku)
|
|
||||||
AVX1_M := $(shell sysinfo -cpu | grep -w "AVX")
|
|
||||||
ifneq (,$(findstring AVX,$(AVX1_M)))
|
|
||||||
CFLAGS += -mavx
|
|
||||||
endif
|
|
||||||
AVX2_M := $(shell sysinfo -cpu | grep -w "AVX2")
|
|
||||||
ifneq (,$(findstring AVX2,$(AVX2_M)))
|
|
||||||
CFLAGS += -mavx2
|
|
||||||
endif
|
|
||||||
FMA_M := $(shell sysinfo -cpu | grep -w "FMA")
|
|
||||||
ifneq (,$(findstring FMA,$(FMA_M)))
|
|
||||||
CFLAGS += -mfma
|
|
||||||
endif
|
|
||||||
F16C_M := $(shell sysinfo -cpu | grep -w "F16C")
|
|
||||||
ifneq (,$(findstring F16C,$(F16C_M)))
|
|
||||||
CFLAGS += -mf16c
|
|
||||||
endif
|
|
||||||
else
|
|
||||||
CFLAGS += -mfma -mf16c -mavx -mavx2
|
|
||||||
endif
|
|
||||||
endif
|
|
||||||
ifneq ($(filter ppc64%,$(UNAME_M)),)
|
|
||||||
POWER9_M := $(shell grep "POWER9" /proc/cpuinfo)
|
|
||||||
ifneq (,$(findstring POWER9,$(POWER9_M)))
|
|
||||||
CFLAGS += -mcpu=power9
|
|
||||||
CXXFLAGS += -mcpu=power9
|
|
||||||
endif
|
|
||||||
# Require c++23's std::byteswap for big-endian support.
|
|
||||||
ifeq ($(UNAME_M),ppc64)
|
|
||||||
CXXFLAGS += -std=c++23 -DGGML_BIG_ENDIAN
|
|
||||||
endif
|
|
||||||
endif
|
|
||||||
ifndef RWKV_NO_ACCELERATE
|
|
||||||
# Mac M1 - include Accelerate framework.
|
|
||||||
# `-framework Accelerate` works on Mac Intel as well, with negliable performance boost (as of the predict time).
|
|
||||||
ifeq ($(UNAME_S),Darwin)
|
|
||||||
CFLAGS += -DGGML_USE_ACCELERATE
|
|
||||||
LDFLAGS += -framework Accelerate
|
|
||||||
endif
|
|
||||||
endif
|
|
||||||
ifdef RWKV_OPENBLAS
|
|
||||||
CFLAGS += -DGGML_USE_OPENBLAS -I/usr/local/include/openblas
|
|
||||||
LDFLAGS += -lopenblas
|
|
||||||
endif
|
|
||||||
ifdef RWKV_GPROF
|
|
||||||
CFLAGS += -pg
|
|
||||||
CXXFLAGS += -pg
|
|
||||||
endif
|
|
||||||
ifneq ($(filter aarch64%,$(UNAME_M)),)
|
|
||||||
CFLAGS += -mcpu=native
|
|
||||||
CXXFLAGS += -mcpu=native
|
|
||||||
endif
|
|
||||||
ifneq ($(filter armv6%,$(UNAME_M)),)
|
|
||||||
# Raspberry Pi 1, 2, 3
|
|
||||||
CFLAGS += -mfpu=neon-fp-armv8 -mfp16-format=ieee -mno-unaligned-access
|
|
||||||
endif
|
|
||||||
ifneq ($(filter armv7%,$(UNAME_M)),)
|
|
||||||
# Raspberry Pi 4
|
|
||||||
CFLAGS += -mfpu=neon-fp-armv8 -mfp16-format=ieee -mno-unaligned-access -funsafe-math-optimizations
|
|
||||||
endif
|
|
||||||
ifneq ($(filter armv8%,$(UNAME_M)),)
|
|
||||||
# Raspberry Pi 4
|
|
||||||
CFLAGS += -mfp16-format=ieee -mno-unaligned-access
|
|
||||||
endif
|
|
||||||
|
|
||||||
#
|
|
||||||
# Print build information
|
|
||||||
#
|
|
||||||
|
|
||||||
$(info I rwkv.cpp build info: )
|
|
||||||
$(info I UNAME_S: $(UNAME_S))
|
|
||||||
$(info I UNAME_P: $(UNAME_P))
|
|
||||||
$(info I UNAME_M: $(UNAME_M))
|
|
||||||
$(info I CFLAGS: $(CFLAGS))
|
|
||||||
$(info I CXXFLAGS: $(CXXFLAGS))
|
|
||||||
$(info I LDFLAGS: $(LDFLAGS))
|
|
||||||
$(info I CC: $(CCV))
|
|
||||||
$(info I CXX: $(CXXV))
|
|
||||||
$(info )
|
|
||||||
|
|
||||||
default: rwkv.o
|
|
||||||
|
|
||||||
#
|
|
||||||
# Build library
|
|
||||||
#
|
|
||||||
|
|
||||||
ggml.o: ggml.c ggml.h
|
|
||||||
$(CC) $(CFLAGS) -c ggml.c -o ggml.o
|
|
||||||
|
|
||||||
rwkv.o: rwkv.cpp rwkv.h
|
|
||||||
$(CXX) $(CXXFLAGS) -c rwkv.cpp -o rwkv.o
|
|
||||||
Loading…
Reference in New Issue