Skip to content

[CI] Minor CMake refactoring#3227

Draft
fheinecke wants to merge 3 commits into
NVIDIA:mainfrom
fheinecke:fred/build-refactor-1
Draft

[CI] Minor CMake refactoring#3227
fheinecke wants to merge 3 commits into
NVIDIA:mainfrom
fheinecke:fred/build-refactor-1

Conversation

@fheinecke

Copy link
Copy Markdown
Collaborator

Description

This fixes a couple of minor CMake bugs, and slightly simplifies NCCL dependency resolution.

Type of change

  • Documentation change (change only to the documentation, either a fix or a new content)
  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)
  • Infra/Build change
  • Code refactoring

Changes

Please list the changes introduced in this PR:

  • 28fe8ee: NCCL header location is now resolved once instead of two separate places with different resolution hints.
  • b6303b8: Python site-packages/nvidia/nccl is now searched for NCCL headers, making it easier to resolve them when installing NCCL via nvidia-nccl-cu{12,13} wheels.
  • 30d92a7: The TE version linker script is now only provided when TE is linked, rather than every time the C++ or CUDA compiler is executed (compiler detection, compilation, etc).

Checklist:

  • I have read and followed the contributing guidelines
  • The functionality is complete
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation
  • My changes generate no new warnings
  • I have added tests that prove my fix is effective or that my feature works
  • New and existing unit tests pass locally with my changes

NCCL is now always required for all native build paths (due to a change
sometime between v2.16 and main). This updates CMake to only search for
the headers in a single place.

This does not impact the NCCL EP dependency resolution.

Signed-off-by: Fred Heinecke <fheinecke@nvidia.com>
This will now also search Python's site-packages, making it much easier
to pull in headers from `nvidia-nccl-cu{12,13}`.

Signed-off-by: Fred Heinecke <fheinecke@nvidia.com>
Previously this was provided every time the C++ or CUDA compiler was
invoked for everything built by CMake, including compiler detection and
compilation, instead of just when linking the TE library.

Signed-off-by: Fred Heinecke <fheinecke@nvidia.com>
@fheinecke

Copy link
Copy Markdown
Collaborator Author

/te-ci

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.

1 participant