Skip to content

Disable mirror processes (nprocesses=2 in pptt) + Add process name to library names#396

Merged
valassi merged 15 commits into
madgraph5:masterfrom
valassi:pptt
Mar 8, 2022
Merged

Disable mirror processes (nprocesses=2 in pptt) + Add process name to library names#396
valassi merged 15 commits into
madgraph5:masterfrom
valassi:pptt

Conversation

@valassi
Copy link
Copy Markdown
Member

@valassi valassi commented Mar 8, 2022

This is a WIP PR for issue #343

  • It integrates the latest patch by @oliviermattelaer in bazaar version 311, where mirror processes are disabled (so that nprocesses becomes 1 instead of 2 in the uutt subprocess of pptt)
  • denominators becomes an array[nprocesses], as in bazaar version 311: the fix ensures that "int denominators = 36,36;" becomes "int denominators[1] = 36;"
  • HOWEVER, the code still assumes that nprocesses==1: a static assert is even added about that, and the scalar "denominators" is replaced by "denominators[0]" everywhere...

This fixes #343, but we should still find an example with nprocesses>1 (#272) even in the absence of mirror processes (is there any such thing? otherwise can the "denominators[1]" array become a scalar again?)

Later on I might also add a patch for pptt library names as discussed with @roiser

valassi added 9 commits March 7, 2022 22:39
…denominators' by vector 'denominators[1]'
….1.1_lo_vectorization/madgraph/iolibs/export_cpp.py

(check tkdiff 2.7.0_gpu/madgraph/iolibs/export_cpp.py 3.1.1_lo_vectorization/madgraph/iolibs)
…LL ASSUME NPROCESSES == 1 ***

Fix codegen templates, regenerate ggtt auto, fix also ggtt manual
… "cp -i"

(do not prompt if the file already exists... not sure why I have not seen this before)
valassi added 6 commits March 8, 2022 17:50
…aced...

However this demands overriding ProcessExporterCPP.copy_template in export_cpp upstream.
Maybe another option is possible in the Makefile...
…akefiles

Revert "[pptt] prepare Makefile templates with %(processid_short)s to be replaced..."
This reverts commit 8eaecca.

Revert "[pptt] rename libraries as suggested by @roiser to avoid clashes madgraph5#397"
This reverts commit 4beacf5.
…roiser to avoid clashes madgraph5#397

NB: only the cxx and cu libraries need to be renamed, while the common library includes only common src files for now...
@valassi valassi changed the title WIP: disable mirror processes (nprocesses=2 in pptt) Disable mirror processes (nprocesses=2 in pptt) + Add process name to library names Mar 8, 2022
@valassi valassi marked this pull request as ready for review March 8, 2022 17:37
@valassi
Copy link
Copy Markdown
Member Author

valassi commented Mar 8, 2022

This is now complete. It addresses two issues for pptt

@valassi
Copy link
Copy Markdown
Member Author

valassi commented Mar 8, 2022

All checks passed, self merging

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.

Fix "nprocesses>1" code generation (example: uutt within pptt gives "const int denominators = 36,36;")

1 participant