None of this has been built on a Mac - there is none yet. It is the list a read-only audit of the
viewer/rugnux subtree produced, plus a serial -fsyntax-only pass of every reachable .cpp with
clang 16 + libc++ on Linux, which found exactly one error (the first item).
- JFJochDatasetInfoChartView: std::vector<fftwf_complex> does not compile with libc++, whose
construct_at refuses an array element type (float[2]). Use std::vector<std::complex<float>> and
the reinterpret_cast every other FFTW call site already uses.
- libcurl: GSSAPI off on Linux, and neither TLS nor GSSAPI on macOS. The viewer never sets
CURLOPT_HTTPAUTH, so Negotiate was dead weight that cost a krb5-devel build dependency; on macOS
curl's FindGSS refuses the system Heimdal outright, and with Secure Transport gone from curl
(8.15) TLS would mean a Homebrew OpenSSL - the only host library a Mac build would need.
Linux keeps OpenSSL. CURL_USE_GSSAPI is forced OFF rather than left unset so an existing build
tree drops its cached ON.
- libjpeg-turbo ExternalProject: CMAKE_SYSTEM_NAME/PROCESSOR were forwarded unconditionally, which
puts even a native sub-build into cross-compiling mode, and CMAKE_OSX_ARCHITECTURES / SYSROOT /
DEPLOYMENT_TARGET were not forwarded at all. Now the same rule the zlib-ng sub-build follows.
- ShadowAccumulatorGPU.cu was added on the JFJOCH_USE_CUDA option (default ON) instead of
JFJOCH_CUDA_AVAILABLE like every other .cu, so a machine without nvcc got a CUDA source in a
target with no CUDA language.
- CMAKE_OSX_DEPLOYMENT_TARGET defaults to 12.0 (overridable). Left unset, CMake takes the build
machine's OS version and the .dmg starts nowhere older.
- Standard headers that were only arriving transitively (<chrono>, <cmath>, <limits>, <cstring>,
<atomic>, <thread>, <string>); newer libc++ releases keep removing such transitive includes.
Checked: the seven changed sources pass clang 16 + libc++ -fsyntax-only. The CMake changes are
not configured or built.
Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_015eAE2K7i5JGDwgwifiCfuA
(cherry picked from commit 5a7282759a)
115 lines
3.1 KiB
C++
115 lines
3.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 <cmath>
|
|
#include <cstdint>
|
|
#include <cstddef>
|
|
#include <vector>
|
|
#include <mutex>
|
|
|
|
#include "MultiLinePlot.h"
|
|
#include "../common/JFJochException.h"
|
|
|
|
template<class T>
|
|
class SetAverage {
|
|
std::vector<T> sum;
|
|
std::vector<uint64_t> count;
|
|
mutable std::mutex m;
|
|
|
|
public:
|
|
explicit SetAverage(size_t bins) : sum(bins), count(bins) {
|
|
}
|
|
|
|
void Add(size_t bin, T val) {
|
|
std::unique_lock ul(m);
|
|
|
|
if (bin < sum.size()) {
|
|
sum[bin] += val;
|
|
count[bin] += 1;
|
|
}
|
|
}
|
|
|
|
MultiLinePlot GetPlot() const {
|
|
std::unique_lock ul(m);
|
|
|
|
MultiLinePlotStruct plot;
|
|
plot.x.resize(sum.size());
|
|
plot.y.resize(sum.size());
|
|
for (int i = 0; i < sum.size(); i++) {
|
|
plot.x[i] = static_cast<float>(i);
|
|
if (count[i] > 0)
|
|
plot.y[i] = static_cast<float>(sum[i]) / count[i];
|
|
else
|
|
plot.y[i] = 0;
|
|
}
|
|
MultiLinePlot ret;
|
|
ret.AddPlot(plot);
|
|
return ret;
|
|
}
|
|
};
|
|
|
|
class Histogram {
|
|
std::vector<uint64_t> count;
|
|
int32_t total_count = 0;
|
|
int32_t max_bin = 0;
|
|
|
|
public:
|
|
explicit Histogram(size_t bins) : count(bins) {}
|
|
|
|
void Add(int32_t val) {
|
|
if (val > 0 && val < count.size()) {
|
|
count[val] += 1;
|
|
if (val > max_bin)
|
|
max_bin = val;
|
|
++total_count;
|
|
}
|
|
}
|
|
|
|
void clear() {
|
|
for (auto &c: count) c = 0;
|
|
total_count = 0;
|
|
max_bin = 0;
|
|
}
|
|
|
|
[[nodiscard]] std::vector<float> GetCount() const {
|
|
std::vector<float> ret;
|
|
ret.reserve(max_bin + 1);
|
|
for (size_t i = 0; i < max_bin + 1; i++)
|
|
ret.emplace_back(count[i]);
|
|
return ret;
|
|
}
|
|
|
|
[[nodiscard]] uint64_t GetTotalCount() const {
|
|
return total_count;
|
|
}
|
|
|
|
// Returns the value x such that approximately `percent`% of samples are <= x.
|
|
// - percent must be in [0, 100]
|
|
// - returns std::nullopt if histogram is empty
|
|
[[nodiscard]] std::optional<int32_t> Percentile(float percent) const {
|
|
if (!std::isfinite(percent) || percent < 0.0f || percent > 100.0f) {
|
|
throw JFJochException(JFJochExceptionCategory::InputParameterBelowMin,
|
|
"FloatHistogram Percentile expects percent in [0, 100]");
|
|
}
|
|
|
|
if (total_count == 0)
|
|
return std::nullopt;
|
|
|
|
// Target rank in [0, total-1]
|
|
const double q = static_cast<double>(percent) / 100.0;
|
|
const auto target = static_cast<int64_t>(std::floor(q * static_cast<double>(total_count - 1)));
|
|
|
|
uint64_t cumulative = 0;
|
|
for (int64_t i = 0; i < max_bin + 1; i++) {
|
|
cumulative += count[i];
|
|
if (target < cumulative && count[i] > 0)
|
|
return i;
|
|
}
|
|
|
|
// If due to rounding we didn't return inside the loop, clamp to the last bin's upper edge.
|
|
return count.size() - 1;
|
|
}
|
|
};
|