Skip to content
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.

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

Fix OpenMP link options for clang and Intel icx - and fix helicity selection with OMP #596

Merged
merged 21 commits into from
Feb 24, 2023

Conversation

valassi
Copy link
Member

@valassi valassi commented Feb 24, 2023

Fix OpenMP link options for clang and Intel icx - fixes #578

I added -lomp because "ldd check.exe" showed that libomp was used
I added -liomp5 because "ldd check.exe" showed that libomp was used
(probably -lomp would have been ok too, but there was a risk of mixing things up...)
./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
./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
@valassi
Copy link
Member Author

valassi commented Feb 24, 2023

The tests were initially failing because for Apple clang it still fails. I have disabled OMP in Apple clang - tant pis.

En passant instead I also did a few tests of madevent with OMP multithreading. I found out there was a rather serious bug in helicity selection (some variables were shared but should have been private, or better moved inside the loop), see #597. This is now also fixed

@valassi valassi linked an issue Feb 24, 2023 that may be closed by this pull request
@valassi valassi changed the title Fix OpenMP link options for clang and Intel icx Fix OpenMP link options for clang and Intel icx - and fix helicity selection with OMP Feb 24, 2023
@valassi valassi self-assigned this Feb 24, 2023
@valassi
Copy link
Member Author

valassi commented Feb 24, 2023

All checks have passed, I self merge

@valassi valassi merged commit 2c514d3 into madgraph5:master Feb 24, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
1 participant