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

update sub repo #766

Merged
merged 1 commit into from
Sep 15, 2023
Merged

update sub repo #766

merged 1 commit into from
Sep 15, 2023

Conversation

roiser
Copy link
Member

@roiser roiser commented Sep 15, 2023

No description provided.

@roiser
Copy link
Member Author

roiser commented Sep 15, 2023

update the sub repository with the latest hash

@roiser roiser merged commit f6ff1ec into madgraph5:master Sep 15, 2023
@roiser roiser deleted the update-subrepo branch September 15, 2023 08:47
valassi added a commit to valassi/madgraph4gpu that referenced this pull request Oct 28, 2023
This adds the following commits by Stefan and Olivier (PRs # 766 # 769 madgraph5#770 madgraph5#771 madgraph5#776)
a3d3490       oliviermattelaer        Tue Oct 3 17:11:11 2023 +0200   Merge pull request madgraph5#776 from roiser/fixdyjj
1782d5f       Stefan Roiser   Mon Oct 2 16:32:04 2023 +0200   remove logging infos
167085f       Stefan Roiser   Mon Oct 2 16:27:41 2023 +0200   remove LDEXTRAFLAGS, its in another PR
c7ba431       Stefan Roiser   Mon Oct 2 16:26:46 2023 +0200   update ref
a120157       Stefan Roiser   Mon Oct 2 15:19:47 2023 +0200   make sure the template type for the coupling access is the correct one. The problem we faced was that a wave function "template" was generated where the access type was hardcoded in the template list, but when the same wave function is called once with dependent and then with independent couplings this strategy breaks.
43dc938       Stefan Roiser   Fri Sep 29 15:42:14 2023 +0200  fix coupling ordering
c76d51a       Stefan Roiser   Fri Sep 29 15:41:41 2023 +0200  remove erronously committed file
28b14ae       Stefan Roiser   Sun Sep 24 13:37:49 2023 +0200  add variable LDEXTRAFLAGS to enable passing in extra flags for the linking, this is currently needed as the latest upgrade to MacOS 13.6 and XCode 15 broke the builds. Until this is fixed the flags need to contain -ld_classic -lstdc++
e21d346       Stefan Roiser   Wed Sep 27 10:59:54 2023 +0200  Merge pull request madgraph5#771 from roiser/fixsmmodel
b61d6d5       Stefan Roiser   Wed Sep 27 10:28:12 2023 +0200  fix a problem when using sm models which are not standard
5ad4108       Stefan Roiser   Wed Sep 27 10:13:00 2023 +0200  Merge pull request madgraph5#770 from roiser/undofixpdfwrapper
baeefbb       Stefan Roiser   Tue Sep 26 17:53:51 2023 +0200  remove the patch for the pdf wrapper, it was already upstream
70e7381       Olivier Mattelaer       Tue Sep 26 15:35:17 2023 +0200  remove all makefile
9febe6f       oliviermattelaer        Tue Sep 26 15:04:46 2023 +0200  Merge pull request madgraph5#769 from roiser/fixlhapdf
e76db73       Stefan Roiser   Tue Sep 26 14:30:59 2023 +0200  add missing vector.inc to the lhapdf wrapper
bcf9443       Olivier Mattelaer       Fri Sep 22 14:45:05 2023 +0200  fixing lhapdf compilation issue
f6ff1ec       Stefan Roiser   Fri Sep 15 10:47:07 2023 +0200  Merge pull request madgraph5#766 from roiser/update-subrepo
8d78520       Stefan Roiser   Fri Sep 15 09:55:10 2023 +0200  update sub repo

Fix conflicts: epochX/cudacpp/CODEGEN/PLUGIN/CUDACPP_SA_OUTPUT/model_handling.py
valassi added a commit to valassi/madgraph4gpu that referenced this pull request Oct 28, 2023
…p the MG5AMC PLUGIN directory, following PR madgraph5#766

(NB: I would very much prefer instead to revert this commit and revert the commit in PR madgraph5#766)
valassi added a commit to valassi/madgraph4gpu that referenced this pull request Oct 2, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant