Files
Jungfraujoch/compression/JFJochDecompress.h
T
leonarski_f 538f3504d3
Build Packages / build:windows:nocuda (push) Successful in 20m4s
Build Packages / Unit tests (push) Skipped
Build Packages / build:viewer-tgz:cpu (push) Successful in 16m5s
Build Packages / build:viewer-tgz:cuda (push) Successful in 17m26s
Build Packages / build:rpm (rocky8_nocuda) (push) Successful in 27m46s
Build Packages / build:rpm (rocky9_nocuda) (push) Successful in 20m17s
Build Packages / build:rpm (ubuntu2204_nocuda) (push) Successful in 26m13s
Build Packages / build:rpm (ubuntu2404_nocuda) (push) Successful in 23m17s
Build Packages / build:rpm (rocky8_sls9) (push) Successful in 28m11s
Build Packages / build:rpm (rocky9_sls9) (push) Successful in 19m30s
Build Packages / build:rpm (rocky8) (push) Successful in 24m34s
Build Packages / build:rpm (rocky9) (push) Successful in 21m30s
Build Packages / build:rpm (ubuntu2204) (push) Successful in 23m33s
Build Packages / build:rpm (ubuntu2404) (push) Successful in 20m18s
Build Packages / DIALS test (push) Successful in 18m23s
Build Packages / XDS test (durin plugin) (push) Successful in 11m30s
Build Packages / XDS test (JFJoch plugin) (push) Successful in 10m16s
Build Packages / XDS test (neggia plugin) (push) Successful in 8m2s
Build Packages / Generate python client (push) Successful in 49s
Build Packages / Build documentation (push) Successful in 1m21s
Build Packages / Create release (push) Skipped
Build Packages / build:windows:cuda (push) Successful in 29m45s
v1.0.0.rc-161 (#71)
This is an UNSTABLE release. It includes many experimental features, as well as many AI generated fixes. We recommend using rc.152 for production use.

* **rugnux: significantly better quality of results, and faster.** A large rework of integration, scaling, merging, geometry refinement and space-group determination, together with measurements the program previously made no attempt at - the direct beam before indexing, the beam stop, the goniometer rotation scale, and the stretches of a sweep the crystal did not deliver. A rotation dataset typically gains observations at better <I/sigma> and R_meas, and every `mx` and `scale` run writes a `<prefix>_report.txt` results report modelled on XDS's `CORRECT.LP`. Many defaults moved with it: spot detection is self-calibrating, beam-stop detection and rotation geometry post-refinement are on, resolution limits default to as far as the detector reaches, and ice-ring handling engages only where the crystal is measured to have ice.
* **jfjoch_viewer:** the beam-stop shadow, the detector calibration and the beam-centre measurement are reachable from "Analyze dataset"; the settings panel reports how the sample moved and how polarized the beam was; image rendering and interaction are faster.
* **Performance:** bitshuffle+LZ4 images are decoded on the GPU rather than on the host, with the bitshuffle inverse fused into preprocessing so the decompressed frame is never held in device memory.
* **Broker, writer, packaging and build:** image-slot lifetime and locking fixes, per-image datasets sized by the images actually written, the Debian/Ubuntu broker package renamed to `jfjoch`, and `image_analysis` compiling under MSVC again.

**Breaking change to the rugnux command line:**
* `--azint-only` and `--scale` are **removed**, replaced by `--mode azint` and `--mode scale`; the full pipeline is `--mode mx` and remains the default. A script passing the old flags now fails with the list of valid modes rather than silently running the wrong one.
* `-t`/`--stride` is **refused on rotation data**: skipping frames cuts every reflection's rocking curve, so the combined fulls and their partiality would be measured over frames the sweep never recorded. Select a contiguous range with `-s`/`-e` instead. `--mode azint` and `--force-still` still take a stride.

**Breaking changes to OpenAPI** - regenerate the client (`jfjoch-client` 1.0.0-rc.161, `frontend/src/client`) or read the affected fields as optional:
* `image_scale_b` is removed from the `plot_type` enum, so a client requesting that plot now gets an error rather than a curve.
* `azim_int_settings.high_q_recipA`, `spot_finding_settings.high_resolution_limit` and `spot_finding_settings.low_resolution_limit` are no longer `required`. All three mean "no limit at that end" when unset and are omitted from the response instead of carrying a placeholder value, which raises in a client generated from an rc.160-or-earlier spec. A value of 0 is still accepted and means the same thing.

**Breaking changes to the stored formats** - a consumer reading these fields must treat them as optional:
* The per-image image-scale B factor is no longer computed, so `/entry/MX/imageScaleBFactor` is absent from newly written HDF5 files and the corresponding key is absent from the CBOR DataMessage and END blocks. Files written by rc.160 and earlier still contain it and still open; nothing in the pipeline reads it any more.
* `_reflns.jfjoch_diffrn_ISa` now carries the whole-range `1/sqrt(a*b)` that XDS's ISa denotes, and the error-model `a` and `b` are reported in XDS's convention; the strong-reflection asymptote moves to `_reflns.jfjoch_diffrn_ISa_asymptotic`. **A file written by an earlier version carries the asymptote under the plain `ISa` name.**

Reviewed-on: #71
Co-authored-by: Filip Leonarski <filip.leonarski@psi.ch>
2026-08-13 17:03:10 +02:00

188 lines
8.8 KiB
C++

// SPDX-FileCopyrightText: 2024 Filip Leonarski, Paul Scherrer Institute <filip.leonarski@psi.ch>
// SPDX-License-Identifier: GPL-3.0-only
#pragma once
#include <vector>
#include <cstring>
#include <bitshuffle/bitshuffle.h>
#include <bitshuffle/bitshuffle_internals.h>
#include <lz4/lz4.h>
#include <zstd.h>
#include "BitShuffleBlock.h"
#include "../compression/CompressionAlgorithmEnum.h"
#include "../common/JFJochException.h"
#include "../common/CompressedImage.h"
extern "C" {
uint64_t bshuf_read_uint64_BE(const void* buf);
};
inline size_t JFJochDecompressHperfPtr(uint8_t *output,
CompressionAlgorithm algorithm,
const uint8_t *source,
size_t source_size,
size_t nelements,
size_t elem_size,
size_t block_size) {
if ((algorithm != CompressionAlgorithm::BSHUF_LZ4) &&
(algorithm != CompressionAlgorithm::BSHUF_ZSTD) &&
(algorithm != CompressionAlgorithm::BSHUF_ZSTD_RLE) &&
(algorithm != CompressionAlgorithm::BSHUF_ZSTD_RLE_HUFF))
throw JFJochException(JFJochExceptionCategory::Compression, "Algorithm not supported by hperf decompressor");
if ((block_size == 0) || ((block_size % BSHUF_BLOCKED_MULT) != 0))
throw JFJochException(JFJochExceptionCategory::Compression, "Invalid block size");
std::vector<char> decompressed_block(block_size * elem_size);
std::vector<char> scratch(block_size * elem_size);
const uint8_t *src_ptr = source;
const uint8_t *const source_end = source + source_size;
uint8_t *dst_ptr = output;
const size_t num_full_blocks = nelements / block_size;
const size_t reminder_size = nelements - num_full_blocks * block_size;
const size_t last_block_size = reminder_size - reminder_size % BSHUF_BLOCKED_MULT;
auto decode_block = [&](size_t current_nelements) {
// Both the block length and the block itself come from the stream, which for the CBOR path
// and for the XDS plugin is data we did not produce.
if (source_end - src_ptr < 4)
throw JFJochException(JFJochExceptionCategory::Compression, "Truncated compressed block header");
const auto compressed_size = static_cast<size_t>(bshuf_read_uint32_BE(src_ptr));
src_ptr += 4;
if (static_cast<size_t>(source_end - src_ptr) < compressed_size)
throw JFJochException(JFJochExceptionCategory::Compression, "Compressed block extends past the input buffer");
const size_t expected_size = current_nelements * elem_size;
size_t decompressed_size = 0;
switch (algorithm) {
case CompressionAlgorithm::BSHUF_LZ4: {
const int ret = LZ4_decompress_safe(reinterpret_cast<const char *>(src_ptr),
decompressed_block.data(),
static_cast<int>(compressed_size),
static_cast<int>(expected_size));
if (ret < 0 || static_cast<size_t>(ret) != expected_size)
throw JFJochException(JFJochExceptionCategory::Compression, "LZ4 decompression error");
decompressed_size = static_cast<size_t>(ret);
break;
}
case CompressionAlgorithm::BSHUF_ZSTD:
case CompressionAlgorithm::BSHUF_ZSTD_RLE:
case CompressionAlgorithm::BSHUF_ZSTD_RLE_HUFF: {
const size_t ret = ZSTD_decompress(decompressed_block.data(),
expected_size,
src_ptr,
compressed_size);
if (ZSTD_isError(ret) || ret != expected_size)
throw JFJochException(JFJochExceptionCategory::Compression, "ZSTD decompression error");
decompressed_size = ret;
break;
}
default:
throw JFJochException(JFJochExceptionCategory::Compression, "Algorithm not supported");
}
if (JFJochBitUnshuffleBlock(reinterpret_cast<char *>(dst_ptr),
decompressed_block.data(),
scratch.data(),
current_nelements,
elem_size) < 0)
throw JFJochException(JFJochExceptionCategory::Compression, "bitshuffle block decode error");
src_ptr += compressed_size;
dst_ptr += decompressed_size;
};
for (size_t i = 0; i < num_full_blocks; ++i)
decode_block(block_size);
if (last_block_size > 0)
decode_block(last_block_size);
const size_t leftover_bytes = (reminder_size % BSHUF_BLOCKED_MULT) * elem_size;
if (leftover_bytes > 0) {
if (static_cast<size_t>(source_end - src_ptr) < leftover_bytes)
throw JFJochException(JFJochExceptionCategory::Compression, "Truncated trailing bytes");
memcpy(dst_ptr, src_ptr, leftover_bytes);
src_ptr += leftover_bytes;
}
return static_cast<size_t>(src_ptr - source);
}
inline void JFJochDecompressPtr(uint8_t *output,
CompressionAlgorithm algorithm,
const uint8_t *source,
size_t source_size,
size_t nelements,
size_t elem_size,
bool use_hperf = true) {
size_t block_size = 0;
if (algorithm != CompressionAlgorithm::NO_COMPRESSION) {
// The 12-byte bitshuffle header must be there before it can be read, and before
// source_size - 12 is handed to the decompressors below.
if (source_size < 12)
throw JFJochException(JFJochExceptionCategory::Compression, "Buffer too short for the bitshuffle header");
if (bshuf_read_uint64_BE(const_cast<uint8_t *>(source)) != nelements * elem_size)
throw JFJochException(JFJochExceptionCategory::Compression, "Mismatch in size");
auto tmp = bshuf_read_uint32_BE(source + 8);
block_size = tmp / elem_size;
}
switch (algorithm) {
case CompressionAlgorithm::NO_COMPRESSION:
if (source_size != nelements * elem_size)
throw JFJochException(JFJochExceptionCategory::Compression, "Mismatch in size");
memcpy(output, source, source_size);
break;
case CompressionAlgorithm::BSHUF_LZ4:
if (use_hperf) {
if (JFJochDecompressHperfPtr(output, algorithm, source + 12, source_size - 12,
nelements, elem_size, block_size) != source_size - 12)
throw JFJochException(JFJochExceptionCategory::Compression, "Decompression error");
} else {
if (bshuf_decompress_lz4(source + 12, output, nelements,
elem_size, block_size) != source_size - 12)
throw JFJochException(JFJochExceptionCategory::Compression, "Decompression error");
}
break;
case CompressionAlgorithm::BSHUF_ZSTD_RLE:
case CompressionAlgorithm::BSHUF_ZSTD_RLE_HUFF:
case CompressionAlgorithm::BSHUF_ZSTD:
if (use_hperf) {
if (JFJochDecompressHperfPtr(output, algorithm, source + 12, source_size - 12,
nelements, elem_size, block_size) != source_size - 12)
throw JFJochException(JFJochExceptionCategory::Compression, "Decompression error");
} else {
if (bshuf_decompress_zstd(source + 12, output, nelements,
elem_size, block_size) != source_size - 12)
throw JFJochException(JFJochExceptionCategory::Compression, "Decompression error");
}
break;
default:
throw JFJochException(JFJochExceptionCategory::Compression, "Not implemented algorithm");
}
}
template <class Td, class Ts>
void JFJochDecompress(std::vector<Td> &output, CompressionAlgorithm algorithm, const Ts *source_v, size_t source_size,
size_t nelements, bool use_hperf = true) {
output.resize(nelements);
JFJochDecompressPtr((uint8_t *) output.data(), algorithm, (uint8_t *) source_v, source_size,
nelements, sizeof(Td), use_hperf);
}
template <class Td, class Ts>
void JFJochDecompress(std::vector<Td> &output, CompressionAlgorithm algorithm, const std::vector<Ts> source_v,
size_t nelements, bool use_hperf = true) {
JFJochDecompress(output, algorithm, source_v.data(), source_v.size() * sizeof(Ts), nelements, use_hperf);
}