Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix blosc2 upgrade API changes #176

Merged
merged 1 commit into from
Sep 10, 2024
Merged

Fix blosc2 upgrade API changes #176

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
32 changes: 16 additions & 16 deletions src/blosc2.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,18 +35,18 @@ pub mod blosc2 {
return Ok(RustyBuffer::from(vec![]));
}

let mut cparams = CParams::from_typesize(typesize.unwrap_or_else(|| input.itemsize()))
let cparams = CParams::from_typesize(typesize.unwrap_or_else(|| input.itemsize()))
.set_codec(codec.map_or_else(Codec::default, Into::into))
.set_clevel(clevel.map_or_else(CLevel::default, Into::into))
.set_filter(filter.map_or_else(Filter::default, Into::into))
.set_nthreads(nthreads.unwrap_or_else(libcramjam::blosc2::blosc2::get_nthreads));
let mut dparams =
let dparams =
DParams::default().set_nthreads(nthreads.unwrap_or_else(libcramjam::blosc2::blosc2::get_nthreads));

let storage = Storage::default()
.set_contiguous(true)
.set_cparams(&mut cparams)
.set_dparams(&mut dparams);
.set_cparams(cparams)
.set_dparams(dparams);

let mut schunk = SChunk::new(storage);
io::copy(&mut BufReader::new(input), &mut schunk)?;
Expand All @@ -73,18 +73,18 @@ pub mod blosc2 {
return Ok(0);
}

let mut cparams = CParams::from_typesize(typesize.unwrap_or_else(|| input.itemsize()))
let cparams = CParams::from_typesize(typesize.unwrap_or_else(|| input.itemsize()))
.set_codec(codec.map_or_else(Codec::default, Into::into))
.set_clevel(clevel.map_or_else(CLevel::default, Into::into))
.set_filter(filter.map_or_else(Filter::default, Into::into))
.set_nthreads(nthreads.unwrap_or_else(libcramjam::blosc2::blosc2::get_nthreads));
let mut dparams =
let dparams =
DParams::default().set_nthreads(nthreads.unwrap_or_else(libcramjam::blosc2::blosc2::get_nthreads));

let storage = Storage::default()
.set_contiguous(true)
.set_cparams(&mut cparams)
.set_dparams(&mut dparams);
.set_cparams(cparams)
.set_dparams(dparams);

if let BytesType::RustyFile(_file) = output {
return Err(pyo3::exceptions::PyNotImplementedError::new_err(
Expand Down Expand Up @@ -229,18 +229,18 @@ pub mod blosc2 {
codec: Option<PyCodec>,
nthreads: Option<usize>,
) -> PyResult<Self> {
let mut cparams = CParams::from_typesize(typesize.unwrap_or(1))
let cparams = CParams::from_typesize(typesize.unwrap_or(1))
.set_codec(codec.map_or_else(Codec::default, Into::into))
.set_clevel(clevel.map_or_else(CLevel::default, Into::into))
.set_filter(filter.map_or_else(Filter::default, Into::into))
.set_nthreads(nthreads.unwrap_or_else(libcramjam::blosc2::blosc2::get_nthreads));
let mut dparams =
let dparams =
DParams::default().set_nthreads(nthreads.unwrap_or_else(libcramjam::blosc2::blosc2::get_nthreads));

let mut storage = Storage::default()
.set_contiguous(true)
.set_cparams(&mut cparams)
.set_dparams(&mut dparams);
.set_cparams(cparams)
.set_dparams(dparams);
if let Some(pth) = path {
storage = storage.set_urlpath(pth).map_err(CompressionError::from_err)?;
}
Expand Down Expand Up @@ -413,18 +413,18 @@ pub mod blosc2 {
from_bytes_cb: Option<PyObject>,
to_bytes_cb: Option<PyObject>,
) -> PyResult<Self> {
let mut cparams = CParams::from_typesize(typesize.unwrap_or(1))
let cparams = CParams::from_typesize(typesize.unwrap_or(1))
.set_codec(codec.map_or_else(Codec::default, Into::into))
.set_clevel(clevel.map_or_else(CLevel::default, Into::into))
.set_filter(filter.map_or_else(Filter::default, Into::into))
.set_nthreads(nthreads.unwrap_or_else(libcramjam::blosc2::blosc2::get_nthreads));
let mut dparams =
let dparams =
DParams::default().set_nthreads(nthreads.unwrap_or_else(libcramjam::blosc2::blosc2::get_nthreads));

let mut storage = Storage::default()
.set_contiguous(true)
.set_cparams(&mut cparams)
.set_dparams(&mut dparams);
.set_cparams(cparams)
.set_dparams(dparams);
if let Some(pth) = path {
storage = storage.set_urlpath(pth).map_err(CompressionError::from_err)?;
}
Expand Down