integrating bounded l2 norm fixed point vector sum types. (#893)

divviup · Jan 25, 2023 · 3dbc0af · 3dbc0af
1 parent 0613aa0
commit 3dbc0af
Show file tree

Hide file tree

Showing 22 changed files with 2,058 additions and 336 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Dockerfile.interop b/Dockerfile.interop
@@ -17,7 +17,7 @@ COPY db /src/db
 COPY integration_tests /src/integration_tests
 COPY interop_binaries /src/interop_binaries
 COPY messages /src/messages
-RUN --mount=type=cache,target=/usr/local/cargo/registry --mount=type=cache,target=/src/target cargo build --profile $PROFILE -p janus_interop_binaries --bin $BINARY && cp /src/target/$PROFILE/$BINARY /$BINARY
+RUN --mount=type=cache,target=/usr/local/cargo/registry --mount=type=cache,target=/src/target cargo build --features fpvec_bounded_l2 --profile $PROFILE -p janus_interop_binaries --bin $BINARY && cp /src/target/$PROFILE/$BINARY /$BINARY
 
 FROM alpine:3.17.1
 ARG BINARY

diff --git a/Dockerfile.interop_aggregator b/Dockerfile.interop_aggregator
@@ -17,12 +17,12 @@ COPY interop_binaries /src/interop_binaries
 COPY messages /src/messages
 RUN --mount=type=cache,target=/usr/local/cargo/registry \
     --mount=type=cache,target=/src/target \
-    cargo build --profile $PROFILE -p janus_interop_binaries \
+    cargo build --features fpvec_bounded_l2 --profile $PROFILE -p janus_interop_binaries \
     --bin janus_interop_aggregator && \
     cp /src/target/$PROFILE/janus_interop_aggregator /janus_interop_aggregator
 RUN --mount=type=cache,target=/usr/local/cargo/registry \
     --mount=type=cache,target=/src/target \
-    cargo build --profile $PROFILE -p janus_aggregator \
+    cargo build --features fpvec_bounded_l2 --profile $PROFILE -p janus_aggregator \
     --bin aggregation_job_creator \
     --bin aggregation_job_driver \
     --bin collect_job_driver \

diff --git a/aggregator/Cargo.toml b/aggregator/Cargo.toml
@@ -14,6 +14,7 @@ rustdoc-args = ["--cfg", "docsrs"]
 
 [features]
 default = ["kube-rustls"]
+fpvec_bounded_l2 = ["dep:fixed", "janus_core/fpvec_bounded_l2"]
 tokio-console = ["dep:console-subscriber"]
 jaeger = ["dep:tracing-opentelemetry", "dep:opentelemetry-jaeger"]
 otlp = [
@@ -46,6 +47,7 @@ deadpool = { version = "0.9.5", features = ["rt_tokio_1"] }
 deadpool-postgres = "0.10.4"
 derivative = "2.2.0"
 futures = "0.3.25"
+fixed = { version = "1.19", optional = true }
 http = "0.2.8"
 http-api-problem = "0.56.0"
 hyper = "0.14.23"
@@ -95,7 +97,7 @@ hyper = "0.14.23"
 # lack of support for connecting to servers by IP addresses, which affects many
 # Kubernetes clusters. Enable the `test-util` feature for various utilities
 # used in unit tests.
-janus_aggregator = { workspace = true, features = ["kube-openssl", "test-util"] }
+janus_aggregator = { workspace = true, features = ["fpvec_bounded_l2", "kube-openssl", "test-util"] }
 mockito = "0.31.1"
 serde_test = "1.0.152"
 tempfile = "3.3.0"