madgraph5 / madgraph4gpu

GPU development for the Madgraph5_aMC@NLO event generator software package
30 stars 33 forks source link

remove un-necessary patch #849

Closed oliviermattelaer closed 2 months ago

oliviermattelaer commented 4 months ago

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 commented 4 months ago

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 commented 2 months ago

@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.

valassi commented 2 months ago

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.

valassi commented 2 months ago

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 commented 2 months ago

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

image