Skip to content
New issue

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

#

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

Already on GitHub? # to your account

Jump to bottom

Remove C++ code dependencies on CUDA headers, except where curand is needed #679

Closed
valassi opened this issue Jun 4, 2023 · 1 comment · Fixed by #681
Closed

Remove C++ code dependencies on CUDA headers, except where curand is needed #679

valassi opened this issue Jun 4, 2023 · 1 comment · Fixed by #681
Assignees
@valassi

Comments

@valassi
Copy link
Member

valassi commented Jun 4, 2023 •
edited
Loading

Part of the cleanup of builds. Remove C++ code dependencies on CUDA headers, except where curand is needed

Related to #674
This was referenced Jun 4, 2023
Closed
Open
valassi added a commit to valassi/madgraph4gpu that referenced this issue Jun 4, 2023
@valassi
[builds] in gg_tt.mad cudacpp.mk, allow passing RNDGEN from outside m…
ee67493 
…ake madgraph5#679
valassi added a commit to valassi/madgraph4gpu that referenced this issue Jun 4, 2023
@valassi
[builds] in gg_tt.mad cudacpp.mk, disable NVTX by default in C++ builds
b9e6a39 
madgraph5#679

Still need to test that I can optionally reenable it...
valassi added a commit to valassi/madgraph4gpu that referenced this issue Jun 4, 2023
@valassi
[builds] in gg_tt.mad cudacpp.mk, remove CUINC from generic C++ .o bu…
8bd2fae 
…ilds madgraph5#679
valassi added a commit to valassi/madgraph4gpu that referenced this issue Jun 4, 2023
@valassi
[builds] in gg_tt.mad cudacpp.mk, add back CUINC in .o files that dep…
07396c4 
…end on curand madgraph5#679

These both succeed
make -f cudacpp.mk cleanall; make -f cudacpp.mk RNDGEN=hasCurand
make -f cudacpp.mk cleanall; make -f cudacpp.mk RNDGEN=hasNoCurand
valassi added a commit to valassi/madgraph4gpu that referenced this issue Jun 4, 2023
@valassi
[builds] in gg_tt.mad, use a fwd definition to remove RandomNumberKer…
467e2c1 
…nels.h dependency from curand.h madgraph5#679
valassi added a commit to valassi/madgraph4gpu that referenced this issue Jun 4, 2023
@valassi
[builds] in gg_tt.mad cudacpp.mk, keep the curand header dependency o…
acd1348 
…nly in RandomNumberKernels.o madgraph5#679

Essentially, the curand dependency is fully encapsulated in RandomNumberKernels.o
valassi added a commit to valassi/madgraph4gpu that referenced this issue Jun 4, 2023
@valassi
[builds] in gg_tt.mad cudacpp.mk, rename CULIBFLAGS as CURANDLIBFLAGS…
ebe5615 
… for clarity madgraph5#679
valassi added a commit to valassi/madgraph4gpu that referenced this issue Jun 4, 2023
@valassi
[builds] in gg_tt.mad cudacpp.mk, add back NVTX by default, but encap…
3780a9e 
…sulate it in (g)check.exe madgraph5#679
valassi added a commit to valassi/madgraph4gpu that referenced this issue Jun 4, 2023
@valassi
[builds] in gg_tt.mad cudacpp.mk, remove CURANDLIBFLAGS from fcheck a…
97701ed 
…nd runtest, keep it only in check madgraph5#679

Essentially: curand is presently used only in check.exe and gcheck.exe...
This means we should really disable it for madevent production builds?
valassi added a commit to valassi/madgraph4gpu that referenced this issue Jun 4, 2023
@valassi
[builds] revert the previous commit: must keep -lcurand even if runTe…
7a1b85d 
…st and fcheck do not use the feature...

Revert "[builds] in gg_tt.mad cudacpp.mk, remove CURANDLIBFLAGS from fcheck and runtest, keep it only in check madgraph5#679"
This reverts commit 97701ed.
valassi added a commit to valassi/madgraph4gpu that referenced this issue Jun 4, 2023
@valassi
[builds] in gg_tt.mad cudacpp.mk, add CurandRandomNumberKernel and -l…
7af87e0 
…curand only to check.exe, remove it from fcheck and runtest, madgraph5#679
valassi added a commit to valassi/madgraph4gpu that referenced this issue Jun 4, 2023
@valassi
[builds] in gg_tt.mad cudacpp.mk, encapsulate -DMGONGPU_HAS_NO_CURAND…
bbe3f54 
… in CXXFLAGSCURAND madgraph5#679
valassi added a commit to valassi/madgraph4gpu that referenced this issue Jun 4, 2023
@valassi
[builds] in CODEGEN, backport cudand changes from gg_tt.mad madgraph5…
00f0674 
…#679, include small formatting fixes
@valassi valassi self-assigned this Jun 4, 2023
@valassi valassi mentioned this issue Jun 4, 2023
Merged
valassi added a commit to valassi/madgraph4gpu that referenced this issue Jun 4, 2023
@valassi
[builds] in CODEGEN, backport cudand changes from gg_tt.mad madgraph5…
a0045c5 
…#679, include small formatting fixes
@valassi valassi linked a pull request Jun 4, 2023 that will close this issue
improve cuda/c++ separation in cudacpp builds (reduce cpp dependency on nvtx/curand) #681
Merged
@valassi
Copy link
Member Author

valassi commented Jun 4, 2023

Closed by MR #681

@valassi valassi closed this as completed Jun 4, 2023
valassi added a commit to mg5amcnlo/mg5amcnlo_cudacpp that referenced this issue Aug 16, 2023
@valassi
[builds] in CODEGEN, backport cudand changes from gg_tt.mad madgraph5…
b9f781e 
…/madgraph4gpu#679, include small formatting fixes
# for free to join this conversation on GitHub. Already have an account? # to comment
Assignees

@valassi valassi

Labels
None yet
Projects
None yet
Milestone
No milestone
1 participant
@valassi