Build Packages / Unit tests (push) Skipped
Build Packages / build:windows:nocuda (push) Successful in 15m31s
Build Packages / build:viewer-tgz:cpu (push) Successful in 5m46s
Build Packages / build:viewer-tgz:cuda (push) Successful in 6m9s
Build Packages / build:rpm (rocky8_nocuda) (push) Successful in 9m25s
Build Packages / build:rpm (rocky9_nocuda) (push) Successful in 10m21s
Build Packages / build:rpm (ubuntu2204_nocuda) (push) Successful in 9m41s
Build Packages / build:rpm (ubuntu2404_nocuda) (push) Successful in 9m18s
Build Packages / build:rpm (rocky8_sls9) (push) Successful in 10m26s
Build Packages / build:rpm (rocky9_sls9) (push) Successful in 11m33s
Build Packages / build:rpm (rocky8) (push) Successful in 10m32s
Build Packages / build:rpm (rocky9) (push) Successful in 12m23s
Build Packages / build:rpm (ubuntu2204) (push) Successful in 10m50s
Build Packages / build:rpm (ubuntu2404) (push) Successful in 10m12s
Build Packages / DIALS test (push) Successful in 12m6s
Build Packages / XDS test (durin plugin) (push) Successful in 8m15s
Build Packages / XDS test (JFJoch plugin) (push) Successful in 7m12s
Build Packages / XDS test (neggia plugin) (push) Successful in 5m35s
Build Packages / Generate python client (push) Successful in 27s
Build Packages / Build documentation (push) Successful in 54s
Build Packages / Create release (push) Skipped
Build Packages / build:windows:cuda (push) Successful in 12m37s
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. * jfjoch_process: Major rotation (rot3d) data processing overhaul - robust profile-fit integration, Cauchy-loss scaling with optional absorption surface, de-novo indexing and space-group/centering determination fixes, and merging statistics + ISa in the mmCIF output. * jfjoch_process: Add EXPERIMENTAL ice-ring detection (--detect-ice-rings) that excludes ice reflections from scaling. * Compression: Add BSHUF_ZSTD_RLE_HUFF, make compression size-aware (drop frames that don't fit rather than aborting), and add the jfjoch_recompress tool. * jfjoch_viewer: Report "Multiple lattices detected" and grey out "Analyze dataset" on a live connection. * jfjoch_broker: Write smargon chi/phi goniometer positions to NXmx; read sensor thickness/material from HDF5 metadata. * CI: Build Windows (CUDA and non-CUDA) installers.Reviewed-on: #66 Co-authored-by: Filip Leonarski <filip.leonarski@psi.ch>
40 lines
2.1 KiB
C++
40 lines
2.1 KiB
C++
// SPDX-FileCopyrightText: 2024 Filip Leonarski, Paul Scherrer Institute <filip.leonarski@psi.ch>
|
|
// SPDX-License-Identifier: GPL-3.0-only
|
|
|
|
#pragma once
|
|
|
|
#include <cstdint>
|
|
#include <cstddef>
|
|
#include <vector>
|
|
|
|
// Produces a STANDARD Zstandard frame from bitshuffled data, decodable by stock ZSTD_decompress:
|
|
// - zero / 0xFF runs -> RLE_Blocks (cheap, like JFJochZstdCompressor)
|
|
// - literal regions -> Compressed_Blocks with Huffman literals (no sequences); short
|
|
// runs are absorbed into the literal stream
|
|
// - incompressible literals -> Raw_Blocks (bounded worst case)
|
|
// Faster than full ZSTD (no match search) and better ratio than the plain RLE compressor (it
|
|
// entropy-codes the literals). The Huffman table is built/reused per block from that block's own
|
|
// literals via zstd's HUF_compress*X_repeat, so it is robust on any input (random, Poisson, masks,
|
|
// zeros) with no trained tables.
|
|
class JFJochZstdHuffCompressor {
|
|
std::vector<uint8_t> out; // assembled frame
|
|
std::vector<uint8_t> literals; // literal bytes in stream order (incl. absorbed short runs)
|
|
std::vector<uint8_t> hufbuf; // scratch for one Huffman-coded literal chunk
|
|
std::vector<size_t> ctable; // HUF_CElt[] (size_t-aligned)
|
|
std::vector<uint64_t> entwksp; // HUF compression workspace
|
|
unsigned repeat_state = 0; // HUF_repeat across literal blocks within the current frame
|
|
|
|
struct Seg { uint8_t type; size_t bytes; size_t lit_off; }; // type 0=run0, 1=runFF, 2=literals
|
|
std::vector<Seg> segs;
|
|
|
|
void put_le(uint64_t v, int nbytes);
|
|
size_t blk_hdr(uint32_t type, uint32_t size);
|
|
void emit_run(uint8_t value, size_t nbytes, size_t &last_off);
|
|
void emit_lit_chunk(const uint8_t *lits, size_t n, size_t &last_off);
|
|
public:
|
|
JFJochZstdHuffCompressor();
|
|
// src = bitshuffled block (src_size bytes, a multiple of 8). Writes one zstd frame to dst and
|
|
// returns its size. dst must hold at least ZSTD_compressBound(src_size) + 12 bytes.
|
|
size_t Compress(uint8_t *dst, const uint64_t *src, size_t src_size);
|
|
};
|