Skip to content

Commit fbcf4a4

Browse files
committed
[refactorMakefile] in codegen regenerate patch.common
./CODEGEN/generateAndCompare.sh gg_tt --mad --nopatch sed -i 's/DEFAULT_F2PY_COMPILER=f2py3.*/DEFAULT_F2PY_COMPILER=f2py3/' gg_tt.mad/Source/make_opts git diff --no-ext-diff -R gg_tt.mad/Source/make_opts gg_tt.mad/Source/makefile gg_tt.mad/Source/dsample.f gg_tt.mad/Source/genps.inc gg_tt.mad/SubProcesses/makefile > CODEGEN/PLUGIN/CUDACPP_SA_OUTPUT/MG5aMC_patches/PROD/patch.common git diff --no-ext-diff -R gg_tt.mad/bin/internal/banner.py gg_tt.mad/bin/internal/gen_ximprove.py gg_tt.mad/bin/internal/madevent_interface.py >> CODEGEN/PLUGIN/CUDACPP_SA_OUTPUT/MG5aMC_patches/PROD/patch.common git diff --no-ext-diff -R gg_tt.mad/SubProcesses/P1_gg_ttx/auto_dsig1.f gg_tt.mad/SubProcesses/P1_gg_ttx/driver.f gg_tt.mad/SubProcesses/P1_gg_ttx/matrix1.f > CODEGEN/PLUGIN/CUDACPP_SA_OUTPUT/MG5aMC_patches/PROD/patch.P1 git checkout gg_tt.mad
1 parent 02d816d commit fbcf4a4

1 file changed

Lines changed: 17 additions & 17 deletions

File tree

  • epochX/cudacpp/CODEGEN/PLUGIN/CUDACPP_SA_OUTPUT/MG5aMC_patches/PROD

epochX/cudacpp/CODEGEN/PLUGIN/CUDACPP_SA_OUTPUT/MG5aMC_patches/PROD/patch.common

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -471,7 +471,7 @@ index 617f10b93..407b1b753 100644
471471
if [ -d $(IREGIDIR) ]; then cd $(IREGIDIR); make clean; cd ..; fi
472472
- for i in `ls -d ../SubProcesses/P*`; do cd $$i; make clean; cd -; done;
473473
diff --git b/epochX/cudacpp/gg_tt.mad/SubProcesses/makefile a/epochX/cudacpp/gg_tt.mad/SubProcesses/makefile
474-
index 348c283be..4cadaecf0 100644
474+
index 348c283be..43f671770 100644
475475
--- b/epochX/cudacpp/gg_tt.mad/SubProcesses/makefile
476476
+++ a/epochX/cudacpp/gg_tt.mad/SubProcesses/makefile
477477
@@ -1,5 +1,30 @@
@@ -497,13 +497,13 @@ index 348c283be..4cadaecf0 100644
497497
+ $(info Or 'ALL' for all C++ and cuda targets)
498498
+
499499
+
500-
+# Enable ccache if USECCACHE=1
500+
+# Enable ccache for C++ if USECCACHE=1 (do not enable it for Fortran since it is not supported for Fortran)
501501
+ifeq ($(USECCACHE)$(shell echo $(CXX) | grep ccache),1)
502502
+ override CXX:=ccache $(CXX)
503503
+endif
504-
+ifeq ($(USECCACHE)$(shell echo $(FC) | grep ccache),1)
505-
+ override FC:=ccache $(FC)
506-
+endif
504+
+###ifeq ($(USECCACHE)$(shell echo $(FC) | grep ccache),1)
505+
+### override FC:=ccache $(FC)
506+
+###endif
507507

508508
# Load additional dependencies of the bias module, if present
509509
ifeq (,$(wildcard ../bias_dependencies))
@@ -614,33 +614,33 @@ index 348c283be..4cadaecf0 100644
614614
+madevent_cpp512y_link: AVX=512y
615615
+madevent_cpp512y_link: cppavx512y
616616
+ ln -sf $(CUDACPP_BUILDDIR)/$(PROG)_cpp $(PROG)
617-
+
617+
618+
-$(LIBDIR)libmodel.$(libext): ../../Cards/param_card.dat
619+
- cd ../../Source/MODEL; make
618620
+madevent_cpp512z_link: AVX=512z
619621
+madevent_cpp512z_link: cppavx512z
620622
+ ln -sf $(CUDACPP_BUILDDIR)/$(PROG)_cpp $(PROG)
621-
+
623+
624+
-$(LIBDIR)libgeneric.$(libext): ../../Cards/run_card.dat
625+
- cd ../../Source; make
622626
+madevent_cuda_link: AVX=cuda
623627
+madevent_cuda_link: cuda
624628
+ ln -sf $(CUDACPP_BUILDDIR)/$(PROG)_cuda $(PROG)
625-
+
629+
630+
-$(LIBDIR)libpdf.$(libext):
631+
- cd ../../Source/PDF; make
626632
+$(CUDACPP_BUILDDIR)/$(PROG)_cpp: $(LIBS) $(CUDACPP_CXXLIB) $(PROCESS) $(DSIG_cudacpp) auto_dsig.o $(MATRIX) counters.o ompnumthreads.o
627633
+ $(FC) -o $(CUDACPP_BUILDDIR)/$(PROG)_cpp -L$(LIBDIR)/$(CUDACPP_BUILDDIR) -l$(CUDACPP_COMMONLIB) $(PROCESS) $(DSIG_cudacpp) auto_dsig.o $(MATRIX) $(LINKLIBS) $(BIASDEPENDENCIES) $(OMPFLAGS) counters.o ompnumthreads.o -L$(CUDACPP_BUILDDIR) -l$(MG5AMC_CXXLIB) $(LIBFLAGSRPATH) $(MG_LDFLAGS) $(LDFLAGS)
628634
+
629635
+$(CUDACPP_BUILDDIR)/$(PROG)_cuda: $(LIBS) $(CUDACPP_CULIB) $(PROCESS) $(DSIG_cudacpp) auto_dsig.o $(MATRIX) counters.o ompnumthreads.o
630636
+ $(FC) -o $(CUDACPP_BUILDDIR)/$(PROG)_cuda -L$(LIBDIR)/$(CUDACPP_BUILDDIR) -l$(CUDACPP_COMMONLIB) $(PROCESS) $(DSIG_cudacpp) auto_dsig.o $(MATRIX) $(LINKLIBS) $(BIASDEPENDENCIES) $(OMPFLAGS) counters.o ompnumthreads.o -L$(CUDACPP_BUILDDIR) -l$(MG5AMC_CULIB) $(LIBFLAGSRPATH) $(MG_LDFLAGS) $(LDFLAGS)
631-
632-
-$(LIBDIR)libmodel.$(libext): ../../Cards/param_card.dat
633-
- cd ../../Source/MODEL; make
637+
+
634638
+counters.o: counters.cc timer.h
635639
+ $(CXX) $(MG_CXXFLAGS) $(CXXFLAGS) -c $< -o $@
636-
637-
-$(LIBDIR)libgeneric.$(libext): ../../Cards/run_card.dat
638-
- cd ../../Source; make
640+
+
639641
+ompnumthreads.o: ompnumthreads.cc ompnumthreads.h
640642
+ $(CXX) $(MG_CXXFLAGS) $(CXXFLAGS) $(OMPFLAGS) -c $< -o $@
641-
642-
-$(LIBDIR)libpdf.$(libext):
643-
- cd ../../Source/PDF; make
643+
+
644644
+$(PROG)_forhel: $(PROCESS) auto_dsig.o $(LIBS) $(MATRIX_HEL)
645645
+ $(FC) -o $(PROG)_forhel $(PROCESS) $(MATRIX_HEL) $(LINKLIBS) $(LDFLAGS) $(BIASDEPENDENCIES) $(OMPFLAGS)
646646
+

0 commit comments

Comments
 (0)