remove bert

Dockerfile

@@ -2,15 +2,13 @@ FROM --platform=$BUILDPLATFORM rust as builder
 RUN apt-get update && apt-get install -y \
     g++-x86-64-linux-gnu libc6-dev-amd64-cross \
     g++-aarch64-linux-gnu libc6-dev-arm64-cross \
-    g++-arm-linux-gnueabihf libc6-dev-armhf-cross \
-    python3 python3-pip && \
+    g++-arm-linux-gnueabihf libc6-dev-armhf-cross && \
     rm -rf /var/lib/apt/lists/*
 RUN rustup target add \
     x86_64-unknown-linux-gnu aarch64-unknown-linux-gnu armv7-unknown-linux-gnueabihf
 RUN rustup toolchain install \
     stable-x86_64-unknown-linux-gnu stable-aarch64-unknown-linux-gnu stable-armv7-unknown-linux-gnueabihf
 RUN rustup component add rustfmt
-RUN pip3 install torch==2.0.0
 ENV CARGO_TARGET_X86_64_UNKNOWN_LINUX_GNU_LINKER=x86_64-linux-gnu-gcc \
     CC_x86_64_unknown_linux_gnu=x86_64-linux-gnu-gcc \
     CXX_x86_64_unknown_linux_gnu=x86_64-linux-gnu-g++ \
@@ -21,9 +19,6 @@ ENV CARGO_TARGET_X86_64_UNKNOWN_LINUX_GNU_LINKER=x86_64-linux-gnu-gcc \
     CC_armv7_unknown_linux_gnueabihf=arm-linux-gnueabihf-gcc \
     CXX_armv7_unknown_linux_gnueabihf=arm-linux-gnueabihf-g++ \
     CARGO_INCREMENTAL=0 \
-    LIBTORCH=/usr/local/lib/python3.9/dist-packages/torch \
-    LIBTORCH_CXX11_ABI=0 \
-    DYLD_LIBRARY_PATH=/usr/local/lib/python3.9/dist-packages/torch/lib
 
 FROM --platform=$BUILDPLATFORM builder AS base-dir
 WORKDIR /app
@@ -57,17 +52,13 @@ RUN mv target/armv7-unknown-linux-gnueabihf/release/summa-server-bin /bin/summa-
 # Final arch images ----------------------
 FROM --platform=amd64 gcr.io/distroless/cc AS final-amd64
 COPY --from=build-amd64 /bin/summa-server /bin/summa-server
-COPY --from=build-amd64 /usr/local/lib /usr/local/lib
 
 FROM --platform=arm64 gcr.io/distroless/cc:latest-arm64 AS final-arm64
 COPY --from=build-arm64 /bin/summa-server /bin/summa-server
-COPY --from=build-arm64 /usr/local/lib /usr/local/lib
 
 FROM --platform=arm/v7 gcr.io/distroless/cc:latest-arm AS final-arm
 COPY --from=build-arm /bin/summa-server /bin/summa-server
-COPY --from=build-arm /usr/local/lib /usr/local/lib
 
 # Final image ----------------------------
 FROM final-${TARGETARCH}
-ENV LD_LIBRARY_PATH=/usr/local/lib/python3.9/dist-packages/torch/lib/
 ENTRYPOINT ["/bin/summa-server"]

summa-core/Cargo.toml

@@ -15,7 +15,6 @@ doc = true
 fs = ["tantivy/mmap", "tokio/fs"]
 hyper-external-request = ["hyper", "hyper-tls"]
 metrics = ["opentelemetry"]
-nn = ["rust-bert"]
 tokio-rt = ["tokio/rt"]
 
 [dev-dependencies]
@@ -47,7 +46,6 @@ prost = { workspace = true }
 rand = { workspace = true }
 rayon = { workspace = true }
 regex = { workspace = true }
-rust-bert = { version = "0.21", optional = true }
 rustc-hash = "1.1.0"
 serde = { workspace = true }
 serde_bytes = { workspace = true }

summa-core/src/components/query_parser/morphology/manager.rs

@@ -1,9 +1,6 @@
 use std::collections::HashMap;
 
-#[cfg(not(feature = "nn"))]
 use crate::components::query_parser::morphology::english::EnglishMorphology;
-#[cfg(feature = "nn")]
-use crate::components::query_parser::morphology::english_nn::EnglishNNMorphology as EnglishMorphology;
 use crate::components::query_parser::morphology::Morphology;
 
 #[derive(Clone)]

summa-core/src/components/query_parser/morphology/mod.rs

@@ -3,8 +3,6 @@ use tantivy::query::{DisjunctionMaxQuery, Query, TermQuery};
 use tantivy::schema::{Field, FieldType, IndexRecordOption};
 
 mod english;
-#[cfg(feature = "nn")]
-mod english_nn;
 mod manager;
 
 pub use manager::MorphologyManager;

summa-server/Cargo.toml

@@ -30,7 +30,7 @@ maintenance = { status = "actively-developed" }
 tonic-build = { version = "0.9.1", default-features = false, features = ["prost", "transport"] }
 
 [dev-dependencies]
-summa-core = { version = "0.17.2", path = "../summa-core", features = ["fs", "hyper-external-request", "nn", "tokio-rt"] }
+summa-core = { version = "0.17.2", path = "../summa-core", features = ["fs", "hyper-external-request", "tokio-rt"] }
 tempdir = "0.3.7"
 
 [dependencies]
@@ -59,7 +59,7 @@ serde = { workspace = true }
 serde_derive = "1.0"
 serde_json = { workspace = true }
 serde_yaml = { workspace = true }
-summa-core = { version = "0.17.2", path = "../summa-core", features = ["fs", "hyper-external-request", "nn", "tokio-rt"] }
+summa-core = { version = "0.17.2", path = "../summa-core", features = ["fs", "hyper-external-request", "tokio-rt"] }
 summa-proto = { workspace = true, features = ["grpc"] }
 take_mut = { workspace = true }
 tantivy = { workspace = true }