Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

server-parallel : add "--reverse-prompt" + compiler warning fixes #4

Merged
merged 1 commit into from
Oct 6, 2023
Merged

server-parallel : add "--reverse-prompt" + compiler warning fixes #4

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 26 additions & 14 deletions examples/server-parallel/server.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
#include <chrono>
#include "frontend.h"
#include "common.h"
#include "llama.h"

#include "../server/httplib.h"
#include "../server/json.hpp"

#include <iostream>
#include <sstream>
#include <thread>
#include <vector>
#include "frontend.h"
#include "common.h"
#include "llama.h"
#include <chrono>

using namespace httplib;
using namespace std;
Expand Down Expand Up @@ -241,9 +243,7 @@ struct server_parallel_context {
string prompt = data.value("prompt", "");
for (llama_client_slot & slot : slots)
{
if (
slot_id == -1 && slot.available() ||
slot.id == slot_id)
if ((slot_id == -1 && slot.available()) || slot.id == slot_id)
{
slot.start(prompt, temperature);
LOG_TEE("slot %i is processing\n", slot.id);
Expand Down Expand Up @@ -429,8 +429,6 @@ struct server_parallel_context {
slot.generated_text += token_str;
slot.sampled = id;

size_t pos = 0;

size_t stop_pos =
findStoppingStrings(slot.generated_text, token_str.size(), STOP_FULL);

Expand Down Expand Up @@ -740,20 +738,34 @@ static void server_params_parse(int argc, char **argv, server_params &sparams,
else if (arg == "--numa")
{
params.numa = true;
} else if (arg == "-cb" || arg == "--cont-batching") {
} else if (arg == "-cb" || arg == "--cont-batching")
{
params.cont_batching = true;
} else if (arg == "-np" || arg == "--parallel") {
if (++i >= argc) {
}
else if (arg == "-np" || arg == "--parallel")
{
if (++i >= argc)
{
invalid_param = true;
break;
}
params.n_parallel = std::stoi(argv[i]);
} else if (arg == "-n" || arg == "--n-predict") {
if (++i >= argc) {
} else if (arg == "-n" || arg == "--n-predict")
{
if (++i >= argc)
{
invalid_param = true;
break;
}
params.n_predict = std::stoi(argv[i]);
} else if (arg == "-r" || arg == "--reverse-prompt")
{
if (++i >= argc)
{
invalid_param = true;
break;
}
params.antiprompt.push_back(argv[i]);
}
else
{
Expand Down