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

first systematic 'launch'-like tests (and move to the latest select_color upstream) #709

Merged
merged 42 commits into from
Jun 19, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
04dd58b
[nobm] improve lauX.sh script, add support for a generic process #683
valassi Jun 13, 2023
a064ea0
[launch] in lauX.sh, add 'make cleanall' (#683)
valassi Jun 15, 2023
9f209db
[launch] in lauX.sh, keep results in LAUX_<BCKEND> #683
valassi Jun 15, 2023
29d9e59
[launch] in lauX.sh, add start and end date to outputs
valassi Jun 15, 2023
3ace55b
[launch] add logs for the first systematic test of laux.sh on gg_tt*
valassi Jun 16, 2023
14148e8
[launch] in tlau logs, remove all results.pkl
valassi Jun 16, 2023
80c9f49
[lunch] in tlau, add results.pkl to .gitignore
valassi Jun 16, 2023
7668e16
[launch] in tlau logs, remove all lhe.gz and add all .lhe files
valassi Jun 16, 2023
c186da4
[launch] improve the lauX.sh script #683
valassi Jun 16, 2023
258c4e3
[launch] rerun tlau gg_tt CUDA test
valassi Jun 16, 2023
8727e9c
[launch] add tlau/allTees.sh script #683
valassi Jun 16, 2023
bd618c0
[launch] update CODEGEN to use Olivier's latest upstream - and add ba…
valassi Jun 16, 2023
0a2a631
[launch] in codegen, manually fix patch.common to reflect the change …
valassi Jun 16, 2023
95f2ab8
[launch] regenerate 7 processes mad
valassi Jun 16, 2023
98444ad
[launch] regenerate 7 processes sa - no change, as expected
valassi Jun 16, 2023
6930cc0
[launch] in lauX.sh, set a lower number of events in ggttgg and ggttggg
valassi Jun 16, 2023
fb1033d
[launch] rerun ggttgg tlau - no longer crashes #710, however it still…
valassi Jun 16, 2023
be4a4f4
[launch] improve lauX.sh to ensure restoring initial values
valassi Jun 16, 2023
7021bc6
[launch] in lauX.sh go back to 10000 unweighted events...
valassi Jun 16, 2023
6cd117a
[launch] fix tlau/alltees
valassi Jun 16, 2023
68e95bc
[launch] rerun 78 tput alltees, all ok
valassi Jun 18, 2023
d104122
[launch] rerun 15 tmad - ggttgg tests fail again #655 as expected
valassi Jun 18, 2023
47c8247
[launch] rerun tlau alltees - now all tests succeed after fixing #710…
valassi Jun 18, 2023
1bb49f7
[launch] go back to tuning the number of unweighted event generation …
valassi Jun 18, 2023
fd67f47
[launch] tune lauX.sh script #683 and #711 - shorter survey and refin…
valassi Jun 17, 2023
c1762ac
[launch] in lauX.sh, further reduce ggttggg to 100 unweighted events
valassi Jun 17, 2023
6e78896
[launch] rerun tlau alltees with fewer events on itscrd90 (in paralle…
valassi Jun 18, 2023
fb81cff
[launch] in lauX.sh add a separator and debug printouts for easier un…
valassi Jun 18, 2023
d5508ec
[launch] in lauX.sh further decrease unweighted events to 10 in ggttg…
valassi Jun 18, 2023
2eb26e6
[launch] temporary tests on gg_ttgg.mad/bin/internal/gen_ximprove.py …
valassi Jun 18, 2023
e025186
[launch] Revert previous temporary tests on gg_ttgg.mad/bin/internal/…
valassi Jun 18, 2023
fca43d1
[launch] in ggttgg.mad, comment out all to_refine.append(C)
valassi Jun 18, 2023
263e0da
[launch] Revert the previous change
valassi Jun 18, 2023
5ce3278
[launch] in ggttgg.mad, select only channels with two-character Gn na…
valassi Jun 18, 2023
55f235d
[launch] Revert the previous change
valassi Jun 18, 2023
cea5122
[launch] in ggttgg.mad, select only 3 channels at most in read_results
valassi Jun 18, 2023
5fa6d1c
[launch] Revert the previous change
valassi Jun 18, 2023
151df29
[launch] rerun (INTERRUPTED in the last ggttggg CPP) tlau alltees on …
valassi Jun 19, 2023
9ac6c9d
[launch] go back to the previous results on itscrd90 for tlau (10000,…
valassi Jun 19, 2023
b1715fa
[launch] in tlau/lauX.sh, use 10000, 10000, 1000, 100 events for now …
valassi Jun 19, 2023
fc55e94
[launch] in generateAndCompare.sh, ensure that <proc> is not an absol…
valassi Jun 19, 2023
d89aea8
[launch] ** COMPLETE LAUNCH ** Add a basic README_CODEGEN.txt for users
valassi Jun 19, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion epochX/cudacpp/CODEGEN/MG5aMC_patches/PROD/commit.GIT
Original file line number Diff line number Diff line change
@@ -1 +1 @@
ecf424f8f
ebcb307fa
2 changes: 1 addition & 1 deletion epochX/cudacpp/CODEGEN/MG5aMC_patches/PROD/patch.P1
Original file line number Diff line number Diff line change
Expand Up @@ -338,7 +338,7 @@ index beef47998..905badeff 100644
ENDIF
ANS=ANS/DBLE(IDEN)
-
CALL SELECT_COLOR(RCOL, JAMP2, CHANNEL,1, ICOL)
CALL SELECT_COLOR(RCOL, JAMP2, ICONFIG,1, ICOL)
-
+ call counters_smatrix1_stop()
END
Expand Down
3 changes: 3 additions & 0 deletions epochX/cudacpp/CODEGEN/generateAndCompare.sh
Original file line number Diff line number Diff line change
Expand Up @@ -296,6 +296,7 @@ function usage()
# NB: all options with $SCRBCK=cudacpp use the 311 branch by default and always disable helicity recycling
echo "Usage: $0 [--nobrief] [--cpp|--gpu|--madnovec|--madonly|--mad|--madcpp*|--madgpu] [--nopatch|--upstream] [-c '<cmd>'] <proc>"
echo " (*Note: the --madcpp option exists but code generation fails for it)"
echo " (**Note: <proc> will be used as a relative path in ${OUTDIR} and should not contain '/' characters"
echo "Example: $0 gg_tt --mad"
echo "Example: $0 gg_bb --mad -c 'generate g g > b b~'"
fi
Expand Down Expand Up @@ -387,6 +388,8 @@ while [ "$1" != "" ]; do
fi
shift
done
if [ "$proc" == "" ]; then usage; fi
if [ "${proc/\/}" != "${proc}" ]; then echo "ERROR! <proc> '${proc}' should not contain '/' characters"; usage; fi

echo "SCRDIR=${SCRDIR}"
echo "OUTDIR=${OUTDIR}"
Expand Down
61 changes: 61 additions & 0 deletions epochX/cudacpp/README_CODEGEN.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
# Copyright (C) 2020-2023 CERN and UCLouvain.
# Licensed under the GNU Lesser General Public License (version 3 or later).
# Created by: A. Valassi (Jun 2023) for the MG5aMC CUDACPP plugin.
# Further modified by: A. Valassi (2023) for the MG5aMC CUDACPP plugin.

[Last updated Mon 19 June 2023]

This README contains **TEMPORARY** instructions for end users for generating CUDACPP code for MG5AMC.
It relies on using both the madgraph4gpu and mg5amcnlo github repositories.
Eventually, CUDACPP code generation will be fully integrated into the mg5amcnlo github repository.
NB: gridpack generation is not documented/supported yet.

0. Set up your favorite compilers

Example:
echo $CXX
/cvmfs/sft.cern.ch/lcg/releases/gcc/11.2.0-ad950/x86_64-centos8/bin/g++
echo $FC
/cvmfs/sft.cern.ch/lcg/releases/gcc/11.2.0-ad950/x86_64-centos8/bin/gfortran
which nvcc
/usr/local/cuda-12.0/bin/nvcc

1. Download mg5amcnlo

cd <userdir>
git clone -b gpucpp --single-branch git@github.com:mg5amcnlo/mg5amcnlo

export MG5AMC_HOME=$(pwd)/mg5amcnlo

2. Download madgraph4gpu

cd <userdir>
git clone -b master --single-branch git@github.com:madgraph5/madgraph4gpu.git

cd madgraph4gpu/epochX/cudacpp/

3. Generate your favorite process

./CODEGEN/generateAndCompare.sh --mad USER_gg_tt -c 'generate g g > t t~'

cd USER_gg_tt.mad

4a. Launch your process for FORTRAN

sed -i "s/.* = cudacpp_backend/FORTRAN = cudacpp_backend/" Cards/run_card.dat
echo "r=21" > SubProcesses/randinit
./bin/generate_events -f

4b. Launch your process for CPP (with AVX2)

sed -i "s/.* = cudacpp_backend/CPP = cudacpp_backend/" Cards/run_card.dat
echo "r=21" > SubProcesses/randinit
AVX=avx2 MG5AMC_CARD_PATH=$(pwd)/Cards ./bin/generate_events -f

4c. Launch your process for CUDA

sed -i "s/.* = cudacpp_backend/CUDA = cudacpp_backend/" Cards/run_card.dat
echo "r=21" > SubProcesses/randinit
MG5AMC_CARD_PATH=$(pwd)/Cards ./bin/generate_events -f


16 changes: 8 additions & 8 deletions epochX/cudacpp/ee_mumu.mad/CODEGEN_mad_ee_mumu_log.txt
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ generate e+ e- > mu+ mu-
No model currently active, so we import the Standard Model
INFO: load particles
INFO: load vertices
DEBUG: model prefixing takes 0.0046384334564208984 
DEBUG: model prefixing takes 0.0048596858978271484 
INFO: Restrict model sm with file models/sm/restrict_default.dat .
DEBUG: Simplifying conditional expressions 
DEBUG: remove interactions: u s w+ at order: QED=1 
Expand Down Expand Up @@ -176,7 +176,7 @@ INFO: Creating files in directory P1_epem_mupmum
DEBUG: Entering PLUGIN_OneProcessExporter.__init__ [model_handling.py at line 1028] 
DEBUG: kwargs[prefix] = 0 [model_handling.py at line 1029] 
DEBUG: proc_id =  1 [model_handling.py at line 1034] 
DEBUG: process_exporter_cpp =  <PLUGIN.CUDACPP_SA_OUTPUT.model_handling.PLUGIN_OneProcessExporter object at 0x7f8f78624ac0> [export_v4.py at line 6174] 
DEBUG: process_exporter_cpp =  <PLUGIN.CUDACPP_SA_OUTPUT.model_handling.PLUGIN_OneProcessExporter object at 0x7f4c3bdebca0> [export_v4.py at line 6174] 
INFO: Creating files in directory .
DEBUG: Entering PLUGIN_OneProcessExporter.generate_process_files [model_handling.py at line 1286] 
DEBUG: self.include_multi_channel is already defined: this is madevent+second_exporter mode [model_handling.py at line 1288] 
Expand Down Expand Up @@ -210,19 +210,19 @@ INFO: Created files CPPProcess.h and CPPProcess.cc in directory ./.
INFO: Generating Feynman diagrams for Process: e+ e- > mu+ mu- WEIGHTED<=4 @1
INFO: Finding symmetric diagrams for subprocess group epem_mupmum
Generated helas calls for 1 subprocesses (2 diagrams) in 0.004 s
Wrote files for 8 helas calls in 0.093 s
Wrote files for 8 helas calls in 0.094 s
ALOHA: aloha starts to compute helicity amplitudes
ALOHA: aloha creates FFV1 routines
ALOHA: aloha creates FFV2 routines
ALOHA: aloha creates FFV4 routines
ALOHA: aloha creates 3 routines in 0.171 s
ALOHA: aloha creates 3 routines in 0.173 s
DEBUG: Entering PLUGIN_ProcessExporter.convert_model (create the model) [output.py at line 194] 
ALOHA: aloha starts to compute helicity amplitudes
ALOHA: aloha creates FFV1 routines
ALOHA: aloha creates FFV2 routines
ALOHA: aloha creates FFV4 routines
ALOHA: aloha creates FFV2_4 routines
ALOHA: aloha creates 7 routines in 0.216 s
ALOHA: aloha creates 7 routines in 0.223 s
<class 'aloha.create_aloha.AbstractRoutine'> FFV1
<class 'aloha.create_aloha.AbstractRoutine'> FFV1
<class 'aloha.create_aloha.AbstractRoutine'> FFV2
Expand Down Expand Up @@ -260,6 +260,6 @@ Type "launch" to generate events from this process, or see
Run "open index.html" to see more information about this process.
quit

real 0m1.767s
user 0m1.513s
sys 0m0.232s
real 0m1.864s
user 0m1.552s
sys 0m0.214s
2 changes: 1 addition & 1 deletion epochX/cudacpp/ee_mumu.mad/Source/MODEL/couplings.f
Original file line number Diff line number Diff line change
Expand Up @@ -47,13 +47,13 @@ SUBROUTINE UPDATE_AS_PARAM(VECID)

INCLUDE '../maxparticles.inc'
INCLUDE '../cuts.inc'
INCLUDE '../vector.inc'
INCLUDE '../run.inc'

DOUBLE PRECISION ALPHAS
EXTERNAL ALPHAS

INCLUDE 'input.inc'
INCLUDE '../vector.inc'
INCLUDE 'coupl.inc'
READLHA = .FALSE.

Expand Down
3 changes: 2 additions & 1 deletion epochX/cudacpp/ee_mumu.mad/Source/dsample.f
Original file line number Diff line number Diff line change
Expand Up @@ -666,8 +666,9 @@ subroutine sample_init(p1, p2, p3, p4, p5, VECSIZE_USED)
c
include 'genps.inc'
include 'maxconfigs.inc'
include 'vector.inc' ! defines VECSIZE_MEMMAX
include 'run.inc'
include 'vector.inc' ! defines VECSIZE_MEMMAX

c
c Arguments
c
Expand Down
5 changes: 5 additions & 0 deletions epochX/cudacpp/ee_mumu.mad/Source/kin_functions.f
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,7 @@ DOUBLE PRECISION FUNCTION rap(p)
c Global
c
include 'maxparticles.inc'
include 'vector.inc'
include 'run.inc'

double precision cm_rap
Expand Down Expand Up @@ -150,6 +151,7 @@ DOUBLE PRECISION FUNCTION rap2(p)
c Global
c
include 'maxparticles.inc'
include 'vector.inc'
include 'run.inc'
c-----
c Begin Code
Expand Down Expand Up @@ -247,6 +249,7 @@ double precision function DJ(p1,p2)
c

include 'maxparticles.inc'
include 'vector.inc'
include 'run.inc'
include 'cuts.inc'

Expand Down Expand Up @@ -356,6 +359,7 @@ double precision function DJ1(p1,p2)
c

include 'maxparticles.inc'
include 'vector.inc'
include 'run.inc'

double precision pt1,pt2,ptm1,eta1,eta2,phi1,phi2,p1a,p2a,costh
Expand Down Expand Up @@ -409,6 +413,7 @@ double precision function DJB(p1)
c
double precision pm1
include 'maxparticles.inc'
include 'vector.inc'
include 'run.inc'

c-----
Expand Down
1 change: 1 addition & 0 deletions epochX/cudacpp/ee_mumu.mad/Source/pawgraphs.f
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ subroutine graph_point(p,dwgt)
c Global
c
include 'maxparticles.inc'
include 'vector.inc'
include 'run.inc'

c
Expand Down
1 change: 1 addition & 0 deletions epochX/cudacpp/ee_mumu.mad/Source/readgrid.f
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ subroutine readgrid(lun)
include 'sudgrid.inc'
include 'PDF/pdf.inc'
include 'maxparticles.inc'
include 'vector.inc'
include 'run.inc'

c...arguments
Expand Down
12 changes: 6 additions & 6 deletions epochX/cudacpp/ee_mumu.mad/Source/run.inc
Original file line number Diff line number Diff line change
Expand Up @@ -49,12 +49,12 @@ c Parameters for systematics variations info
c
logical use_syst
c Common block for systematics variations
DOUBLE PRECISION s_scale
INTEGER n_qcd,n_alpsem
DOUBLE PRECISION s_qalps(max_particles-2)
INTEGER n_pdfrw(2),i_pdgpdf(max_particles-2,2)
DOUBLE PRECISION s_xpdf(max_particles-2,2),s_qpdf(max_particles-2,2)
DOUBLE PRECISION s_rwfact
DOUBLE PRECISION s_scale(VECSIZE_MEMMAX)
INTEGER n_qcd(VECSIZE_MEMMAX),n_alpsem(VECSIZE_MEMMAX)
DOUBLE PRECISION s_qalps(max_particles-2,VECSIZE_MEMMAX)
INTEGER n_pdfrw(2,VECSIZE_MEMMAX),i_pdgpdf(max_particles-2,2,VECSIZE_MEMMAX)
DOUBLE PRECISION s_xpdf(max_particles-2,2,VECSIZE_MEMMAX),s_qpdf(max_particles-2,2,VECSIZE_MEMMAX)
DOUBLE PRECISION s_rwfact(VECSIZE_MEMMAX)
COMMON/TO_SYST/use_syst,n_qcd,n_alpsem,n_pdfrw,i_pdgpdf,
$ s_scale,s_qalps,s_xpdf,s_qpdf,s_rwfact
c
Expand Down
1 change: 1 addition & 0 deletions epochX/cudacpp/ee_mumu.mad/Source/run_printout.f
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ subroutine run_printout
c
include 'PDF/pdf.inc'
include 'maxparticles.inc'
include 'vector.inc'
include 'run.inc'
include 'alfas.inc'
c
Expand Down
1 change: 1 addition & 0 deletions epochX/cudacpp/ee_mumu.mad/Source/rw_events.f
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ subroutine read_event(lun,P,wgt,nexternal,ic,ievent,sscale,
implicit none
include 'maxparticles.inc'
include 'run_config.inc'
include 'vector.inc'
include 'run.inc'
double precision pi
parameter (pi = 3.1415926d0)
Expand Down
2 changes: 1 addition & 1 deletion epochX/cudacpp/ee_mumu.mad/Source/setrun.f
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ subroutine setrun
include 'genps.inc'
include 'run_config.inc'
include 'PDF/pdf.inc'
include 'vector.inc' ! defines VECSIZE_MEMMAX
include 'run.inc'
include 'alfas.inc'
include 'vector.inc' ! defines VECSIZE_MEMMAX
include 'MODEL/coupl.inc' ! needs VECSIZE_MEMMAX (defined in vector.inc)

double precision D
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ SUBROUTINE PREPARE_GROUPING_CHOICE(PP, WGT, INIT)
INTEGER LMAPPED

DOUBLE PRECISION DSIGPROC
INCLUDE 'vector.inc'
INCLUDE 'run.inc'
C To limit the number of calls to switchmom, use in DSIGPROC the
C cached variable last_iconfig. It is in this subroutine as well
Expand Down Expand Up @@ -173,6 +174,7 @@ SUBROUTINE SELECT_GROUPING(IMIRROR, IPROC, ICONF, WGT,
INTEGER GROUPED_MC_GRID_STATUS
REAL*8 MC_GROUPED_PROC_JACOBIAN
INTEGER LMAPPED
INCLUDE 'vector.inc'
INCLUDE 'run.inc'
C Perform the selection
CALL RANMAR(R)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,8 @@ Program DRIVER
c
character*30 param_card_name
common/to_param_card_name/param_card_name
cc
c c
include 'vector.inc'
include 'run.inc'

integer mincfig, maxcfig
Expand All @@ -71,7 +72,6 @@ Program DRIVER
c integer ncols,ncolflow(maxamps),ncolalt(maxamps),ic
c common/to_colstats/ncols,ncolflow,ncolalt,ic

include 'vector.inc' ! defines VECSIZE_MEMMAX
include 'coupl.inc' ! needs VECSIZE_MEMMAX (defined in vector.inc)
INTEGER VECSIZE_USED

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -312,7 +312,7 @@ SUBROUTINE SMATRIX1(P, RHEL, RCOL, CHANNEL, IVEC, ANS, IHEL,
ENDIF
ENDIF
ANS=ANS/DBLE(IDEN)
CALL SELECT_COLOR(RCOL, JAMP2, CHANNEL,1, ICOL)
CALL SELECT_COLOR(RCOL, JAMP2, ICONFIG,1, ICOL)
call counters_smatrix1_stop()
END
Expand Down
3 changes: 1 addition & 2 deletions epochX/cudacpp/ee_mumu.mad/SubProcesses/cluster.f
Original file line number Diff line number Diff line change
Expand Up @@ -522,12 +522,11 @@ logical function cluster(p, ivec)
c**************************************************************************
implicit none
include 'genps.inc'
include 'run.inc'
include 'nexternal.inc'
include 'maxamps.inc'
include 'cluster.inc'
include 'message.inc'

include 'run.inc'
integer ivec
real*8 p(0:3,nexternal), pcmsp(0:3), p1(0:3)
real*8 pi(0:3), nr(0:3), pz(0:3)
Expand Down
3 changes: 2 additions & 1 deletion epochX/cudacpp/ee_mumu.mad/SubProcesses/cuts.f
Original file line number Diff line number Diff line change
Expand Up @@ -69,9 +69,10 @@ LOGICAL FUNCTION PASSCUTS(P, VECSIZE_USED)
C
C GLOBAL
C
include '../../Source/vector.inc' ! defines VECSIZE_MEMMAX
include 'run.inc'
include 'cuts.inc'
include '../../Source/vector.inc' ! defines VECSIZE_MEMMAX


double precision ptjet(nexternal)
double precision ptheavyjet(nexternal)
Expand Down
3 changes: 3 additions & 0 deletions epochX/cudacpp/ee_mumu.mad/SubProcesses/dummy_fct.f
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ logical FUNCTION dummy_cuts(P)
subroutine get_dummy_x1(sjac, X1, R, pbeam1, pbeam2, stot, shat)
implicit none
include 'maxparticles.inc'
include 'vector.inc'
include 'run.inc'
c include 'genps.inc'
double precision sjac ! jacobian. should be updated not reinit
Expand All @@ -66,6 +67,7 @@ subroutine get_dummy_x1(sjac, X1, R, pbeam1, pbeam2, stot, shat)
subroutine get_dummy_x1_x2(sjac, X, R, pbeam1, pbeam2, stot,shat)
implicit none
include 'maxparticles.inc'
include 'vector.inc'
include 'run.inc'
c include 'genps.inc'
double precision sjac ! jacobian. should be updated not reinit
Expand Down Expand Up @@ -104,6 +106,7 @@ double precision function user_dynamical_scale(P)
double precision P(0:3, nexternal)
c Commmon to have access to all variable defined in the run_card
include 'genps.inc'
include 'vector.inc'
include 'run.inc'
write(0,*) "dynamical scale set to 0"
write(0,*) "need to be defined via user_hook method"
Expand Down
5 changes: 4 additions & 1 deletion epochX/cudacpp/ee_mumu.mad/SubProcesses/genps.f
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,8 @@ subroutine gen_mom(iconfig,mincfig,maxcfig,invar,wgt,x,p1)
integer mothup(2,nexternal)
integer icolup(2,nexternal,maxflow,maxsproc)
include 'leshouche.inc'


include 'vector.inc'
include 'run.inc'


Expand Down Expand Up @@ -605,6 +606,7 @@ subroutine configure_integral(iconfig,mincfig,maxcfig,invar,maxwgt)
include 'maxconfigs.inc'
include 'nexternal.inc'
include 'maxamps.inc'
include 'vector.inc'
include 'run.inc'
c local
Expand Down Expand Up @@ -749,6 +751,7 @@ subroutine one_tree(itree,tstrategy,iconfig,nbranch,P,M,S,X,jac,pswgt)
double precision stot,m1,m2
common/to_stot/stot,m1,m2
include 'vector.inc'
include 'run.inc'
c-----
Expand Down
Loading