snowykami/meilisearch
1
0
Fork 0
mirror of https://github.com/meilisearch/meilisearch.git synced 2025-10-11 06:06:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Do not create too many rayon tasks when processing the settings

Browse Source
This commit is contained in:
Kerollmops
2025-01-29 17:02:06 +01:00
parent e0f446e4d3
commit 4b488b2baf
3 changed files with 36 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
crates/milli/src/vector/ollama.rs
View File

@@ -98,6 +98,9 @@ impl Embedder {
text_chunks: Vec<Vec<String>>, text_chunks: Vec<Vec<String>>,
threads: &ThreadPoolNoAbort, threads: &ThreadPoolNoAbort,
) -> Result<Vec<Vec<Embedding>>, EmbedError> { ) -> Result<Vec<Vec<Embedding>>, EmbedError> {
if threads.active_operations() >= REQUEST_PARALLELISM {
text_chunks.into_iter().map(move |chunk| self.embed(&chunk, None)).collect()
} else {
threads threads
.install(move || { .install(move || {
text_chunks.into_par_iter().map(move |chunk| self.embed(&chunk, None)).collect() text_chunks.into_par_iter().map(move |chunk| self.embed(&chunk, None)).collect()
@@ -107,6 +110,7 @@ impl Embedder {
fault: FaultSource::Bug, fault: FaultSource::Bug,
})? })?
} }
}
pub(crate) fn embed_chunks_ref( pub(crate) fn embed_chunks_ref(
&self, &self,

4
crates/milli/src/vector/openai.rs
View File

@@ -255,6 +255,9 @@ impl Embedder {
text_chunks: Vec<Vec<String>>, text_chunks: Vec<Vec<String>>,
threads: &ThreadPoolNoAbort, threads: &ThreadPoolNoAbort,
) -> Result<Vec<Vec<Embedding>>, EmbedError> { ) -> Result<Vec<Vec<Embedding>>, EmbedError> {
if threads.active_operations() >= REQUEST_PARALLELISM {
text_chunks.into_iter().map(move |chunk| self.embed(&chunk, None)).collect()
} else {
threads threads
.install(move || { .install(move || {
text_chunks.into_par_iter().map(move |chunk| self.embed(&chunk, None)).collect() text_chunks.into_par_iter().map(move |chunk| self.embed(&chunk, None)).collect()
@@ -264,6 +267,7 @@ impl Embedder {
fault: FaultSource::Bug, fault: FaultSource::Bug,
})? })?
} }
}
pub(crate) fn embed_chunks_ref( pub(crate) fn embed_chunks_ref(
&self, &self,

4
crates/milli/src/vector/rest.rs
View File

@@ -188,6 +188,9 @@ impl Embedder {
text_chunks: Vec<Vec<String>>, text_chunks: Vec<Vec<String>>,
threads: &ThreadPoolNoAbort, threads: &ThreadPoolNoAbort,
) -> Result<Vec<Vec<Embedding>>, EmbedError> { ) -> Result<Vec<Vec<Embedding>>, EmbedError> {
if threads.active_operations() >= REQUEST_PARALLELISM {
text_chunks.into_iter().map(move |chunk| self.embed(chunk, None)).collect()
} else {
threads threads
.install(move || { .install(move || {
text_chunks.into_par_iter().map(move |chunk| self.embed(chunk, None)).collect() text_chunks.into_par_iter().map(move |chunk| self.embed(chunk, None)).collect()
@@ -197,6 +200,7 @@ impl Embedder {
fault: FaultSource::Bug, fault: FaultSource::Bug,
})? })?
} }
}
pub(crate) fn embed_chunks_ref( pub(crate) fn embed_chunks_ref(
&self, &self,