diff --git a/Makefile b/Makefile index fb98dcd..463864f 100644 --- a/Makefile +++ b/Makefile @@ -89,14 +89,12 @@ ifneq ($(filter armv8%,$(UNAME_M)),) CFLAGS += -mfp16-format=ieee -mno-unaligned-access endif +default: main + # -# Build library + main +# Build library # -main: examples/main/main.cpp ggml.o whisper.o - $(CXX) $(CXXFLAGS) examples/main/main.cpp whisper.o ggml.o -o main $(LDFLAGS) - ./main -h - ggml.o: ggml.c ggml.h $(CC) $(CFLAGS) -c ggml.c -o ggml.o @@ -106,8 +104,11 @@ whisper.o: whisper.cpp whisper.h libwhisper.a: ggml.o whisper.o $(AR) rcs libwhisper.a ggml.o whisper.o +libwhisper.so: ggml.o whisper.o + $(CXX) $(CXXFLAGS) -shared -o libwhisper.so ggml.o whisper.o $(LDFLAGS) + clean: - rm -f *.o main stream bench libwhisper.a + rm -f *.o main stream bench libwhisper.a libwhisper.so # # Examples @@ -115,6 +116,10 @@ clean: CC_SDL=`sdl2-config --cflags --libs` +main: examples/main/main.cpp ggml.o whisper.o + $(CXX) $(CXXFLAGS) examples/main/main.cpp ggml.o whisper.o -o main $(LDFLAGS) + ./main -h + stream: examples/stream/stream.cpp ggml.o whisper.o $(CXX) $(CXXFLAGS) examples/stream/stream.cpp ggml.o whisper.o -o stream $(CC_SDL) $(LDFLAGS) diff --git a/models/convert-pt-to-ggml.py b/models/convert-pt-to-ggml.py index 04792d7..83fcd37 100644 --- a/models/convert-pt-to-ggml.py +++ b/models/convert-pt-to-ggml.py @@ -297,8 +297,6 @@ for name in list_vars.keys(): name == "encoder.conv2.bias" or \ name == "encoder.positional_embedding" or \ name == "decoder.positional_embedding": - ftype = 0 - data = data.astype(np.float32) print(" Converting to float32") data = data.astype(np.float32) ftype = 0