macOS build: explicit size_t in the XFEL reader's row bounds; parentheses in the CPU preprocessor's select
Build Packages / Create release (push) Successful in 23s
Build Packages / build:portable:macos-arm64:nocuda (push) Successful in 5m4s
Build Packages / build:portable:linux-x86_64:nocuda (push) Successful in 12m22s
Build Packages / build:rugnux:linux-aarch64:cuda (push) Successful in 6m35s
Build Packages / HDF5 consumer tests (DIALS, XDS) (push) Successful in 26m20s
Build Packages / build:portable:linux-x86_64:cuda (push) Successful in 14m47s
Build Packages / build:portable:windows-x86_64:nocuda (push) Successful in 22m4s
Build Packages / build:portable:windows-x86_64:cuda (push) Successful in 26m15s
Build Packages / build:jfjoch:rocky8:nocuda (push) Successful in 20m19s
Build Packages / build:jfjoch:ubuntu2204:nocuda (push) Successful in 18m0s
Build Packages / build:jfjoch:rocky9:nocuda (push) Successful in 21m5s
Build Packages / build:jfjoch:ubuntu2404:nocuda (push) Successful in 22m39s
Build Packages / build:jfjoch:rocky8:cuda-sls9 (push) Successful in 25m53s
Build Packages / Generate python client (push) Successful in 30s
Build Packages / Build documentation (push) Successful in 1m7s
Build Packages / build:jfjoch:rocky9:cuda-sls9 (push) Successful in 28m7s
Build Packages / build:jfjoch:ubuntu2204:cuda (push) Successful in 22m4s
Build Packages / build:jfjoch:rocky8:cuda (push) Successful in 24m9s
Build Packages / build:jfjoch:rocky9:cuda (push) Successful in 26m44s
Build Packages / build:jfjoch:ubuntu2404:cuda (push) Successful in 21m25s
Build Packages / Unit tests (push) Successful in 1h41m33s
Build Packages / Validation Battery (push) Successful in 35m39s
Build Packages / Create release (push) Successful in 23s
Build Packages / build:portable:macos-arm64:nocuda (push) Successful in 5m4s
Build Packages / build:portable:linux-x86_64:nocuda (push) Successful in 12m22s
Build Packages / build:rugnux:linux-aarch64:cuda (push) Successful in 6m35s
Build Packages / HDF5 consumer tests (DIALS, XDS) (push) Successful in 26m20s
Build Packages / build:portable:linux-x86_64:cuda (push) Successful in 14m47s
Build Packages / build:portable:windows-x86_64:nocuda (push) Successful in 22m4s
Build Packages / build:portable:windows-x86_64:cuda (push) Successful in 26m15s
Build Packages / build:jfjoch:rocky8:nocuda (push) Successful in 20m19s
Build Packages / build:jfjoch:ubuntu2204:nocuda (push) Successful in 18m0s
Build Packages / build:jfjoch:rocky9:nocuda (push) Successful in 21m5s
Build Packages / build:jfjoch:ubuntu2404:nocuda (push) Successful in 22m39s
Build Packages / build:jfjoch:rocky8:cuda-sls9 (push) Successful in 25m53s
Build Packages / Generate python client (push) Successful in 30s
Build Packages / Build documentation (push) Successful in 1m7s
Build Packages / build:jfjoch:rocky9:cuda-sls9 (push) Successful in 28m7s
Build Packages / build:jfjoch:ubuntu2204:cuda (push) Successful in 22m4s
Build Packages / build:jfjoch:rocky8:cuda (push) Successful in 24m9s
Build Packages / build:jfjoch:rocky9:cuda (push) Successful in 26m44s
Build Packages / build:jfjoch:ubuntu2404:cuda (push) Successful in 21m25s
Build Packages / Unit tests (push) Successful in 1h41m33s
Build Packages / Validation Battery (push) Successful in 35m39s
On macOS size_t (unsigned long) plus int64_t (long long) is unsigned long long, so std::max/std::min had two argument types; the template argument is now given. The preprocessor's (masked | error) ? ... is what the code already did - the parentheses only silence clang's -Wbitwise-conditional-parentheses. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_015CeEGgpKdfkCTJb3YNMJcu
This commit is contained in:
1 parent
f7709f82c0
commit
094eee31a2
2 files changed
+3
-3
No files matched your search
@@ -69,7 +69,7 @@ void ImagePreprocessorCPU::AnalyzeBlock(ImagePreprocessorBuffer &processed_image
|
||||
const bool error = !masked & (v == err_pixel_val);
|
||||
const bool saturated = !masked & !error & (v >= sat_pixel_val);
|
||||
const U counted = static_cast<U>(-static_cast<int>(!masked & !error & !saturated)); // all bits, or none
|
||||
out[i] = masked | error ? INT32_MIN : saturated ? INT32_MAX : static_cast<int32_t>(v);
|
||||
out[i] = (masked | error) ? INT32_MIN : saturated ? INT32_MAX : static_cast<int32_t>(v);
|
||||
n_masked += masked;
|
||||
n_error += error;
|
||||
n_saturated += saturated;
|
||||
|
||||
@@ -796,8 +796,8 @@ void JFJochXFELReader::MarkBad(const xfel::Mask &m, const T *v, size_t first, si
|
||||
const size_t last = first + n; // the pixels [first, last) of the frame are those v holds
|
||||
for (int64_t ss = std::max<int64_t>(min_ss, first / frame_width_);
|
||||
ss <= max_ss && static_cast<size_t>(ss) * frame_width_ < last; ss++) {
|
||||
const size_t begin = std::max(static_cast<size_t>(ss) * frame_width_ + min_fs, first);
|
||||
const size_t end = std::min(static_cast<size_t>(ss) * frame_width_ + max_fs + 1, last);
|
||||
const size_t begin = std::max<size_t>(static_cast<size_t>(ss) * frame_width_ + min_fs, first);
|
||||
const size_t end = std::min<size_t>(static_cast<size_t>(ss) * frame_width_ + max_fs + 1, last);
|
||||
if (end <= begin)
|
||||
continue;
|
||||
const T *in = v + (begin - first);
|
||||
|
||||
Reference in new issue
Block a user