From 0cf829b3d770f2e18a51f09084875939965abdfd Mon Sep 17 00:00:00 2001 From: ruru25254649 Date: Thu, 22 Oct 2026 06:04:20 +0900 Subject: [PATCH 1/3] Let -cudalib=nvtx3 pick NVHPC's NVTX wrapper so NVHPC 26.9 links For CUDA >= 12.9 the targets linked nvhpcwrapnvtx by name in addition to -cudalib=nvtx3. NVHPC 26.9 renamed that library to libnvhpcnvtx, so the build stops at its first link (syscheck): /usr/bin/ld: cannot find -lnvhpcwrapnvtx -cudalib=nvtx3 already adds the wrapper under the right name for the installed release (-lnvhpcwrapnvtx on 26.3, -lnvhpcnvtx on 26.9, per nvfortran -dryrun), so the explicit name is dropped. Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_01WPhkY8p1EHhGY7jScizJmC --- cmake/MFCTargets.cmake | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cmake/MFCTargets.cmake b/cmake/MFCTargets.cmake index 13777ccc32..081f7c5a81 100644 --- a/cmake/MFCTargets.cmake +++ b/cmake/MFCTargets.cmake @@ -345,7 +345,8 @@ exit 0 if (TARGET CUDA::nvToolsExt) # CUDA <= 12.8 target_link_libraries(${a_target} PRIVATE CUDA::nvToolsExt) else() # CUDA >= 12.9 - target_link_libraries(${a_target} PRIVATE nvhpcwrapnvtx) + # Also links NVHPC's NVTX wrapper library, whose name changed in 26.9 + # (libnvhpcwrapnvtx -> libnvhpcnvtx), so it is not named here. target_link_options(${a_target} PRIVATE "-cudalib=nvtx3") endif() endif() From aaaf38a8486e647eebeb6ae6c2e746b53586a067 Mon Sep 17 00:00:00 2001 From: ruru25254649 Date: Sun, 25 Oct 2026 02:55:17 +0900 Subject: [PATCH 2/3] Run the test matrix for changes under cmake/ file-filter.yml lists CMakeLists.txt and toolchain/cmake/** but not the cmake/ directory added in #1552, so a PR that only changes cmake/*.cmake skips every build. Same line as in #2019. Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_01WPhkY8p1EHhGY7jScizJmC --- .github/file-filter.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/file-filter.yml b/.github/file-filter.yml index b74b2a4f11..15841240ab 100644 --- a/.github/file-filter.yml +++ b/.github/file-filter.yml @@ -11,6 +11,7 @@ python_src: &python_src cmakelist: &cmakelist - 'CMakeLists.txt' + - 'cmake/**' - 'toolchain/cmake/**' tests: &tests From 2361c5a000cb67540cbc82eb564356efd6c2c97e Mon Sep 17 00:00:00 2001 From: ruru25254649 Date: Sun, 25 Oct 2026 16:36:59 +0900 Subject: [PATCH 3/3] Say which NVTX wrapper name each NVHPC release links Checked with nvfortran -cudalib=nvtx3 -dryrun on 25.9, 26.3 and 26.9. Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_01WPhkY8p1EHhGY7jScizJmC --- cmake/MFCTargets.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake/MFCTargets.cmake b/cmake/MFCTargets.cmake index 081f7c5a81..401b361ae2 100644 --- a/cmake/MFCTargets.cmake +++ b/cmake/MFCTargets.cmake @@ -345,8 +345,8 @@ exit 0 if (TARGET CUDA::nvToolsExt) # CUDA <= 12.8 target_link_libraries(${a_target} PRIVATE CUDA::nvToolsExt) else() # CUDA >= 12.9 - # Also links NVHPC's NVTX wrapper library, whose name changed in 26.9 - # (libnvhpcwrapnvtx -> libnvhpcnvtx), so it is not named here. + # -cudalib=nvtx3 links NVHPC's NVTX wrapper under each release's name + # (-lnvhpcwrapnvtx in 25.9 and 26.3, -lnvhpcnvtx in 26.9), so it is not named here. target_link_options(${a_target} PRIVATE "-cudalib=nvtx3") endif() endif()