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

Reenable OPENMP multithreading in cudacpp #577

Merged
merged 42 commits into from
Dec 19, 2022
Merged

Conversation

valassi
Copy link
Member

@valassi valassi commented Dec 19, 2022

This is about #575, it reenables OMP MT in cudacpp

@valassi valassi self-assigned this Dec 19, 2022
…6 sa

I made a few tests manually, see logs in madgraph5#575

NB One thing that I have not done is to reenable OMP tests in tmad/tput scripts.
You need very large number of events and long tests to get meaningful results
@valassi
Copy link
Member Author

valassi commented Dec 19, 2022

The CI was failing, I needed to fix the patch for the differente API without MULTICHANNEL #568

Now done

@valassi
Copy link
Member Author

valassi commented Dec 19, 2022

This failed on MAC with clang. I was unable to fix that, see #578. So I just disabled it.

En passant, I also fixed the OMP hacks I had added for madevent to e able to disable it in #561

…l revert"

This reverts commit 3ec8cf25ecccb9bed2bc450c33f2b4e2c81b7b5b.
…ert"

This reverts commit 2b47ccfb99700c0fb4852538fe2e1fb313732362.
Tested ok on gcc112/clang13/icpx2022, all with/without nvcc
…n/madevent software

Tested on icpx with/without nvcc
… fix build error about missing intel_fast_copy

This and previous timermap/driver/ompnumthreads fixes for openmp are part of the madgraph5#561 patch
./CODEGEN/generateAndCompare.sh gg_tt --mad --nopatch
git diff --no-ext-diff -R gg_tt.mad/Source/dsample.f gg_tt.mad/Source/genps.inc gg_tt.mad/Source/vector.inc gg_tt.mad/SubProcesses/makefile > CODEGEN/MG5aMC_patches/PROD/patch.common
git diff --no-ext-diff -R gg_tt.mad/SubProcesses/P1_gg_ttx/auto_dsig1.f gg_tt.mad/SubProcesses/P1_gg_ttx/driver.f gg_tt.mad/SubProcesses/P1_gg_ttx/matrix1.f > CODEGEN/MG5aMC_patches/PROD/patch.P1
git checkout gg_tt.mad
…ll revert"

This reverts commit 25a9d296523717450ed34e68e861327059f4ffdf.
@valassi
Copy link
Member Author

valassi commented Dec 19, 2022

And I fixed it again because Apple clang does not start with clang...

@valassi
Copy link
Member Author

valassi commented Dec 19, 2022

Ok the CI finally succeeded including clang/MAC (with omp disabled #578)

I wil self merge

@valassi valassi merged commit 5b941e7 into madgraph5:master Dec 19, 2022
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant