Skip to content

DrHook Static Linking Fixes#106

Merged
wdeconinck merged 58 commits into
ecmwf-ifs:developfrom
Andrew-Beggs-ECMWF:naab-static-linking-fixes-only
Mar 13, 2026
Merged

DrHook Static Linking Fixes#106
wdeconinck merged 58 commits into
ecmwf-ifs:developfrom
Andrew-Beggs-ECMWF:naab-static-linking-fixes-only

Conversation

@Andrew-Beggs-ECMWF

Copy link
Copy Markdown
Contributor

This is all the fixes, but none of the CI changes, from #104.

The easiest way I could think of to get all the required changes & keep the git history, was to simply have a commit that resets the changes to the CI. In the future, this commit could be dropped in an interactive rebase to restore the work done.

This should allow for the testing of builds for both static and shared
libs. If the case statement doesn't match (not currently possible), it
will default to a shared lib build.
N.b. this is expected to fail due to missing libraries. That will be
added later.

Fix typo
It's common between ubuntu 24.04 and 22.04
Andrew-Beggs-ECMWF and others added 22 commits March 10, 2026 10:08
Also removes DR_HOOK_OPT=NOPROP since it is no longer needed.
Tests fail during CI due to the GitHub runner having no counters available. A minimal mock library should be made to solve this, but for now, simply having a working build that doesn't fail non-papi tests is sufficient.

Fix regex

Escape quotes

Change quotes

Replace case() statement

Remove outer quotes

Move regex to matrix to avoid string shenanigans

Fix matrix defs

Add quotes to avoid splitting

Swap quotes

Swap quotes

Tmp test

Add brackets for grouping

Make regex more explicit
Change to ifdef vs literal value

DR_HOOK_HAVE_PAPI isn't always defined. This is slightly safer too.
This is part of making a hotfix release. The intention is to drop this commit in a later PR.
Comment thread cmake/fiat-import.cmake.in Outdated
Comment thread cmake/fiat-import.cmake.in Outdated
Comment thread cmake/FindROCTX.cmake Outdated
Comment thread src/fiat/CMakeLists.txt Outdated
@wdeconinck
wdeconinck merged commit 0dfd9d6 into ecmwf-ifs:develop Mar 13, 2026
16 checks passed
wdeconinck added a commit that referenced this pull request Mar 18, 2026
* release/2.0.0: (47 commits)
  Version 2.0.0
  Add GSTATS CSV output
  Remove spurious cmake warning introduced in 0dfd9d6
  Fix mpl_alltoallv missing target attribute (#107) (#108)
  DrHook Static Linking Fixes (#106)
  Fix warnings
  Fix scatterv test for nag (#103)
  Fix use of associate statement to optional argument in mpl_gatherv_int (#99)
  Fix hidden enabling of MPL_F77_DEPRECATED feature when MPI_F08 support is missing (#101)
  NAG support for --no-archive compiler option
  Set MPI_SERIAL_LIBRARIES --no-archive flags (#98)
  Fix missing target MPI::MPI_Fortran for static builds
  Update warning message and comment in mpl_displs_container_mod.F90 (#93)
  Also link MPI publicly for IntelLLVM (#94)
  fiatlib: update logic to ensure fiat lib target still exists in static builds (#96)
  Fix static linking (#95)
  Fixup #79, adding MPI as a dependency in fiat-import.cmake for NVHPC
  Fix meminfo for CCE/19.0.0 #92
  Link MPI libraries publicly if building with NVHPC, to avoid symbol availability issue.  * appears to be NVHPC-specific, NEEDS FURTHER INVESTIGATION
  Fix deadlock happening with ifx 2025.3.1 and make code more robust (#88)
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants