leonarski_f
9aae0c2ba7
Build Packages / Create release (push) Successful in 21s
Build Packages / build:rugnux-tgz (x86_64) (push) Successful in 9m40s
Build Packages / build:rugnux:aarch64 (cross) (push) Successful in 9m49s
Build Packages / build:viewer-tgz:cpu (push) Successful in 11m37s
Build Packages / build:viewer-tgz:cuda (push) Successful in 12m40s
Build Packages / build:windows:nocuda (push) Successful in 17m44s
Build Packages / build:windows:cuda (push) Successful in 20m13s
Build Packages / build:rpm (rocky8_nocuda) (push) Successful in 14m41s
Build Packages / HDF5 consumer tests (DIALS, XDS) (push) Successful in 25m59s
Build Packages / build:rpm (ubuntu2204_nocuda) (push) Successful in 15m5s
Build Packages / build:rpm (ubuntu2404_nocuda) (push) Successful in 14m35s
Build Packages / build:rpm (rocky9_nocuda) (push) Successful in 15m53s
Build Packages / build:rugnux:windows (push) Successful in 11m29s
Build Packages / build:rpm (rocky8_sls9) (push) Successful in 18m51s
Build Packages / build:rpm (rocky9_sls9) (push) Successful in 18m43s
Build Packages / Generate python client (push) Successful in 51s
Build Packages / build:rpm (rocky8) (push) Successful in 18m51s
Build Packages / Build documentation (push) Successful in 1m21s
Build Packages / build:rpm (ubuntu2204) (push) Successful in 18m38s
Build Packages / build:rpm (ubuntu2404) (push) Successful in 18m24s
Build Packages / build:rpm (rocky9) (push) Successful in 19m19s
Build Packages / Unit tests (push) Successful in 1h37m15s
* Building Jungfraujoch no longer needs zlib or Eigen installed on the machine, and the dependencies the build fetches are pinned and updated to current releases. * rugnux: improvements in indexing, lattice selection and geometry post-refinement, which index crystals that previously returned no lattice and keep the better of the two geometries a run measures. * rugnux: improvements in beam-centre measurement, beam-stop detection and space-group determination. * rugnux: the unit cell reported with a determined space group now obeys that group - a cell whose symmetry was confirmed from the intensities is re-refined under it, and a cell the group cannot describe is reported with a warning rather than as it stands. * rugnux drops the stretches of a rotation sweep whose removal measurably improves the merged intensities and reports what became of every frame, and decides the resolution cut on the crystal's own diffraction rather than on its ice rings. * The rugnux results report is machine-readable - every line that is not `KEY= value` data starts with `#` - and states the build it was written by, its authorship and its terms of use (`REPORT_VERSION= 8`). * `jfjoch_viewer`: improvements in the file manager (CBF frames beside HDF5 datasets, a remembered root), the dataset plots, the inspector and the image statistics, plus a settable font size, a view of the rugnux results report, usable performance over a remote display (`ssh -X`) and a reset of all settings to defaults; the reciprocal-space window is removed. * Broker fixes around DECTRIS collections and dark-mask calibration: re-initialising after a run that never started no longer freezes the broker, a cancelled calibration is abandoned instead of reported as done, and a collection whose start message never arrives ends by itself. Reviewed-on: #79 Co-authored-by: Filip Leonarski <filip.leonarski@psi.ch>
71 lines
3.5 KiB
CMake
71 lines
3.5 KiB
CMake
ADD_LIBRARY(JFJochIndexing STATIC
|
|
Indexer.h
|
|
Indexer.cpp
|
|
IndexerFactory.h
|
|
IndexerFactory.cpp
|
|
IndexerThreadPool.cpp
|
|
IndexerThreadPool.h
|
|
AnalyzeIndexing.cpp
|
|
AnalyzeIndexing.h
|
|
FitProfileRadius.cpp
|
|
FitProfileRadius.h
|
|
PostIndexingRefinement.h
|
|
FFTResult.h
|
|
FFTIndexer.cpp
|
|
FFTIndexer.h
|
|
PostIndexingRefinement.cpp
|
|
MultiLatticeSearch.cpp
|
|
MultiLatticeSearch.h
|
|
SpindleBlindFraction.cpp
|
|
SpindleBlindFraction.h
|
|
HarmonicContamination.cpp
|
|
HarmonicContamination.h)
|
|
TARGET_LINK_LIBRARIES(JFJochIndexing JFJochCommon JFJochLatticeSearch)
|
|
|
|
IF (JFJOCH_CUDA_AVAILABLE)
|
|
# A source archive carries no submodules, which is exactly what is wanted here: ffbidx's bundled
|
|
# eigen submodule must NOT be added, or it would add_subdirectory a second Eigen3::Eigen target.
|
|
# ffbidx instead resolves Eigen via the project-level Eigen3 (the find_package(Eigen3) at the top
|
|
# of image_analysis/CMakeLists.txt). The clone this replaces passed GIT_SUBMODULES "" to get the
|
|
# same tree.
|
|
FetchContent_Declare(
|
|
fast-indexer
|
|
URL https://github.com/paulscherrerinstitute/fast-feedback-indexer/archive/a94fd4f5c55289e70860feea358182d2072e02b5.tar.gz
|
|
URL_HASH SHA256=275590cb41db783b822b1c8403abc2b3c9986f3d98a1a7361fc0ad478ff466c0
|
|
)
|
|
|
|
FetchContent_MakeAvailable(fast-indexer)
|
|
TARGET_SOURCES(JFJochIndexing PRIVATE
|
|
CUDAMemHelpers.h
|
|
FFTIndexerGPU.cu FFTIndexerGPU.h
|
|
FFBIDXIndexer.cpp FFBIDXIndexer.h)
|
|
# Link cuFFT statically where a static cuFFT exists. It is the only CUDA component that was
|
|
# ever dynamic (cudart and the fast-feedback indexer are already static), and as a .so it forced
|
|
# every self-contained artifact to carry the library beside its executables and find it again
|
|
# through an $ORIGIN rpath -- machinery that silently failed for any executable that was not the
|
|
# one the rpath had been set on. Static, a Linux artifact is one file that runs, and a cross
|
|
# build has no alternative anyway: NVIDIA's cross-linux-sbsa packages ship libcufft_static.a and
|
|
# no libcufft.so at all.
|
|
#
|
|
# The Windows CUDA toolkit ships no cufft_static.lib, so CUDA::cufft_static does not exist there
|
|
# and the dynamic library is the only option; the top-level CMakeLists installs the DLL beside
|
|
# the executable for the self-contained builds. Test the target rather than the platform, so a
|
|
# toolkit that gains or loses the static library is handled without another special case.
|
|
# Both halves matter: the server build keeps the shared library (its .deb/.rpm take CUDA from the
|
|
# distro, and every executable there -- broker, tests, tools -- would otherwise need the device
|
|
# link below), and Windows has no static cuFFT to link even for the portable products.
|
|
IF (JFJOCH_PORTABLE_ONLY AND TARGET CUDA::cufft_static)
|
|
TARGET_LINK_LIBRARIES(JFJochIndexing fast_indexer_static CUDA::cufft_static)
|
|
ELSE()
|
|
TARGET_LINK_LIBRARIES(JFJochIndexing fast_indexer_static CUDA::cufft)
|
|
ENDIF()
|
|
ELSE()
|
|
MESSAGE(WARNING "CUDA is strongly recommended for image analysis." )
|
|
|
|
TARGET_LINK_LIBRARIES(JFJochIndexing Eigen3::Eigen)
|
|
ENDIF()
|
|
|
|
# FFTW (fftw3f) is always available via FetchContent -> the CPU FFT indexer is always built.
|
|
TARGET_SOURCES(JFJochIndexing PRIVATE FFTIndexerCPU.cpp FFTIndexerCPU.h)
|
|
TARGET_LINK_LIBRARIES(JFJochIndexing fftw3f)
|