leonarski_fandClaude Opus 4.8
0c1babd0ca
Build Packages / build:rpm (ubuntu2404_nocuda) (push) Successful in 14m24s
Build Packages / build:rpm (ubuntu2204_nocuda) (push) Successful in 14m39s
Build Packages / build:rpm (rocky8_nocuda) (push) Successful in 14m54s
Build Packages / build:rpm (rocky8) (push) Successful in 14m47s
Build Packages / build:rpm (rocky8_sls9) (push) Successful in 14m57s
Build Packages / build:rpm (rocky9_nocuda) (push) Successful in 15m27s
Build Packages / build:rpm (rocky9_sls9) (push) Successful in 15m38s
Build Packages / XDS test (durin plugin) (push) Successful in 8m7s
Build Packages / XDS test (neggia plugin) (push) Successful in 7m44s
Build Packages / Generate python client (push) Successful in 26s
Build Packages / Create release (push) Skipped
Build Packages / XDS test (JFJoch plugin) (push) Successful in 8m22s
Build Packages / Build documentation (push) Successful in 1m0s
Build Packages / build:rpm (rocky9) (push) Successful in 12m15s
Build Packages / build:rpm (ubuntu2404) (push) Successful in 11m52s
Build Packages / build:rpm (ubuntu2204) (push) Successful in 12m25s
Build Packages / DIALS test (push) Successful in 12m49s
Build Packages / Unit tests (push) Successful in 58m37s
Revert Eigen from the FetchContent OVERRIDE_FIND_PACKAGE vendoring (cd394c52,d4d2d0d8) back to an external find_package(Eigen3) dependency, like zlib. The OVERRIDE_FIND_PACKAGE mechanism makes the Visual-Studio-bundled CMake (4.x "-msvc") intermittently segfault during configure -- ~1/3 of fresh configures, and 100% with Ceres CUDA enabled. The fault is in CMake's own FetchContent variable-stack cleanup, reached when Ceres' find_package(Eigen3) resolves the override through a nested FetchContent_MakeAvailable. Stock Kitware CMake runs the identical scripts fine, so it is a bug in the VS-bundled cmake binary; providing Eigen externally avoids that path entirely and is stable with Ceres CUDA both on and off (verified 0 crashes; full CUDA build + NSIS installer succeed under the VS-bundled cmake). Also fix CPACK_NSIS_INSTALLED_ICON_NAME: the backslash value was written verbatim into CPackConfig.cmake, where "\j" is an invalid escape that cmake 4.x (CMP0010 strict) rejects when cpack re-parses it, so cpack failed under the VS-bundled cmake (older/Kitware cpack only warned). Use a forward slash. - image_analysis: keep Ceres USE_CUDA OFF (Jungfraujoch does not use Ceres' GPU solvers) but drop the now-obsolete "required to avoid the Windows cmake crash" rationale from the comment. - docs: Eigen is a required external dependency again (SOFTWARE.md); the Windows viewer build provides zlib + Eigen externally (JFJOCH_VIEWER.md). - THIRD_PARTY_NOTICES: move Eigen from the fetched-and-linked table to the external runtime-libraries table. Docker images still need Eigen re-added (5.0.1, source build) -- to follow. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
58 lines
2.2 KiB
CMake
58 lines
2.2 KiB
CMake
SET(PROVIDE_UNINSTALL_TARGET OFF)
|
|
# Force Ceres to build WITHOUT its own CUDA support: Jungfraujoch never uses Ceres' GPU solvers, so
|
|
# this just drops unused code and build time (Ceres would otherwise enable CUDA whenever a toolkit is
|
|
# found). See the Eigen note in the top-level CMakeLists for the related Windows/cmake history.
|
|
SET(USE_CUDA OFF CACHE BOOL "Force Ceres to build without CUDA (Jungfraujoch does not use Ceres' GPU solvers)" FORCE)
|
|
|
|
# Prevent MKL from being found (guarantees no MKL)
|
|
SET(CMAKE_DISABLE_FIND_PACKAGE_MKL TRUE)
|
|
SET(CERES_THREADING_MODEL "CXX_THREADS")
|
|
|
|
FetchContent_Declare(
|
|
ceres
|
|
GIT_REPOSITORY https://github.com/ceres-solver/ceres-solver
|
|
GIT_TAG 0c70ed3
|
|
EXCLUDE_FROM_ALL
|
|
)
|
|
|
|
FetchContent_MakeAvailable(ceres)
|
|
|
|
ADD_LIBRARY(JFJochImageAnalysis STATIC
|
|
MXAnalysisWithoutFPGA.cpp
|
|
MXAnalysisWithoutFPGA.h
|
|
MXAnalysisAfterFPGA.h
|
|
MXAnalysisAfterFPGA.cpp
|
|
IndexAndRefine.cpp
|
|
IndexAndRefine.h
|
|
dark_mask_analysis/DarkMaskAnalysis.cpp
|
|
dark_mask_analysis/DarkMaskAnalysis.h
|
|
rotation_indexer/RotationIndexer.cpp
|
|
rotation_indexer/RotationIndexer.h
|
|
RotationParameters.cpp
|
|
RotationParameters.h
|
|
WriteReflections.cpp
|
|
WriteReflections.h
|
|
LoadFCalcFromMtz.cpp
|
|
LoadFCalcFromMtz.h
|
|
UpdateReflectionResolution.cpp
|
|
UpdateReflectionResolution.h
|
|
IntegrationOutcome.h
|
|
rotation_indexer/RotationIndexerCounter.cpp
|
|
rotation_indexer/RotationIndexerCounter.h)
|
|
|
|
FIND_PACKAGE(Eigen3 3.4 REQUIRED NO_MODULE) # provides Eigen3::Eigen
|
|
|
|
ADD_SUBDIRECTORY(spot_finding)
|
|
ADD_SUBDIRECTORY(bragg_integration)
|
|
ADD_SUBDIRECTORY(bragg_prediction)
|
|
ADD_SUBDIRECTORY(indexing)
|
|
ADD_SUBDIRECTORY(geom_refinement)
|
|
ADD_SUBDIRECTORY(lattice_search)
|
|
ADD_SUBDIRECTORY(scale_merge)
|
|
ADD_SUBDIRECTORY(image_preprocessing)
|
|
ADD_SUBDIRECTORY(azint)
|
|
ADD_SUBDIRECTORY(roi)
|
|
ADD_SUBDIRECTORY(pixel_refinement)
|
|
|
|
TARGET_LINK_LIBRARIES(JFJochImageAnalysis JFJochAzIntEngine JFJochROIIntegration JFJochImagePreprocessing JFJochBraggPrediction JFJochBraggIntegration JFJochLatticeSearch JFJochIndexing JFJochSpotFinding JFJochCommon JFJochGeomRefinement JFJochScaleMerge JFJochPixelRefine gemmi)
|