Skip to content

Ensuring CTK minor version compatibility for cccl.c.parallel #4851

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
oleksandr-pavlyk merged 1 commit into from
May 30, 2025
Merged

Ensuring CTK minor version compatibility for cccl.c.parallel #4851

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion c/parallel/src/nvrtc/command_list.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@
#include <tuple>
#include <vector>

#include <nvJitLink.h>
#include <nvrtc.h>

#include <nvrtc/nvjitlink_helper.h>
#include <util/errors.h>

struct nvrtc_ptx
Expand Down
23 changes: 23 additions & 0 deletions c/parallel/src/nvrtc/nvjitlink_helper.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
#pragma once

#define NVJITLINK_NO_INLINE
#include <nvJitLink.h>
#undef NVJITLINK_NO_INLINE

@rwgk rwgk May 29, 2025

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This #undef surprises me slightly. I'd lean towards keeping it defined:

  • Assuming nvJitLink.h is the only code from where this define is referenced: it does not matter.

  • Assuming other Nvidia code also references this define: undefining here could lead to inconsistencies.


// declare unversioned functions

extern "C" {
nvJitLinkResult nvJitLinkCreate(nvJitLinkHandle*, uint32_t, const char**);
nvJitLinkResult nvJitLinkDestroy(nvJitLinkHandle*);
nvJitLinkResult nvJitLinkAddData(nvJitLinkHandle, nvJitLinkInputType, const void*, size_t, const char*);
nvJitLinkResult nvJitLinkAddFile(nvJitLinkHandle, nvJitLinkInputType, const char*);
nvJitLinkResult nvJitLinkComplete(nvJitLinkHandle);
nvJitLinkResult nvJitLinkGetLinkedCubinSize(nvJitLinkHandle, size_t*);
nvJitLinkResult nvJitLinkGetLinkedCubin(nvJitLinkHandle, void*);
nvJitLinkResult nvJitLinkGetLinkedPtxSize(nvJitLinkHandle, size_t*);
nvJitLinkResult nvJitLinkGetLinkedPtx(nvJitLinkHandle, char*);
nvJitLinkResult nvJitLinkGetErrorLogSize(nvJitLinkHandle, size_t*);
nvJitLinkResult nvJitLinkGetErrorLog(nvJitLinkHandle, char*);
nvJitLinkResult nvJitLinkGetInfoLogSize(nvJitLinkHandle, size_t*);
nvJitLinkResult nvJitLinkGetInfoLog(nvJitLinkHandle, char*);
}

@rwgk rwgk May 29, 2025

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I looked at what's actually being used (below): 10 of 13 APIs.

I'd probably remove the 3 we're not using, with a comment:

// nvJitLink APIs used in cccl/c/parallel

      2 src/nvrtc/command_list.h:  nvJitLinkAddData
      1 src/nvrtc/command_list.h:  nvJitLinkComplete
      1 src/nvrtc/command_list.h:  nvJitLinkCreate
      1 src/nvrtc/command_list.h:  nvJitLinkDestroy
      1 src/nvrtc/command_list.h:  nvJitLinkGetErrorLog
      1 src/nvrtc/command_list.h:  nvJitLinkGetErrorLogSize
      1 src/nvrtc/command_list.h:  nvJitLinkGetLinkedCubin
      1 src/nvrtc/command_list.h:  nvJitLinkGetLinkedCubinSize
      1 src/nvrtc/command_list.h:  nvJitLinkGetLinkedPtx
      1 src/nvrtc/command_list.h:  nvJitLinkGetLinkedPtxSize

3 changes: 2 additions & 1 deletion c/parallel/src/util/context.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@
#pragma once

#include <cuda.h>
#include <nvJitLink.h>
#include <nvrtc.h>

#include <nvrtc/nvjitlink_helper.h>

bool try_push_context();
3 changes: 2 additions & 1 deletion c/parallel/src/util/errors.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,10 @@
#pragma once

#include <cuda.h>
#include <nvJitLink.h>
#include <nvrtc.h>

#include <nvrtc/nvjitlink_helper.h>

void check(nvrtcResult result);
void check(CUresult result);
void check(nvJitLinkResult result);
Loading