Commit 18f2298
Updated cmake to robustly find dependencies using modules in cmake
I have edited our build system to robustly find dependencies when they are in non system paths such as in a spack environment for example. This lead to explicitly specifying some of the dependency root paths but that is a more robust way to build anyways. This build has been tested on vista in tacc by both @sbhatnag and I. He has also checked that the cpu only build builds fine on stampede on tacc. It has been built on a bunch of RHEL8 machine in NRAO and my ubuntu 24.04 laptop and it does fine. So I think its ready to merge.
Squashed commits:
* Fixing build script to mimic the vista one
* stampede build
* Adding cxx setting for kokkos
* Adding an explicit include for casacore headers
* Updating the FindCasacore.cmake path to be with other modules. We are also explicitly hinting for the findcasacore to look inside our local path
* Fix CI pipeline issues with ccache and Spack detection
Resolved three CI configuration issues:
1. Removed explicit CMAKE_CXX_COMPILER_LAUNCHER settings that caused
Kokkos build failures. Kokkos rejects compiler launchers when the
base compiler cannot compile CUDA. Since ccache is already in PATH
at /usr/lib64/ccache/, CMake uses it automatically without explicit
launcher configuration.
2. Isolated SPACK_ROOT environment variables to spack-test job only.
Previously defined as global variables, these leaked into build-job
causing Find modules to prefer Spack installations over system
packages. Updated FindGSL.cmake and FindWCSLIB.cmake to respect
LIBRA_USE_SPACK flag before searching Spack directories.
3. Set allow_failure: true for all manual CI jobs (manual-trigger,
manual-cpu-only, manual-spack) to prevent untriggered manual jobs
from blocking pipeline success on merge requests.
These changes ensure cmake-refactoring branch builds successfully in
CI while maintaining ccache functionality and proper dependency
resolution.
Or if you prefer something shorter:
Fix CI: Remove explicit ccache launcher and isolate Spack variables
- Remove CMAKE_CXX_COMPILER_LAUNCHER to fix Kokkos CUDA build with ccache
- Move SPACK_ROOT variables from global to spack-test job scope
- Update Find modules to respect LIBRA_USE_SPACK flag
- Set allow_failure: true for manual jobs to unblock MR pipelines
* Adding the script to setup env variables for TACC/vista
* Updating actions workflow to include a submodule sync and update
* Updating to fix namespace clash
* Updating to remove kokkos and only keeper header
* remove spurious find
* Updating the kokkos target linking name
* Trying to debug the linking from kokkos wrappers
* Updating for wcslib finding
* Updating with proper cmake targets to link against
* Updated cfitsio spack finding
* Update wcslib finding with spack
* Adding proper include dirs
* Adding the find modules
* Adding findcasacore cmake
* Updated to remove pkgconfig and introduce finding based on cmake
* Updating the FFTW resume
* Updating the FFTW resume
* Updating the FFTW resume
* Updating the resume features
* Updating to make python optional and let pybind11 do the finding.
* Components portion of the refactor
* Simplified main cmake that works
* Refactoring existing CMakeLists into functions using external projectadd
* Refactor Cmake to be more modular. Step1 we have not altered syntax yet
Closes:
Merge request: https://gitlab.nrao.edu/ardg/libra/-/merge_requests/1391 parent e1ca0ae commit 18f2298
File tree
39 files changed
+1846
-106
lines changed- apps
- src
- translation
- cmake
- components
- dependencies
- modules
- scripts
- src
- asdmstman
- atmosphere
- casa_sakura
- casatools
- components
- imageanalysis
- libracore
- librautils
- mstransform
- msvis
- nrao
- stdcasa
- synthesis
39 files changed
+1846
-106
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | 2 | | |
3 | | - | |
| 3 | + | |
| 4 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
17 | 17 | | |
18 | 18 | | |
19 | 19 | | |
20 | | - | |
21 | | - | |
22 | | - | |
23 | | - | |
24 | 20 | | |
25 | 21 | | |
26 | 22 | | |
| |||
75 | 71 | | |
76 | 72 | | |
77 | 73 | | |
78 | | - | |
79 | | - | |
80 | | - | |
81 | 74 | | |
82 | 75 | | |
83 | 76 | | |
| |||
100 | 93 | | |
101 | 94 | | |
102 | 95 | | |
103 | | - | |
| 96 | + | |
104 | 97 | | |
105 | 98 | | |
106 | 99 | | |
| |||
191 | 184 | | |
192 | 185 | | |
193 | 186 | | |
| 187 | + | |
| 188 | + | |
| 189 | + | |
| 190 | + | |
| 191 | + | |
194 | 192 | | |
195 | 193 | | |
196 | 194 | | |
| |||
361 | 359 | | |
362 | 360 | | |
363 | 361 | | |
364 | | - | |
365 | | - | |
366 | 362 | | |
367 | 363 | | |
368 | 364 | | |
369 | 365 | | |
370 | 366 | | |
371 | 367 | | |
372 | | - | |
| 368 | + | |
373 | 369 | | |
374 | 370 | | |
375 | 371 | | |
376 | 372 | | |
377 | 373 | | |
378 | | - | |
| 374 | + | |
379 | 375 | | |
380 | 376 | | |
381 | 377 | | |
382 | 378 | | |
383 | 379 | | |
384 | | - | |
| 380 | + | |
385 | 381 | | |
386 | 382 | | |
387 | 383 | | |
388 | 384 | | |
389 | 385 | | |
390 | 386 | | |
391 | 387 | | |
392 | | - | |
393 | | - | |
394 | | - | |
395 | 388 | | |
396 | 389 | | |
397 | 390 | | |
| |||
404 | 397 | | |
405 | 398 | | |
406 | 399 | | |
407 | | - | |
| 400 | + | |
408 | 401 | | |
409 | 402 | | |
410 | 403 | | |
| |||
416 | 409 | | |
417 | 410 | | |
418 | 411 | | |
419 | | - | |
| 412 | + | |
420 | 413 | | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | | - | |
2 | | - | |
3 | | - | |
4 | | - | |
5 | | - | |
6 | | - | |
7 | | - | |
8 | | - | |
9 | | - | |
10 | | - | |
11 | | - | |
12 | | - | |
13 | | - | |
14 | | - | |
15 | | - | |
16 | | - | |
17 | | - | |
18 | | - | |
19 | | - | |
20 | | - | |
21 | | - | |
22 | | - | |
23 | | - | |
| 1 | + | |
| 2 | + | |
24 | 3 | | |
25 | 4 | | |
26 | 5 | | |
27 | | - | |
28 | | - | |
29 | | - | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
30 | 9 | | |
31 | 10 | | |
32 | 11 | | |
33 | 12 | | |
34 | 13 | | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
35 | 23 | | |
36 | 24 | | |
37 | 25 | | |
| |||
45 | 33 | | |
46 | 34 | | |
47 | 35 | | |
48 | | - | |
49 | 36 | | |
50 | 37 | | |
51 | 38 | | |
| |||
0 commit comments