Skip to content

Commit 1e6dc00

Browse files
committed
fixed trex module formatting to account for CI hierarchy
1 parent 4220bd0 commit 1e6dc00

File tree

1 file changed

+21
-13
lines changed
  • epochX/cudacpp/CODEGEN/PLUGIN/CUDACPP_SA_OUTPUT

1 file changed

+21
-13
lines changed

epochX/cudacpp/CODEGEN/PLUGIN/CUDACPP_SA_OUTPUT/trex.py

Lines changed: 21 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -8,26 +8,34 @@
88
import re
99
import sys
1010
import importlib.util
11-
SPEC_EXPORTCPP = importlib.util.find_spec('madgraph.iolibs.export_cpp')
12-
PLUGIN_export_cpp = importlib.util.module_from_spec(SPEC_EXPORTCPP)
13-
SPEC_EXPORTCPP.loader.exec_module(PLUGIN_export_cpp)
14-
sys.modules['PLUGIN.CUDACPP_OUTPUT.PLUGIN_export_cpp'] = PLUGIN_export_cpp # allow 'import PLUGIN.CUDACPP_OUTPUT.PLUGIN_export_cpp' in model_handling.py
15-
del SPEC_EXPORTCPP
16-
###print('id(export_cpp)=%s'%id(export_cpp))
17-
###print('id(PLUGIN_export_cpp)=%s'%id(PLUGIN_export_cpp))
1811

19-
# AV - use template files from PLUGINDIR instead of MG5DIR
12+
# AV - PLUGIN_NAME can be one of PLUGIN/CUDACPP_OUTPUT or MG5aMC_PLUGIN/CUDACPP_OUTPUT
13+
PLUGIN_NAME = __name__.rsplit('.',1)[0]
14+
15+
# AV - use templates for source code, scripts and Makefiles from PLUGINDIR instead of MG5DIR
2016
###from madgraph import MG5DIR
2117
PLUGINDIR = os.path.dirname( __file__ )
2218

23-
# AV - model_handling includes the custom FileWriter, ALOHAWriter, UFOModelConverter, OneProcessExporter and HelasCallWriter, plus additional patches
24-
import PLUGIN.CUDACPP_OUTPUT.model_handling as model_handling
25-
import PLUGIN.CUDACPP_OUTPUT.output as output
19+
__import__('%s.output'%PLUGIN_NAME)
20+
output = sys.modules['%s.output'%PLUGIN_NAME]
21+
__import__('%s.model_handling'%PLUGIN_NAME)
22+
model_handling = sys.modules['%s.model_handling'%PLUGIN_NAME]
23+
24+
import importlib.util
25+
SPEC_EXPORTCPP = importlib.util.find_spec('madgraph.iolibs.export_cpp')
26+
PLUGIN_export_cpp = importlib.util.module_from_spec(SPEC_EXPORTCPP)
27+
SPEC_EXPORTCPP.loader.exec_module(PLUGIN_export_cpp)
28+
###sys.modules['PLUGIN.CUDACPP_OUTPUT.PLUGIN_export_cpp'] = PLUGIN_export_cpp # allow 'import PLUGIN.CUDACPP_OUTPUT.PLUGIN_export_cpp' in model_handling.py
29+
sys.modules['%s.PLUGIN_export_cpp'%PLUGIN_NAME] = PLUGIN_export_cpp # allow 'import <PLUGIN_NAME>.PLUGIN_export_cpp' in model_handling.py
30+
del SPEC_EXPORTCPP
2631

2732
# AV - create a plugin-specific logger
2833
import logging
29-
logger = logging.getLogger('madgraph.PLUGIN.CUDACPP_OUTPUT.output')
30-
from madgraph import MG5DIR
34+
logger = logging.getLogger('madgraph.%s.model_handling'%PLUGIN_NAME)
35+
36+
#------------------------------------------------------------------------------------
37+
38+
3139
#------------------------------------------------------------------------------------
3240

3341
from os.path import join as pjoin

0 commit comments

Comments
 (0)