Skip to content

Commit b211d8d

Browse files
committed
Make it possible to disallow highs when building pyhq
An additional benefit is that the `dashboard` feature of `hyperqueue` will now be disabled in `pyhq`, where it is unnecessary.
1 parent 80c0017 commit b211d8d

File tree

4 files changed

+10
-5
lines changed

4 files changed

+10
-5
lines changed

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ jobs:
111111
- name: Compile
112112
env:
113113
HQ_BUILD_VERSION: ${{ needs.set-env.outputs.version }}
114-
run: cross build --target ${{ matrix.arch }} --no-default-features --profile dist
114+
run: cross build --target ${{ matrix.arch }} --no-default-features --features dashboard,highs --profile dist
115115

116116
- name: Prepare archive
117117
id: archive

.github/workflows/test.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,9 +108,9 @@ jobs:
108108
key: ${{ matrix.os }}
109109

110110
- name: Build HyperQueue
111-
run: cargo build --no-default-features
111+
run: cargo build --no-default-features --features dashboard,highs
112112
- name: Run HyperQueue
113-
run: cargo run --no-default-features -- --version
113+
run: ./target/debug/hq --version
114114

115115
- name: Setup Python
116116
uses: actions/setup-python@v2

crates/pyhq/Cargo.toml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ name = "hyperqueue"
1717
crate-type = ["cdylib"]
1818

1919
[dependencies]
20-
hyperqueue = { path = "../hyperqueue" }
20+
hyperqueue = { path = "../hyperqueue", default-features = false, features = ["jemalloc"] }
2121
tako = { path = "../tako" }
2222

2323
serde = { workspace = true }
@@ -31,6 +31,11 @@ pyo3-async-runtimes = { version = "0.25", features = ["tokio-runtime"] }
3131
pythonize = "0.25"
3232
termcolor = "1.1"
3333

34+
[features]
35+
default = ["highs"]
36+
highs = ["hyperqueue/highs"]
37+
microlp = ["hyperqueue/microlp"]
38+
3439
[package.metadata.maturin]
3540
python-source = "python"
3641

crates/tako/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ edition.workspace = true
66
rust-version.workspace = true
77

88
[features]
9-
default = ["highs"]
9+
default = []
1010
highs = ["dep:highs"]
1111
microlp = ["dep:microlp"]
1212

0 commit comments

Comments
 (0)