Skip to content

Commit

Permalink
ui default for rust, remove stray python, fix rayon in python
Browse files Browse the repository at this point in the history
  • Loading branch information
cgevans committed Jun 2, 2024
1 parent 6b32812 commit 50b7d75
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 5 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@ jobs:
continue-on-error: true
- name: Install carge llvm-cov
run: cargo install cargo-llvm-cov
# - name: Install X components
# run: sudo apt-get install -y libxinerama-dev libxcursor-dev libxfixes-dev libxft-dev libpango1.0-dev libpangoxft-1.0-0 libpangocairo-1.0-0
- name: Install X components
run: sudo apt-get install -y libxinerama-dev libxcursor-dev libxfixes-dev libxft-dev libpango1.0-dev libpangoxft-1.0-0 libpangocairo-1.0-0
- name: Run Clippy
run: cargo clippy --features ui,use_rayon
- name: Run tests and coverage
Expand All @@ -50,7 +50,7 @@ jobs:
export CARGO_TARGET_DIR=$CARGO_LLVM_COV_TARGET_DIR
export CARGO_INCREMENTAL=1
cargo llvm-cov clean --workspace
cargo test --features use_rayon # FIXME: ui
cargo test --features ui,use_rayon # FIXME: ui
cargo llvm-cov --no-run --lcov --output-path coverage.lcov
- uses: codecov/codecov-action@v3
with:
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
- Add Python typing for FFS results.
- Distinguish stored states and number of configurations for FFS surfaces.
- Make FFS state references more useful.
- Fix rayon use in Python (parallel execution).

# 0.13.1

Expand Down
2 changes: 1 addition & 1 deletion py-rgrow/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ pyo3-polars = {workspace = true}

[dependencies.rgrow]
path = "../rgrow"
features = ["python"]
features = ["python", "use_rayon"]
default-features = false

[dependencies.pyo3]
Expand Down
2 changes: 1 addition & 1 deletion rgrow/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ name = "rgrow"
path = "src/main.rs"

[features]
default = ["use_rayon"]
default = ["use_rayon", "ui"]
ui = ["fltk", "pixels"]
use_rayon = ["rayon"]
python = ["pyo3", "numpy"]
Expand Down
1 change: 1 addition & 0 deletions rgrow/src/ffs.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ use crate::tileset::{CanvasType, FromTileSet, Model, TileSet, SIZE_DEFAULT};

#[cfg(feature = "python")]
use polars::prelude::*;
#[cfg(feature = "python")]
use python::PyState;

use super::*;
Expand Down

0 comments on commit 50b7d75

Please sign in to comment.