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

remove un-necessary patch #849

Merged
merged 4 commits into from
Jul 29, 2024
Merged

remove un-necessary patch #849

merged 4 commits into from
Jul 29, 2024

Conversation

oliviermattelaer
Copy link
Member

The point is that the function
self.compile('madevent')
is already catched by the CPP/CUDA interface of launch_plugin.py and does ensure that
compile('madevent') actually compiles the required exectuble. So they are no need to change the local copy of the "upstream" code (which might not be used anyway since the upstream one can have priority).

So since this is already handle correctly where you run the unpatch file, they are no reason to patch them...
So I did remove the patch in this PR. (see also #844)

@oliviermattelaer
Copy link
Member Author

This CI crash on a quite funy way:

 ../../src/Parameters_MSSM_SLHA2.h:826:58: error: conversion from ‘mg5amcCpu::fptype_sv’ {aka ‘__vector(2) double’} to non-scalar type ‘const mgOnGpu::cxsmpl<double>’ requested
  826 |         constexpr cxsmpl<double> mdl_G__exp__2 = ( ( G ) * ( G ) );
      |                                                  ~~~~~~~~^~~~~~~~~
make[2]: *** [cudacpp.mk:700: build.sse4_d_inl0_hrd0/runTest_cpp.o] Error 1

So this sounds like not related to this PR but to (another) type missmatch?

What do you think @valassi?

@oliviermattelaer
Copy link
Member Author

@valassi, just to remind us about this PR here, would you have any conceptual problem with this?
if not, I can probably update the mg5amc commit to avoid the conflict and repropose this.

@oliviermattelaer oliviermattelaer added the enhancement A feature we want to develop label Jul 18, 2024
…chMadsh (current upstream/master)

Fix conflicts in MG5aMC/mg5amcnlo (use upstream/master version)
…Olivier's patch in PR #849

No c++/frtran code changes: only the two gen_ximprove.py and madevent_interface.py are modified in .mad directories
Copy link
Member

@valassi valassi left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi @oliviermattelaer that's good for me.

Or better: I trust you on this, as it only touches gen_ximprove.py and madevent_interface.py, and I am not routinely testing those. So you certainly know better.

Only two issues:

  • the MG5AMC conflict must be fixed
  • the processes must be regenerated

Both issues are solved in my PR #939. So you could merge that branch of mine here and then merge into master, or merge directly my 939.

Thanks
Andrea

@valassi
Copy link
Member

valassi commented Jul 29, 2024

Only two issues:

* the MG5AMC conflict must be fixed

* the processes must be regenerated

Both issues are solved in my PR #939. So you could merge that branch of mine here and then merge into master, or merge directly my 939.

Thanks Olivier for approving my #939 :-)

I had forgotten the conflicts. I thought I would merge this 849 into master first, and then 939 into master, but this will not work. I will instead merge 939 here, and then this 849 into master.

Regenerate code for 849 (merge into less_patch for 849, fixing conflicts therein)
@valassi
Copy link
Member

valassi commented Jul 29, 2024

Ok I merged 939 here into less_patch, fixing the conflicts.

Waiting for the CI to complete, then I will merge this into master.

@valassi
Copy link
Member

valassi commented Jul 29, 2024

Ok CI completed with 6 failures as expected (susy and pptt012j), merging

image

@valassi valassi merged commit 5502223 into master Jul 29, 2024
163 of 169 checks passed
valassi added a commit to valassi/madgraph4gpu that referenced this pull request Jul 29, 2024
valassi added a commit to valassi/madgraph4gpu that referenced this pull request Jul 29, 2024
valassi added a commit to valassi/madgraph4gpu that referenced this pull request Jul 29, 2024
…rder madgraph5#918, and smaller patch madgraph5#939 and madgraph5#849) into susy2

Note: there is no change with respect to the previous origin/susy2 after this merge (no need to rerun the CI)
valassi added a commit to valassi/madgraph4gpu that referenced this pull request Jul 29, 2024
@valassi valassi linked an issue Jul 30, 2024 that may be closed by this pull request
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement A feature we want to develop
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Remove gen_ximprove.py and madevent_interface.py from patch.common?
2 participants