Skip to content

Includes all the changes to the makefiles, adding new targets for CUDA/cppavx builds #775

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

Jump to bottom
Merged
valassi merged 83 commits into from
May 22, 2024
Merged

Includes all the changes to the makefiles, adding new targets for CUDA/cppavx builds #775

valassi merged 83 commits into from
May 22, 2024

Conversation

@Jooorgen
Copy link
Member

@Jooorgen Jooorgen commented Sep 29, 2023

This includes the new targets for the makefile, cudacpp.mk and cudacpp_src.mk files.

The new targets are: cuda, cppnone, cppsse4, cppavx2, cpp512y and cpp512z.

@Jooorgen
Moved compilation of CUDA to seperate cuda target
792080e
@Jooorgen
Fixed indentation in the makefile
c945deb
@Jooorgen
Removed all unneccessary NVCC ifneq and redid indentation
36a5fa7
@Jooorgen
Convert all spaces to tabs in cudacpp.mk file
0b95fb7
@Jooorgen
Revert "Convert all spaces to tabs in cudacpp.mk file"
360d908 
This reverts commit e38570f.
@Jooorgen
Changed line to be interpreted in bash into spaces
575840c
@Jooorgen
Changed indentation again
19911fb
@Jooorgen
Fixed indentation in start of CUDA compilation
f4366a9
@Jooorgen
Fixed indentation in fcheck compilation
b819498
@Jooorgen
Changed indentation of ifndef in CUDA compilation
9082da0
@Jooorgen
Changed indentation back to tabs again for some lines
bfd4301
@Jooorgen
Changed indentation again to fix endif error
529318c
@Jooorgen
Revert back cudacpp.mk to original state
fc549ca
@Jooorgen
Added cuda target
bd0df54
@Jooorgen
Added usage target if user doesent speficy target when invoking makef…
df98ffa 
…ile and added cpp targets
@Jooorgen
Added .DEFAULT_GOAL so usage target will be run correctly
f822e93
@Jooorgen
Added targets to cpp build
63bb3b5
@Jooorgen
Added correct cpp targets
b5758b0
@Jooorgen
Added $(MAKECMDGOALS) ifeq to CUDA compiler configuration
eb3a706
@Jooorgen
Removed automatic configuration of AVX level
b23ada0
@Jooorgen
Fixed correct AVX level depending on C++ compiler
683e641
@Jooorgen
Reworked configuration of setting AVX level
fca0b73
@Jooorgen
Fixed missing endif and removed AVX configuration in cuda compilation
489c453
@Jooorgen
Fixed AVX not being properly set
01b7da3
@Jooorgen
Fixed cuda compilation in cudacpp_src.mk and fixed trailing whitespac…
e734f49 
…e in AVX assignment
@Jooorgen
Added else case in AVX configuration
35d6aee
@Jooorgen
Port changes to BUILDDIRTAG to cudacpp_src.mk
b611e9e
@Jooorgen
Added build specific clean targets in cudacpp.mk and cudacpp_src.mk
fbdb45a
@Jooorgen
Fixed cleanall with new clean targets
b86bf3c
@Jooorgen
Fixed indentations in the recipie of the targets
8b22e9a
@Jooorgen
Fixed indentation in cudacpp_src.mk
c121b0d
@Jooorgen
gCheck and check are now to seperate targets for use in CI
7511431
@Jooorgen
NVCC now gets properly configured when doing various tests
328c921
@Jooorgen
Removed the creation of lockfiles
df04597
@Jooorgen
Added cpp target for testing
51828ef
@Jooorgen
[CODEGEN] Ported changes in gg_tt.mad to codegen
aace762
@Jooorgen
[CODEGEN] Added patch to makefile to patch.common in codegen
66d0191
@Jooorgen
Readded cleaning of build directories in cleanall
892f21c
@Jooorgen
[CODEGEN] Fixed indentation in cudacpp.mk in codegen
b0f52b5
@Jooorgen
Fixed indentation in cudacpp.mk in gg_tt.mad
fd3f74d
@Jooorgen
[CODEGEN] Removed prior patch to makefile in patch.common
f48ab5a
@Jooorgen
Revert "[CODEGEN] Removed prior patch to makefile in patch.common"
92bd1e7 
This reverts commit f48ab5a.
@Jooorgen
[CODEGEN] Fixed patch not applying because string does not exist in f…
dd01050 
…ile that it is trying to patch
@Jooorgen
[CODEGEN] Fixed mismatch in patch.common
e75ca38
@Jooorgen
Sets correct cppavx dependency for compiling madevent_cpp
191e112
@Jooorgen
Fixed unneccessary & in CUDACPP_BUILDDIR assignment
67dd776
@Jooorgen
[CODEGEN] Add the dependency on cppavx target when compiling madevent…
9e974c0 
…_cpp in codegen patch
@Jooorgen
[CODEGEN] Now sets correct target for linking with cppavx target in r…
564682a 
…uncard
@Jooorgen
[CODEGEN] Fixed patch.commen to have correct intervals in git diff
6382b5a
@Jooorgen
[CODEGEN] Correctly assigns CPPTARGET in compiling madevent_cpp
6092d6a
@Jooorgen
[CODEGEN] Correctly sets dependencies for madevent_cpp
bedb79c
@Jooorgen
[CODEGEN] Correctly sets target if madevent is in $MAKECMDGOALS
cf1b21b
@Jooorgen
[CODEGEN] Regenerated all .sa/.mad processes
75c5be6
@hageboeck hageboeck mentioned this pull request Oct 30, 2023
Merged
This was referenced Dec 9, 2023
Closed
Merged
@valassi valassi mentioned this pull request Jan 31, 2024
Merged
@valassi valassi merged commit 75c5be6 into madgraph5:master May 22, 2024
@valassi
Copy link
Member

valassi commented May 22, 2024

This has been effectively merged when merging #798 which was based on it - thank again Jorgen!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@Jooorgen Jooorgen

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@Jooorgen @valassi