instruct.cpp, continue on empty line, endless instruct mode, refactors

Makefile

@@ -212,7 +212,7 @@ $(info I CC:       $(CCV))
 $(info I CXX:      $(CXXV))
 $(info )
 
-default: main quantize perplexity embedding
+default: main quantize perplexity embedding instruct
 
 #
 # Build library
@@ -228,7 +228,7 @@ common.o: examples/common.cpp examples/common.h
 	$(CXX) $(CXXFLAGS) -c examples/common.cpp -o common.o
 
 clean:
-	rm -vf *.o main quantize perplexity embedding
+	rm -vf *.o main quantize perplexity embedding instruct
 
 main: examples/main/main.cpp ggml.o llama.o common.o
 	$(CXX) $(CXXFLAGS) examples/main/main.cpp ggml.o llama.o common.o -o main $(LDFLAGS)
@@ -245,6 +245,9 @@ perplexity: examples/perplexity/perplexity.cpp ggml.o llama.o common.o
 embedding: examples/embedding/embedding.cpp ggml.o llama.o common.o
 	$(CXX) $(CXXFLAGS) examples/embedding/embedding.cpp ggml.o llama.o common.o -o embedding $(LDFLAGS)
 
+instruct: examples/instruct/instruct.cpp ggml.o llama.o common.o
+	$(CXX) $(CXXFLAGS) examples/instruct/instruct.cpp ggml.o llama.o common.o -o instruct $(LDFLAGS)
+
 #
 # Tests
 #

examples/CMakeLists.txt

@@ -33,4 +33,5 @@ else()
     add_subdirectory(quantize)
     add_subdirectory(perplexity)
     add_subdirectory(embedding)
+    add_subdirectory(instruct)
 endif()

examples/alpaca.sh

@@ -7,4 +7,4 @@
 cd `dirname $0`
 cd ..
 
-./main -m ./models/ggml-alpaca-7b-q4.bin --color -f ./prompts/alpaca.txt -ins -b 256 --top_k 10000 --temp 0.2 --repeat_penalty 1 -t 7
+./instruct -m ./models/alpaca-7B-ggml/ggml-model-q4_0.bin --color -f ./prompts/alpaca.txt -c 2024 -n -1

examples/common.cpp

@@ -191,7 +191,6 @@ void gpt_print_usage(int /*argc*/, char ** argv, const gpt_params & params) {
     fprintf(stderr, "  -h, --help            show this help message and exit\n");
     fprintf(stderr, "  -i, --interactive     run in interactive mode\n");
     fprintf(stderr, "  --interactive-first   run in interactive mode and wait for input right away\n");
-    fprintf(stderr, "  -ins, --instruct      run in instruction mode (use with Alpaca models)\n");
     fprintf(stderr, "  -r PROMPT, --reverse-prompt PROMPT\n");
     fprintf(stderr, "                        run in interactive mode and poll user input upon seeing PROMPT (can be\n");
     fprintf(stderr, "                        specified more than once for multiple prompts).\n");

examples/instruct/CMakeLists.txt

@@ -0,0 +1,4 @@
+set(TARGET instruct)
+add_executable(${TARGET} instruct.cpp)
+target_link_libraries(${TARGET} PRIVATE common llama ${CMAKE_THREAD_LIBS_INIT})
+target_compile_features(${TARGET} PRIVATE cxx_std_11)

examples/instruct/README.md

@@ -0,0 +1,3 @@
+# instruct
+
+TODO