Skip to content
Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
59 changes: 58 additions & 1 deletion .github/workflows/_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ jobs:
# cache-workspace-crates: 'false'

- name: Rust tests (no default features)
run: cargo test --no-default-features --verbose
run: cargo test --no-default-features --features abi3 --verbose
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actually adding --features abi3 doesn't solve the problem. We don't need this.

Noticed another potential problem (made a comment below). You may remove that and have another try.

You can also run this specific command cargo test --no-default-features locally to see if it works.

Thanks!

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It seems that the extension-module features were causing the test failures. After removing them, the tests pass locally.


- name: Rust tests
run: cargo test --verbose
Expand All @@ -75,6 +75,63 @@ jobs:
run: |
${{ matrix.platform.python_exec }} -m pytest --capture=no python/cocoindex/tests

build-test-free-threaded:
runs-on: ubuntu-latest
env:
RUSTFLAGS: "-C debuginfo=0"
CARGO_INCREMENTAL: "0"
SCCACHE_GHA_ENABLED: "true"
RUSTC_WRAPPER: "sccache"

steps:
- uses: actions/checkout@v4
with:
fetch-depth: 1

- name: Run sccache-cache
uses: mozilla-actions/sccache-action@v0.0.9

- name: Setup Python (3.14 free-threaded)
uses: actions/setup-python@v5
with:
python-version: '3.14'
allow-prereleases: true
freethreaded: true

- name: Verify interpreter configuration
run: |
python -c "import sys; print(f'GIL enabled: {sys._is_gil_enabled()}'); sys.exit(1) if sys._is_gil_enabled() else None"

- name: Setup Rust (stable)
run: rustup toolchain install stable --profile minimal

- name: Rust tests (no default features)
run: cargo test --no-default-features --verbose

- name: Rust tests
run: cargo test --verbose

- name: Setup venv
run: |
python -m venv .venv

- name: Install Python toolchains
run: |
.venv/bin/python -m pip install --upgrade pip
.venv/bin/python -m pip install maturin

- name: Python build (free-threaded)
run: |
.venv/bin/python -m maturin develop --no-default-features -F free-threaded --strip -E all-ci,free-threaded

- name: Python type check (mypy)
run: |
.venv/bin/python -m mypy python

- name: Python tests (free-threaded)
run: |
.venv/bin/python -m pytest --capture=no python/cocoindex/tests

validate-3p-notices:
runs-on: ubuntu-latest
steps:
Expand Down
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ license = "Apache-2.0"

[workspace.dependencies]
pyo3 = { version = "0.27.1", features = [
"abi3-py311",
"auto-initialize",
"chrono",
"uuid",
"extension-module",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we need this? This is deprecated:

https://pyo3.rs/main/features.html#extension-module

] }
pythonize = "0.27.0"
pyo3-async-runtimes = { version = "0.27.0", features = ["tokio-runtime"] }
Expand Down
2 changes: 2 additions & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,8 @@ all = [
# This is the set of dependencies that needs to be installed for the CI workflow.
all-ci = ["pytest", "pytest-asyncio", "mypy", "pydantic>=2.11.9"]

free-threaded = ["sentence-transformers>=3.3.1", "colpali-engine"]

[tool.mypy]
python_version = "3.11"
strict = true
Expand Down
3 changes: 2 additions & 1 deletion rust/cocoindex/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,9 @@ name = "cocoindex_engine"
crate-type = ["cdylib"]

[features]
default = ["legacy-states-v0"]
default = ["legacy-states-v0", "abi3"]
legacy-states-v0 = []
abi3 = ["pyo3/abi3-py311"]

[dependencies]
cocoindex_utils = { path = "../utils", features = [
Expand Down
2 changes: 1 addition & 1 deletion rust/cocoindex/src/py/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -603,7 +603,7 @@ fn seder_roundtrip<'py>(
}

/// A Python module implemented in Rust.
#[pymodule]
#[pymodule(gil_used = false)]
#[pyo3(name = "_engine")]
fn cocoindex_engine(m: &Bound<'_, PyModule>) -> PyResult<()> {
m.add("__version__", env!("CARGO_PKG_VERSION"))?;
Expand Down
Loading