Skip to content

Commit

Permalink
Update packed_simd and run miri tests on simd code (#4654)
Browse files Browse the repository at this point in the history
* Update packed_simd and run miri tests on simd code

* Unpin nightly version
  • Loading branch information
jhorstmann authored Aug 6, 2023
1 parent bcc04a4 commit 3b24ca1
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 12 deletions.
6 changes: 2 additions & 4 deletions .github/workflows/arrow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -142,8 +142,7 @@ jobs:
- name: Setup Rust toolchain
uses: ./.github/actions/setup-builder
with:
# Pinned nightly (#4651)
rust-version: nightly-2023-08-03
rust-version: nightly
- name: Test arrow-array with SIMD
run: cargo test -p arrow-array --features simd
- name: Test arrow-ord with SIMD
Expand All @@ -169,8 +168,7 @@ jobs:
- name: Setup Rust toolchain
uses: ./.github/actions/setup-builder
with:
# Pinned nightly (#4651)
rust-version: nightly-2023-08-03
rust-version: nightly
target: wasm32-unknown-unknown,wasm32-wasi
- name: Build wasm32-unknown-unknown
run: cargo build -p arrow --no-default-features --features=json,csv,ipc,simd,ffi --target wasm32-unknown-unknown
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,7 @@ jobs:
strategy:
matrix:
arch: [ amd64 ]
# Pinned nightly (#4651)
rust: [ nightly-2023-08-03 ]
rust: [ nightly ]
container:
image: ${{ matrix.arch }}/rust
env:
Expand Down
8 changes: 3 additions & 5 deletions .github/workflows/miri.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,7 @@
# Must be run with nightly rust for example
# rustup default nightly


# stacked borrows checking uses too much memory to run successfully in github actions
# re-enable if the CI is migrated to something more powerful (https://github.com/apache/arrow-rs/issues/1833)
# see also https://github.com/rust-lang/miri/issues/1367
export MIRIFLAGS="-Zmiri-disable-isolation -Zmiri-disable-stacked-borrows"
export MIRIFLAGS="-Zmiri-disable-isolation"
cargo miri setup
cargo clean

Expand All @@ -18,3 +14,5 @@ cargo miri test -p arrow-buffer
cargo miri test -p arrow-data --features ffi
cargo miri test -p arrow-schema --features ffi
cargo miri test -p arrow-array
cargo miri test -p arrow-arith --features simd
cargo miri test -p arrow-ord --features simd
2 changes: 1 addition & 1 deletion arrow-array/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ chrono-tz = { version = "0.8", optional = true }
num = { version = "0.4.1", default-features = false, features = ["std"] }
half = { version = "2.1", default-features = false, features = ["num-traits"] }
hashbrown = { version = "0.14", default-features = false }
packed_simd = { version = "0.3", default-features = false, optional = true, package = "packed_simd_2" }
packed_simd = { version = "0.3.9", default-features = false, optional = true }

[features]
simd = ["packed_simd"]
Expand Down

0 comments on commit 3b24ca1

Please sign in to comment.