Merge branch 'ggerganov:master' into master

pull/357/head
Chidi Williams 3 years ago committed by GitHub
commit 745f999d2d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -89,14 +89,12 @@ ifneq ($(filter armv8%,$(UNAME_M)),)
CFLAGS += -mfp16-format=ieee -mno-unaligned-access CFLAGS += -mfp16-format=ieee -mno-unaligned-access
endif 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 ggml.o: ggml.c ggml.h
$(CC) $(CFLAGS) -c ggml.c -o ggml.o $(CC) $(CFLAGS) -c ggml.c -o ggml.o
@ -106,8 +104,11 @@ whisper.o: whisper.cpp whisper.h
libwhisper.a: ggml.o whisper.o libwhisper.a: ggml.o whisper.o
$(AR) rcs 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: clean:
rm -f *.o main stream bench libwhisper.a rm -f *.o main stream bench libwhisper.a libwhisper.so
# #
# Examples # Examples
@ -115,6 +116,10 @@ clean:
CC_SDL=`sdl2-config --cflags --libs` 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 stream: examples/stream/stream.cpp ggml.o whisper.o
$(CXX) $(CXXFLAGS) examples/stream/stream.cpp ggml.o whisper.o -o stream $(CC_SDL) $(LDFLAGS) $(CXX) $(CXXFLAGS) examples/stream/stream.cpp ggml.o whisper.o -o stream $(CC_SDL) $(LDFLAGS)

@ -297,8 +297,6 @@ for name in list_vars.keys():
name == "encoder.conv2.bias" or \ name == "encoder.conv2.bias" or \
name == "encoder.positional_embedding" or \ name == "encoder.positional_embedding" or \
name == "decoder.positional_embedding": name == "decoder.positional_embedding":
ftype = 0
data = data.astype(np.float32)
print(" Converting to float32") print(" Converting to float32")
data = data.astype(np.float32) data = data.astype(np.float32)
ftype = 0 ftype = 0

Loading…
Cancel
Save