Skip to content

Commit 55cc16d

Browse files
feat(planner): depend on sketch-bench rqe-optimizer MILP (#794)
Add rqe-optimizer (sketch-bench main) as a git dependency of asap-planner-rs with a smoke test that solves a one-query MILP through HiGHS. Install cmake and libclang-dev for the HiGHS build in the planner and query-engine images and in the CI jobs that compile the planner. Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
1 parent 6888b19 commit 55cc16d

7 files changed

Lines changed: 278 additions & 8 deletions

File tree

‎.github/workflows/correctness.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,10 +110,10 @@ jobs:
110110
- name: Install Rust
111111
uses: dtolnay/rust-toolchain@stable
112112

113-
- name: Install protoc
113+
- name: Install protoc and HiGHS build deps
114114
run: |
115115
sudo apt-get update -qq
116-
sudo apt-get install -y protobuf-compiler
116+
sudo apt-get install -y protobuf-compiler cmake libclang-dev
117117
118118
- name: Run sccache
119119
uses: mozilla-actions/sccache-action@v0.0.4

‎.github/workflows/rust.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,10 @@ jobs:
4646
toolchain: stable
4747
components: rustfmt, clippy
4848

49-
- name: Install protoc
49+
- name: Install protoc and HiGHS build deps
5050
run: |
5151
sudo apt-get update
52-
sudo apt-get install -y protobuf-compiler
52+
sudo apt-get install -y protobuf-compiler cmake libclang-dev
5353
5454
- name: Run sccache-cache
5555
uses: mozilla-actions/sccache-action@v0.0.4
@@ -82,10 +82,10 @@ jobs:
8282
with:
8383
toolchain: stable
8484

85-
- name: Install protoc
85+
- name: Install protoc and HiGHS build deps
8686
run: |
8787
sudo apt-get update
88-
sudo apt-get install -y protobuf-compiler
88+
sudo apt-get install -y protobuf-compiler cmake libclang-dev
8989
9090
- name: Run sccache-cache
9191
uses: mozilla-actions/sccache-action@v0.0.4

‎Cargo.lock‎

Lines changed: 197 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎asap-planner-rs/Cargo.toml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ indexmap.workspace = true
4141
chrono.workspace = true
4242
promql-parser = "0.5.0"
4343
reqwest = { version = "0.11", features = ["blocking", "json"] }
44+
rqe-optimizer = { git = "https://github.com/ProjectASAP/sketch-bench", branch = "main" }
4445

4546
[dev-dependencies]
4647
tempfile = "3.20"

‎asap-planner-rs/Dockerfile‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,11 @@ LABEL description="ASAP Planner (Rust) for SketchDB"
55

66
WORKDIR /code
77

8-
# Required by prost-build dependencies during cargo build
8+
# protobuf-compiler: prost-build. cmake, libclang-dev: HiGHS (rqe-optimizer's MILP solver).
99
RUN apt-get update && apt-get install -y --no-install-recommends \
1010
protobuf-compiler \
11+
cmake \
12+
libclang-dev \
1113
&& rm -rf /var/lib/apt/lists/*
1214

1315
COPY asap-common ./asap-common
@@ -42,6 +44,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
4244
ca-certificates \
4345
libssl3 \
4446
zlib1g \
47+
libstdc++6 \
4548
&& rm -rf /var/lib/apt/lists/*
4649

4750
RUN mkdir -p /app/input /app/output

0 commit comments

Comments
 (0)