FFTW is no longer fetched, built or linked - not even by jfjoch_test. The JFJOCH_USE_FFTW define and its #ifdefs are gone: the CPU FFT indexer, the viewer's FFT chart and the rest are always built. The test that checked pocketfft against FFTW now checks it against a direct double-precision DFT (forward) and a round trip (backward), on the same shapes. The user-facing name stays: -X FFTW, the OpenAPI enum value, the CBOR and HDF5 strings - the CPU FFT indexer is still called FFTW, only the implementation changed; the CLI page says so. Under MSVC pocketfft is told explicitly to run scalar (it already decides so itself: its vector code needs the GCC/Clang vector extension). Licences: licenses/fftw.txt, its COLLECT.sh line, the THIRD_PARTY_NOTICES row and note, and the viewer's embedded copy removed; docs/THIRD_PARTY_NOTICES.md regenerated with update_version.sh's own sed block. CLAUDE.md and the docs that named FFTW as the library now name pocketfft. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01UqXYdJDrM65gxsCn2PrbfK
41 lines
1.3 KiB
C++
41 lines
1.3 KiB
C++
// SPDX-FileCopyrightText: 2025 Filip Leonarski, Paul Scherrer Institute <filip.leonarski@psi.ch>
|
|
// SPDX-License-Identifier: GPL-3.0-only
|
|
|
|
#include "IndexerFactory.h"
|
|
#include "FFBIDXIndexerCPU.h"
|
|
#include "../../common/CUDAWrapper.h"
|
|
|
|
#ifdef JFJOCH_USE_CUDA
|
|
#include "FFBIDXIndexer.h"
|
|
#include "FFTIndexerGPU.h"
|
|
#endif
|
|
|
|
#include "FFTIndexerCPU.h"
|
|
|
|
std::unique_ptr<Indexer> CreateIndexer(const DiffractionExperiment& experiment) {
|
|
std::unique_ptr<Indexer> indexer;
|
|
switch (experiment.GetIndexingAlgorithm()) {
|
|
case IndexingAlgorithmEnum::FFBIDX:
|
|
#ifdef JFJOCH_USE_CUDA
|
|
if (get_gpu_count() > 0)
|
|
indexer = std::make_unique<FFBIDXIndexer>();
|
|
#endif
|
|
if (!indexer)
|
|
indexer = std::make_unique<FFBIDXIndexerCPU>();
|
|
indexer->Setup(experiment);
|
|
break;
|
|
case IndexingAlgorithmEnum::FFTW:
|
|
indexer = std::make_unique<FFTIndexerCPU>(experiment.GetIndexingSettings());
|
|
indexer->Setup(experiment);
|
|
break;
|
|
case IndexingAlgorithmEnum::FFT:
|
|
#ifdef JFJOCH_USE_CUDA
|
|
indexer = std::make_unique<FFTIndexerGPU>(experiment.GetIndexingSettings());
|
|
indexer->Setup(experiment);
|
|
#endif
|
|
break;
|
|
default:
|
|
break;
|
|
}
|
|
return indexer;
|
|
} |