mirror of
https://github.com/ggerganov/llama.cpp.git
synced 2026-02-05 13:53:23 +02:00
Some checks failed
Build Actions Cache / ubuntu-24-vulkan-cache (push) Has been cancelled
Build Actions Cache / ubuntu-24-spacemit-cache (push) Has been cancelled
Build Actions Cache / windows-2022-rocm-cache (push) Has been cancelled
CI / macOS-latest-cmake-arm64 (push) Has been cancelled
CI / macOS-latest-cmake-x64 (push) Has been cancelled
CI / macOS-latest-cmake-arm64-webgpu (push) Has been cancelled
CI / ubuntu-cpu-cmake (arm64, ubuntu-22.04-arm) (push) Has been cancelled
CI / ubuntu-cpu-cmake (ppc64le, ubuntu-24.04-ppc64le) (push) Has been cancelled
CI / ubuntu-cpu-cmake (s390x, ubuntu-24.04-s390x) (push) Has been cancelled
CI / ubuntu-cpu-cmake (x64, ubuntu-22.04) (push) Has been cancelled
CI / ubuntu-latest-cmake-sanitizer (Debug, ADDRESS) (push) Has been cancelled
CI / ubuntu-latest-cmake-sanitizer (Debug, THREAD) (push) Has been cancelled
CI / ubuntu-latest-cmake-sanitizer (Debug, UNDEFINED) (push) Has been cancelled
CI / ubuntu-latest-llguidance (push) Has been cancelled
CI / ubuntu-latest-cmake-rpc (push) Has been cancelled
CI / ubuntu-24-cmake-vulkan-deb (push) Has been cancelled
CI / ubuntu-24-cmake-vulkan (push) Has been cancelled
CI / ubuntu-24-cmake-webgpu (push) Has been cancelled
CI / ubuntu-24-wasm-webgpu (push) Has been cancelled
CI / ubuntu-22-cmake-hip (push) Has been cancelled
CI / ubuntu-22-cmake-musa (push) Has been cancelled
CI / ubuntu-22-cmake-sycl (push) Has been cancelled
CI / ubuntu-22-cmake-sycl-fp16 (push) Has been cancelled
CI / build-linux-cross (push) Has been cancelled
CI / build-cmake-pkg (push) Has been cancelled
CI / macOS-latest-cmake-ios (push) Has been cancelled
CI / macOS-latest-cmake-tvos (push) Has been cancelled
CI / macOS-latest-cmake-visionos (push) Has been cancelled
CI / windows-msys2 (Release, clang-x86_64, CLANG64) (push) Has been cancelled
CI / windows-msys2 (Release, ucrt-x86_64, UCRT64) (push) Has been cancelled
CI / windows-latest-cmake (arm64, llvm-arm64, -G "Ninja Multi-Config" -D CMAKE_TOOLCHAIN_FILE=cmake/arm64-windows-llvm.cmake -DGGML_NATIVE=OFF -DLLAMA_BUILD_SERVER=ON) (push) Has been cancelled
CI / windows-latest-cmake (arm64, llvm-arm64-opencl-adreno, -G "Ninja Multi-Config" -D CMAKE_TOOLCHAIN_FILE=cmake/arm64-windows-llvm.cmake -DCMAKE_PREFIX_PATH="$env:RUNNER_TEMP/opencl-arm64-release" -DGGML_OPENCL=ON -DGGML_OPENCL_USE_ADRENO_KERNELS=ON) (push) Has been cancelled
CI / windows-latest-cmake (x64, cpu-x64 (static), -G "Ninja Multi-Config" -D CMAKE_TOOLCHAIN_FILE=cmake/x64-windows-llvm.cmake -DGGML_NATIVE=OFF -DLLAMA_BUILD_SERVER=ON -DGGML_RPC=ON -DBUILD_SHARED_LIBS=OFF) (push) Has been cancelled
CI / windows-latest-cmake (x64, openblas-x64, -G "Ninja Multi-Config" -D CMAKE_TOOLCHAIN_FILE=cmake/x64-windows-llvm.cmake -DGGML_NATIVE=OFF -DLLAMA_BUILD_SERVER=ON -DGGML_RPC=ON -DGGML_BACKEND_DL=ON -DGGML_CPU_ALL_VARIANTS=ON -DGGML_OPENMP=OFF -DGGML_BLAS=… (push) Has been cancelled
CI / windows-latest-cmake (x64, vulkan-x64, -DCMAKE_BUILD_TYPE=Release -DGGML_NATIVE=OFF -DLLAMA_BUILD_SERVER=ON -DGGML_RPC=ON -DGGML_BACKEND_DL=ON -DGGML_CPU_ALL_VARIANTS=ON -DGGML_VULKAN=ON) (push) Has been cancelled
CI / ubuntu-latest-cmake-cuda (push) Has been cancelled
CI / windows-2022-cmake-cuda (12.4) (push) Has been cancelled
CI / windows-latest-cmake-sycl (push) Has been cancelled
CI / windows-latest-cmake-hip (push) Has been cancelled
CI / ios-xcode-build (push) Has been cancelled
CI / android-build (push) Has been cancelled
CI / android-ndk-build (arm64-cpu, -D ANDROID_ABI=arm64-v8a -D ANDROID_PLATFORM=android-31 -D CMAKE_TOOLCHAIN_FILE=${ANDROID_NDK_ROOT}/build/cmake/android.toolchain.cmake -D GGML_NATIVE=OFF -DGGML_CPU_ARM_ARCH=armv8.5-a+fp16+i8mm -G Ninja -D LLAMA_CURL=OFF … (push) Has been cancelled
CI / android-ndk-build (arm64-snapdragon, --preset arm64-android-snapdragon-release) (push) Has been cancelled
CI / openEuler-latest-cmake-cann (aarch64, Release, 310p) (push) Has been cancelled
CI / openEuler-latest-cmake-cann (aarch64, Release, 910b) (push) Has been cancelled
CI / openEuler-latest-cmake-cann (x86, Release, 310p) (push) Has been cancelled
CI / openEuler-latest-cmake-cann (x86, Release, 910b) (push) Has been cancelled
CI / ggml-ci-x64-cpu-low-perf (push) Has been cancelled
CI / ggml-ci-arm64-cpu-low-perf (push) Has been cancelled
CI / ggml-ci-x64-cpu-high-perf (push) Has been cancelled
CI / ggml-ci-arm64-cpu-high-perf (push) Has been cancelled
CI / ggml-ci-arm64-cpu-high-perf-sve (push) Has been cancelled
CI / ggml-ci-x64-nvidia-cuda (push) Has been cancelled
CI / ggml-ci-x64-nvidia-vulkan-cm (push) Has been cancelled
CI / ggml-ci-x64-nvidia-vulkan-cm2 (push) Has been cancelled
CI / ggml-ci-x64-cpu-amx (push) Has been cancelled
CI / ggml-ci-mac-metal (push) Has been cancelled
CI / ggml-ci-mac-vulkan (push) Has been cancelled
CI / ggml-ci-arm64-cpu-kleidiai (push) Has been cancelled
CI / ubuntu-cpu-cmake-riscv64-native (push) Has been cancelled
CI / ubuntu-cmake-sanitizer-riscv64-native (Debug, ADDRESS) (push) Has been cancelled
CI / ubuntu-cmake-sanitizer-riscv64-native (Debug, THREAD) (push) Has been cancelled
CI / ubuntu-cmake-sanitizer-riscv64-native (Debug, UNDEFINED) (push) Has been cancelled
CI / ubuntu-llguidance-riscv64-native (push) Has been cancelled
CI / ubuntu-cmake-rpc-riscv64-native (push) Has been cancelled
CI / ggml-ci-arm64-graviton4-kleidiai (push) Has been cancelled
CI / macOS-latest-swift (generic/platform=iOS) (push) Has been cancelled
CI / macOS-latest-swift (generic/platform=macOS) (push) Has been cancelled
CI / macOS-latest-swift (generic/platform=tvOS) (push) Has been cancelled
* grammar : add support for std::regex_search() with trigger patterns * common : update hermes2 pro trigger to search instead of match * common : use regex_search with anchoring for partial matching * common : adjust regex partial tests to use new pattern * grammar : check pattern directly instead of adding a type * common : adjust existing patterns to match new semantics
205 lines
8.2 KiB
C++
205 lines
8.2 KiB
C++
#include "regex-partial.h"
|
|
#include "common.h"
|
|
#include <functional>
|
|
#include <optional>
|
|
|
|
common_regex::common_regex(const std::string & pattern) :
|
|
pattern(pattern),
|
|
rx(pattern),
|
|
rx_reversed_partial(regex_to_reversed_partial_regex(pattern)) {}
|
|
|
|
common_regex_match common_regex::search(const std::string & input, size_t pos, bool as_match) const {
|
|
std::smatch match;
|
|
if (pos > input.size()) {
|
|
throw std::runtime_error("Position out of bounds");
|
|
}
|
|
auto start = input.begin() + pos;
|
|
auto found = as_match
|
|
? std::regex_match(start, input.end(), match, rx)
|
|
: std::regex_search(start, input.end(), match, rx);
|
|
if (found) {
|
|
common_regex_match res;
|
|
res.type = COMMON_REGEX_MATCH_TYPE_FULL;
|
|
for (size_t i = 0; i < match.size(); ++i) {
|
|
auto begin = pos + match.position(i);
|
|
res.groups.emplace_back(begin, begin + match.length(i));
|
|
}
|
|
return res;
|
|
}
|
|
std::match_results<std::string::const_reverse_iterator> srmatch;
|
|
if (std::regex_search(input.rbegin(), input.rend() - pos, srmatch, rx_reversed_partial, std::regex_constants::match_continuous)) {
|
|
auto group = srmatch[1].str();
|
|
if (group.length() != 0) {
|
|
auto it = srmatch[1].second.base();
|
|
// auto position = static_cast<size_t>(std::distance(input.begin(), it));
|
|
if ((!as_match) || it == input.begin()) {
|
|
common_regex_match res;
|
|
res.type = COMMON_REGEX_MATCH_TYPE_PARTIAL;
|
|
const size_t begin = std::distance(input.begin(), it);
|
|
const size_t end = input.size();
|
|
if (begin == std::string::npos || end == std::string::npos || begin > end) {
|
|
throw std::runtime_error("Invalid range");
|
|
}
|
|
res.groups.push_back({begin, end});
|
|
return res;
|
|
}
|
|
}
|
|
}
|
|
return {};
|
|
}
|
|
|
|
/*
|
|
Transforms a regex pattern to a partial match pattern that operates on a reversed input string to find partial final matches of the original pattern.
|
|
|
|
Ideally we'd like to use boost::match_partial (https://beta.boost.org/doc/libs/1_59_0/libs/regex/doc/html/boost_regex/partial_matches.html)
|
|
to see if a string ends with a partial regex match, but but it's not in std::regex yet.
|
|
Instead, we'll the regex into a partial match regex operating as a full match on the reverse iterators of the input.
|
|
|
|
- /abcd/ -> ^(dcba|cba|ba|a) -> ^((?:(?:(?:(?:d)?c)?b)?a)
|
|
- /a|b/ -> ^(a|b)
|
|
- /a*?/ -> error, could match ""
|
|
- /a*b/ -> ^((?:b)?a*+) (final repetitions become eager)
|
|
- /.*?ab/ -> ^((?:b)?a) (omit .*)
|
|
- /a.*?b/ -> ^((?:b)?.*?a) (keep reluctant matches)
|
|
- /a(bc)d/ -> ^((?:(?:d)?(?:(?:c)?b))?a)
|
|
- /a(bc|de)/ -> ^((?:(?:(?:e)?d)?|(?:(?:c)?b)?)?a)
|
|
- /ab{2,4}c/ -> ^cbbb?b?a -> ^((?:(?:(?:(?:(?:c)?b)?b)?b?)?b?)?a)
|
|
|
|
The regex will match a reversed string fully, and the end of the first (And only) capturing group will indicate the reversed start of the original partial pattern.
|
|
All other groups are turned into non-capturing groups, and reluctant quantifiers are ignored.
|
|
*/
|
|
std::string regex_to_reversed_partial_regex(const std::string & pattern) {
|
|
auto it = pattern.begin();
|
|
const auto end = pattern.end();
|
|
|
|
std::function<std::string()> process = [&]() {
|
|
std::vector<std::vector<std::string>> alternatives(1);
|
|
std::vector<std::string> * sequence = &alternatives.back();
|
|
|
|
while (it != end) {
|
|
if (*it == '[') {
|
|
auto start = it;
|
|
++it;
|
|
while (it != end) {
|
|
if ((*it == '\\') && (++it != end)) {
|
|
++it;
|
|
} else if ((it != end) && (*it == ']')) {
|
|
break;
|
|
} else {
|
|
++it;
|
|
}
|
|
}
|
|
if (it == end) {
|
|
throw std::runtime_error("Unmatched '[' in pattern");
|
|
}
|
|
++it;
|
|
sequence->push_back(std::string(start, it));
|
|
} else if (*it == '*' || *it == '?' || *it == '+') {
|
|
if (sequence->empty()) {
|
|
throw std::runtime_error("Quantifier without preceding element");
|
|
}
|
|
sequence->back() += *it;
|
|
auto is_star = *it == '*';
|
|
++it;
|
|
if (is_star) {
|
|
if (*it == '?') {
|
|
++it;
|
|
}
|
|
}
|
|
} else if (*it == '{') {
|
|
if (sequence->empty()) {
|
|
throw std::runtime_error("Repetition without preceding element");
|
|
}
|
|
++it;
|
|
auto start = it;
|
|
while (it != end && *it != '}') {
|
|
++it;
|
|
}
|
|
if (it == end) {
|
|
throw std::runtime_error("Unmatched '{' in pattern");
|
|
}
|
|
auto parts = string_split(std::string(start, it), ",");
|
|
++it;
|
|
if (parts.size() > 2) {
|
|
throw std::runtime_error("Invalid repetition range in pattern");
|
|
}
|
|
|
|
auto parseOptInt = [&](const std::string & s, const std::optional<int> & def = std::nullopt) -> std::optional<int> {
|
|
if (s.empty()) {
|
|
return def;
|
|
}
|
|
return std::stoi(s);
|
|
};
|
|
auto min = parseOptInt(parts[0], 0);
|
|
auto max = parts.size() == 1 ? min : parseOptInt(parts[1]);
|
|
if (min && max && *max < *min) {
|
|
throw std::runtime_error("Invalid repetition range in pattern");
|
|
}
|
|
// Brutal but... let's repeat at least min times, then ? for the delta between min & max (or * for unbounded)
|
|
auto part = sequence->back();
|
|
sequence->pop_back();
|
|
for (int i = 0; i < *min; i++) {
|
|
sequence->push_back(part);
|
|
}
|
|
if (max) {
|
|
for (int i = *min; i < *max; i++) {
|
|
sequence->push_back(part + "?");
|
|
}
|
|
} else {
|
|
sequence->push_back(part + "*");
|
|
}
|
|
} else if (*it == '(') {
|
|
++it;
|
|
if (it != end && *it == '?' && (it + 1 != end) && *(it + 1) == ':') {
|
|
it += 2;
|
|
}
|
|
auto sub = process();
|
|
if (*it != ')') {
|
|
throw std::runtime_error("Unmatched '(' in pattern");
|
|
}
|
|
++it;
|
|
auto & part = sequence->emplace_back("(?:");
|
|
part += sub;
|
|
part += ")";
|
|
} else if (*it == ')') {
|
|
break;
|
|
} else if (*it == '|') {
|
|
++it;
|
|
alternatives.emplace_back();
|
|
sequence = &alternatives.back();
|
|
} else if (*it == '\\' && (++it != end)) {
|
|
auto str = std::string("\\") + *it;
|
|
sequence->push_back(str);
|
|
++it;
|
|
} else if (it != end) {
|
|
sequence->push_back(std::string(1, *it));
|
|
++it;
|
|
}
|
|
}
|
|
|
|
// /abcd/ -> ^(dcba|cba|ba|a) -> ^((?:(?:(?:d)?c)?b)?a)
|
|
// if n(=4) parts, opening n-1(=3) non-capturing groups after the 1 capturing group
|
|
// We'll do the outermost capturing group and final .* in the enclosing function.
|
|
std::vector<std::string> res_alts;
|
|
for (const auto & parts : alternatives) {
|
|
auto & res = res_alts.emplace_back();
|
|
for (size_t i = 0; i < parts.size() - 1; i++) {
|
|
res += "(?:";
|
|
}
|
|
for (auto it = parts.rbegin(); it != parts.rend(); ++it) {
|
|
res += *it;
|
|
if (it != parts.rend() - 1) {
|
|
res += ")?";
|
|
}
|
|
}
|
|
}
|
|
return string_join(res_alts, "|");
|
|
};
|
|
auto res = process();
|
|
if (it != end) {
|
|
throw std::runtime_error("Unmatched '(' in pattern");
|
|
}
|
|
|
|
return "^(" + res + ")";
|
|
}
|