Merge pull request #2 from Weaxs/dev

(#1) support chatglm.cpp v0.3.0

.github/workflows/codeql.yml

@@ -12,9 +12,8 @@
 name: "CodeQL"
 
 on:
-  push:
-    branches: [ "main" ]
   pull_request:
+  push:
     # The branches below must be a subset of the branches above
     branches: [ "main" ]
   schedule:

.github/workflows/test.yaml

@@ -36,32 +36,6 @@ jobs:
         run: |
           make test
 
-  windows-latest:
-    runs-on: windows-latest
-    strategy:
-      matrix:
-        go-version: [ 'stable' ]
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v3
-        with:
-          submodules: recursive
-      - name: Setup Go ${{ matrix.go-version }}
-        uses: actions/setup-go@v4
-        with:
-          go-version: ${{ matrix.go-version }}
-      - name: Display Go version
-        run: go version
-      - name: Display GCC version
-        run: gcc --version
-      - name: Display CMake version
-        run: cmake --version
-      - name: Install dependencies
-        run: go mod tidy
-      - name: Test
-        run: |
-          make test
-
   macOS-latest:
     runs-on: macOS-latest
     strategy:
@@ -88,29 +62,31 @@ jobs:
         run: |
           make test
 
-  macOS-metal-latest:
-    runs-on: macOS-latest
-    strategy:
-      matrix:
-        go-version: ['stable']
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v3
-        with:
-          submodules: recursive
-      - name: Setup Go ${{ matrix.go-version }}
-        uses: actions/setup-go@v4
-        with:
-          go-version: ${{ matrix.go-version }}
-      # You can test your matrix by printing the current Go version
-      - name: Display Go version
-        run: go version
-      - name: Display GCC version
-        run: gcc --version
-      - name: Display CMake version
-        run: cmake --version
-      - name: Install dependencies
-        run: go mod tidy
-      - name: Test
-        run: |
-          make BUILD_TYPE=metal test
+# arm not support https://github.com/actions/runner-images/issues/8610
+# Apple Silicon powered macOS runners are now available in public beta!  https://github.com/actions/runner-images/issues/8439
+#  macOS-arm64-metal-latest:
+#    runs-on: macos-13-arm64
+#    strategy:
+#      matrix:
+#        go-version: ['stable']
+#    steps:
+#      - name: Checkout repository
+#        uses: actions/checkout@v3
+#        with:
+#          submodules: recursive
+#      - name: Setup Go ${{ matrix.go-version }}
+#        uses: actions/setup-go@v4
+#        with:
+#          go-version: ${{ matrix.go-version }}
+#      # You can test your matrix by printing the current Go version
+#      - name: Display Go version
+#        run: go version
+#      - name: Display GCC version
+#        run: gcc --version
+#      - name: Display CMake version
+#        run: cmake --version
+#      - name: Install dependencies
+#        run: go mod tidy
+#      - name: Test
+#        run: |
+#          make BUILD_TYPE=metal test

Makefile

@@ -2,29 +2,16 @@ INCLUDE_PATH := $(abspath ./)
 LIBRARY_PATH := $(abspath ./)
 
 ifndef UNAME_S
-	ifeq ($(OS),Windows_NT)
-		UNAME_S := $(shell ver)
-	else
-		UNAME_S := $(shell uname -s)
-	endif
+	UNAME_S := $(shell uname -s)
 endif
-
 ifndef UNAME_P
-	ifeq ($(OS),Windows_NT)
-		UNAME_P := $(shell wmic cpu get caption)
-	else
-		UNAME_P := $(shell uname -p)
-	endif
+	UNAME_P := $(shell uname -p)
 endif
-
 ifndef UNAME_M
-	ifeq ($(OS),Windows_NT)
-		UNAME_M := $(PROCESSOR_ARCHITECTURE)
-	else
-		UNAME_M := $(shell uname -s)
-	endif
+	UNAME_M := $(shell uname -m)
 endif
 
+
 CCV := $(shell $(CC) --version | head -n 1)
 CXXV := $(shell $(CXX) --version | head -n 1)
 
@@ -34,8 +21,8 @@ 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
+#			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
@@ -47,30 +34,25 @@ endif
 
 BUILD_TYPE?=
 # keep standard at C17 and C++17
-CFLAGS   = -I. -O3 -DNDEBUG -std=c17 -fPIC -pthread
 CXXFLAGS = -I. -O3 -DNDEBUG -std=c++17 -fPIC -pthread
-LDFLAGS  =
-CMAKE_ARGS = -DCMAKE_C_COMPILER=$(shell which gcc) -DCMAKE_CXX_COMPILER=$(shell which g++)
 
 # 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
+CXXFLAGS += -Wall -Wextra -Wpedantic -Wcast-qual -Wno-unused-function -pedantic-errors
 
 # GPGPU specific
 GGML_CUDA_OBJ_PATH=third_party/ggml/src/CMakeFiles/ggml.dir/ggml-cuda.cu.o
 
 
 # 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
+# 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))
 	# Use all CPU extensions that are available:
-	CFLAGS += -march=native -mtune=native
+	CMAKE_ARGS += -DCMAKE_C_FLAGS=-march=native -DGGML_F16C=OFF -DGGML_AVX2=OFF -DGGML_FMA=OFF
+	CXXFLAGS += -march=native -mtune=native
 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.
@@ -79,61 +61,49 @@ ifneq ($(filter ppc64%,$(UNAME_M)),)
 	endif
 endif
 ifdef CHATGLM_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
+	CXXFLAGS += -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
+	CXXFLAGS += -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
+	CXXFLAGS += -mfp16-format=ieee -mno-unaligned-access
 endif
 
-# Build Acceleration
 ifeq ($(BUILD_TYPE),cublas)
-	EXTRA_LIBS=
 	CMAKE_ARGS+=-DGGML_CUBLAS=ON
-	EXTRA_TARGETS+=ggml.dir/ggml-cuda.o
 endif
 ifeq ($(BUILD_TYPE),openblas)
-	EXTRA_LIBS=
 	CMAKE_ARGS+=-DGGML_OPENBLAS=ON
-	CFLAGS  += -DGGML_USE_OPENBLAS -I/usr/local/include/openblas
-    LDFLAGS += -lopenblas
+	CXXFLAGS  += -I/usr/local/include/openblas -lopenblas
     CGO_TAGS=-tags openblas
 endif
 ifeq ($(BUILD_TYPE),hipblas)
 	ROCM_HOME ?= "/opt/rocm"
 	CXX="$(ROCM_HOME)"/llvm/bin/clang++
 	CC="$(ROCM_HOME)"/llvm/bin/clang
-	EXTRA_LIBS=
 	GPU_TARGETS ?= gfx900,gfx90a,gfx1030,gfx1031,gfx1100
 	AMDGPU_TARGETS ?= "$(GPU_TARGETS)"
 	CMAKE_ARGS+=-DGGML_HIPBLAS=ON -DAMDGPU_TARGETS="$(AMDGPU_TARGETS)" -DGPU_TARGETS="$(GPU_TARGETS)"
-	EXTRA_TARGETS+=ggml.dir/ggml-cuda.o
 	GGML_CUDA_OBJ_PATH=CMakeFiles/ggml-rocm.dir/ggml-cuda.cu.o
 endif
 ifeq ($(BUILD_TYPE),clblas)
-	EXTRA_LIBS=
 	CMAKE_ARGS+=-DGGML_CLBLAST=ON
-	EXTRA_TARGETS+=ggml.dir/ggml-opencl.o
 	CGO_TAGS=-tags cublas
 endif
 ifeq ($(BUILD_TYPE),metal)
-	EXTRA_LIBS=
 	CMAKE_ARGS+=-DGGML_METAL=ON
-	EXTRA_TARGETS+=ggml.dir/ggml-metal.o
 	CGO_TAGS=-tags metal
+	EXTRA_TARGETS+=ggml-metal
 endif
 
 ifdef CLBLAST_DIR
@@ -147,14 +117,13 @@ $(info I chatglm.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 BUILD_TYPE:  $(BUILD_TYPE))
 $(info I CMAKE_ARGS:  $(CMAKE_ARGS))
 $(info I EXTRA_TARGETS:  $(EXTRA_TARGETS))
 $(info I CC:       $(CCV))
 $(info I CXX:      $(CXXV))
+$(info I CGO_TAGS:    $(CGO_TAGS))
 $(info )
 
 # Use this if you want to set the default behavior
@@ -164,93 +133,63 @@ prepare:
 
 # build chatglm.cpp
 build/chatglm.cpp: prepare
-	cd build && CC="$(CC)" CXX="$(CXX)" cmake ../chatglm.cpp $(CMAKE_ARGS) && VERBOSE=1 cmake --build . -j --config Release
+	cd build && CC="$(CC)" CXX="$(CXX)" cmake $(CMAKE_ARGS) ../chatglm.cpp && VERBOSE=1 cmake --build . -j --config Release
 
 # chatglm.dir
 chatglm.dir: build/chatglm.cpp
-	cd out && mkdir -p chatglm.dir && cd ../build && \
-	cp -rp CMakeFiles/chatglm.dir/chatglm.cpp.o ../out/chatglm.dir/chatglm.o
+	cd out && mkdir -p chatglm.dir
+	cp build/CMakeFiles/chatglm.dir/chatglm.cpp.o out/chatglm.dir/
 
 # ggml.dir
 ggml.dir: build/chatglm.cpp
-	cd out && mkdir -p ggml.dir && cd ../build && \
-	cp -rf third_party/ggml/src/CMakeFiles/ggml.dir/ggml.c.o ../out/ggml.dir/ggml.o && \
-	cp -rf third_party/ggml/src/CMakeFiles/ggml.dir/ggml-alloc.c.o ../out/ggml.dir/ggml-alloc.o
+	cd out && mkdir -p ggml.dir
+	cp build/third_party/ggml/src/CMakeFiles/ggml.dir/*.o out/ggml.dir/
 
 # sentencepiece.dir
 sentencepiece.dir: build/chatglm.cpp
-	cd out && mkdir -p sentencepiece.dir && cd ../build && \
-	cp -rf third_party/sentencepiece/src/CMakeFiles/sentencepiece-static.dir/sentencepiece_processor.cc.o ../out/sentencepiece.dir/sentencepiece_processor.o && \
-	cp -rf third_party/sentencepiece/src/CMakeFiles/sentencepiece-static.dir/error.cc.o ../out/sentencepiece.dir/error.o && \
-	cp -rf third_party/sentencepiece/src/CMakeFiles/sentencepiece-static.dir/model_factory.cc.o ../out/sentencepiece.dir/model_factory.o && \
-	cp -rf third_party/sentencepiece/src/CMakeFiles/sentencepiece-static.dir/model_interface.cc.o ../out/sentencepiece.dir/model_interface.o  && \
-	cp -rf third_party/sentencepiece/src/CMakeFiles/sentencepiece-static.dir/bpe_model.cc.o ../out/sentencepiece.dir/bpe_model.o && \
-	cp -rf third_party/sentencepiece/src/CMakeFiles/sentencepiece-static.dir/char_model.cc.o ../out/sentencepiece.dir/char_model.o && \
-	cp -rf third_party/sentencepiece/src/CMakeFiles/sentencepiece-static.dir/word_model.cc.o ../out/sentencepiece.dir/word_model.o && \
-	cp -rf third_party/sentencepiece/src/CMakeFiles/sentencepiece-static.dir/unigram_model.cc.o ../out/sentencepiece.dir/unigram_model.o && \
-	cp -rf third_party/sentencepiece/src/CMakeFiles/sentencepiece-static.dir/util.cc.o ../out/sentencepiece.dir/util.o && \
-	cp -rf third_party/sentencepiece/src/CMakeFiles/sentencepiece-static.dir/normalizer.cc.o ../out/sentencepiece.dir/normalizer.o && \
-	cp -rf third_party/sentencepiece/src/CMakeFiles/sentencepiece-static.dir/filesystem.cc.o ../out/sentencepiece.dir/filesystem.o && \
-	cp -rf third_party/sentencepiece/src/CMakeFiles/sentencepiece-static.dir/builtin_pb/sentencepiece.pb.cc.o ../out/sentencepiece.dir/sentencepiece.pb.o && \
-  	cp -rf third_party/sentencepiece/src/CMakeFiles/sentencepiece-static.dir/builtin_pb/sentencepiece_model.pb.cc.o ../out/sentencepiece.dir/sentencepiece_model.pb.o
+	cd out && mkdir -p sentencepiece.dir
+	cp build/third_party/sentencepiece/src/CMakeFiles/sentencepiece-static.dir/*.cc.o out/sentencepiece.dir/
+	cp build/third_party/sentencepiece/src/CMakeFiles/sentencepiece-static.dir/builtin_pb/*.cc.o out/sentencepiece.dir/
 
 # protobuf-lite.dir
 protobuf-lite.dir: sentencepiece.dir
-	cd out && mkdir -p protobuf-lite.dir && cd ../build && \
-	find third_party/sentencepiece/src/CMakeFiles/sentencepiece-static.dir/__/third_party/protobuf-lite -name '*.cc.o' -exec cp {} ../out/protobuf-lite.dir/ \;
+	cd out && mkdir -p protobuf-lite.dir
+	cp build/third_party/sentencepiece/src/CMakeFiles/sentencepiece-static.dir/__/third_party/protobuf-lite/*.cc.o out/protobuf-lite.dir/
 
 # absl.dir
 absl.dir: sentencepiece.dir
-	cd out && mkdir -p absl.dir && cd ../build && \
-	find third_party/sentencepiece/src/CMakeFiles/sentencepiece-static.dir/__/third_party/absl/flags/ -name '*.cc.o' -exec cp {} ../out/absl.dir/ \;
+	cd out && mkdir -p absl.dir
+	cp build/third_party/sentencepiece/src/CMakeFiles/sentencepiece-static.dir/__/third_party/absl/flags/flag.cc.o out/absl.dir/
+
+# ggml-metal
+ggml-metal: ggml.dir
+	cp build/bin/ggml-metal.metal .
 
 # binding
 binding.o: prepare build/chatglm.cpp chatglm.dir ggml.dir sentencepiece.dir protobuf-lite.dir absl.dir
 	$(CXX) $(CXXFLAGS) \
 	-I./chatglm.cpp  \
 	-I./chatglm.cpp/third_party/ggml/include/ggml \
 	-I./chatglm.cpp/third_party/sentencepiece/src \
-	binding.cpp -o binding.o -c $(LDFLAGS)
-
-# ggml-cuda
-ggml.dir/ggml-cuda.o: ggml.dir
-	cd build && cp -rf "$(GGML_CUDA_OBJ_PATH)" ../out/ggml.dir/ggml-cuda.o
-
-# ggml-opencl
-ggml.dir/ggml-opencl.o: ggml.dir
-	cd build && cp -rf third_party/ggml/src/CMakeFiles/ggml.dir/ggml-opencl.cpp.o ../out/ggml.dir/ggml-opencl.o
-
-# ggml-metal
-ggml.dir/ggml-metal.o: ggml.dir ggml.dir/ggml-backend.o
-	cd build && cp -rf bin/ggml-metal.metal ../ggml-metal.metal && \
-	cp -rf third_party/ggml/src/CMakeFiles/ggml.dir/ggml-metal.m.o ../out/ggml.dir/ggml-metal.o
-
-# ggml-backend
-ggml.dir/ggml-backend.o:
-	cd build && cp -rf third_party/ggml/src/CMakeFiles/ggml.dir/ggml-backend.c.o ../out/ggml.dir/ggml-backend.o
+	binding.cpp -MD -MT binding.o -MF binding.d -o binding.o -c
 
 libbinding.a: prepare binding.o $(EXTRA_TARGETS)
 	ar src libbinding.a  \
-	out/chatglm.dir/chatglm.o \
+	out/chatglm.dir/*.o \
 	out/ggml.dir/*.o out/sentencepiece.dir/*.o  \
 	out/protobuf-lite.dir/*.o out/absl.dir/*.o \
 	binding.o
 
 clean:
 	rm -rf *.o
+	rm -rf *.d
 	rm -rf *.a
 	rm -rf out
 	rm -rf build
 
-DOWNLOAD_TARGETS=ggllm-test-model.bin
-ifeq ($(OS),Windows_NT)
-	DOWNLOAD_TARGETS:=windows/ggllm-test-model.bin
-endif
-
 ggllm-test-model.bin:
 	wget -q -N https://huggingface.co/Xorbits/chatglm3-6B-GGML/resolve/main/chatglm3-ggml-q4_0.bin -O ggllm-test-model.bin
-windows/ggllm-test-model.bin:
-	powershell -Command "Invoke-WebRequest -Uri 'https://huggingface.co/Xorbits/chatglm3-6B-GGML/resolve/main/chatglm3-ggml-q4_0.bin' -OutFile 'ggllm-test-model.bin'"
 
-test: $(DOWNLOAD_TARGETS) libbinding.a
-	TEST_MODEL=ggllm-test-model.bin go test ${CGO_TAGS} .
+test: ggllm-test-model.bin libbinding.a
+	go test ${CGO_TAGS} -timeout 1800s -o go-chatglm.cpp.test -c -cover
+	TEST_MODEL=ggllm-test-model.bin ./go-chatglm.cpp.test