Code

Test refactoring of Makefiles#753

Code

Open

hageboeck wants to merge 111 commits intomadgraph5:mastermadgraph5/madgraph4gpu:masterfrom hageboeck:refactorMakefilehageboeck/madgraph4gpu:refactorMakefileCopy head branch name to clipboard

+36,407-28,011

Commits

Commits on Sep 27, 2023

• Moved compilation of CUDA to seperate cuda target

  Jooorgen

  committed
  792080e

  Copy full SHA for 792080e

• Fixed indentation in the makefile

  Jooorgen

  committed
  c945deb

  Copy full SHA for c945deb

• Removed all unneccessary NVCC ifneq and redid indentation

  Jooorgen

  committed
  36a5fa7

  Copy full SHA for 36a5fa7

• Convert all spaces to tabs in cudacpp.mk file

  Jooorgen

  committed
  0b95fb7

  Copy full SHA for 0b95fb7

• Revert "Convert all spaces to tabs in cudacpp.mk file"

  Show description for 360d908
  Jooorgen

  committed
  360d908

  Copy full SHA for 360d908

• Changed line to be interpreted in bash into spaces

  Jooorgen

  committed
  575840c

  Copy full SHA for 575840c

• Changed indentation again

  Jooorgen

  committed
  19911fb

  Copy full SHA for 19911fb

• Fixed indentation in start of CUDA compilation

  Jooorgen

  committed
  f4366a9

  Copy full SHA for f4366a9

• Fixed indentation in fcheck compilation

  Jooorgen

  committed
  b819498

  Copy full SHA for b819498

• Changed indentation of ifndef in CUDA compilation

  Jooorgen

  committed
  9082da0

  Copy full SHA for 9082da0

• Changed indentation back to tabs again for some lines

  Jooorgen

  committed
  bfd4301

  Copy full SHA for bfd4301

• Changed indentation again to fix endif error

  Jooorgen

  committed
  529318c

  Copy full SHA for 529318c

• Revert back cudacpp.mk to original state

  Jooorgen

  committed
  fc549ca

  Copy full SHA for fc549ca

• Added cuda target

  Jooorgen

  committed
  bd0df54

  Copy full SHA for bd0df54

• Added usage target if user doesent speficy target when invoking makefile and added cpp targets

  Jooorgen

  committed
  df98ffa

  Copy full SHA for df98ffa

• Added .DEFAULT_GOAL so usage target will be run correctly

  Jooorgen

  committed
  f822e93

  Copy full SHA for f822e93

• Added targets to cpp build

  Jooorgen

  committed
  63bb3b5

  Copy full SHA for 63bb3b5

• Added correct cpp targets

  Jooorgen

  committed
  b5758b0

  Copy full SHA for b5758b0

• Added $(MAKECMDGOALS) ifeq to CUDA compiler configuration

  Jooorgen

  committed
  eb3a706

  Copy full SHA for eb3a706

• Removed automatic configuration of AVX level

  Jooorgen

  committed
  b23ada0

  Copy full SHA for b23ada0

• Fixed correct AVX level depending on C++ compiler

  Jooorgen

  committed
  683e641

  Copy full SHA for 683e641

• Reworked configuration of setting AVX level

  Jooorgen

  committed
  fca0b73

  Copy full SHA for fca0b73

• Fixed missing endif and removed AVX configuration in cuda compilation

  Jooorgen

  committed
  489c453

  Copy full SHA for 489c453

• Fixed AVX not being properly set

  Jooorgen

  committed
  01b7da3

  Copy full SHA for 01b7da3

• Fixed cuda compilation in cudacpp_src.mk and fixed trailing whitespace in AVX assignment

  Jooorgen

  committed
  e734f49

  Copy full SHA for e734f49

• Added else case in AVX configuration

  Jooorgen

  committed
  35d6aee

  Copy full SHA for 35d6aee

• Port changes to BUILDDIRTAG to cudacpp_src.mk

  Jooorgen

  committed
  b611e9e

  Copy full SHA for b611e9e

• Added build specific clean targets in cudacpp.mk and cudacpp_src.mk

  Jooorgen

  committed
  fbdb45a

  Copy full SHA for fbdb45a

• Fixed cleanall with new clean targets

  Jooorgen

  committed
  b86bf3c

  Copy full SHA for b86bf3c

• Fixed indentations in the recipie of the targets

  Jooorgen

  committed
  8b22e9a

  Copy full SHA for 8b22e9a

• Redid the detection of multiple BUILDDIRS when user runs clean

  Jooorgen

  committed
  f81f91f

  Copy full SHA for f81f91f

• Fixed indentation mistake

  Jooorgen

  committed
  ea4c807

  Copy full SHA for ea4c807

• Fixed intendation again in cudacpp_src.mk cleanall

  Jooorgen

  committed
  b39d75b

  Copy full SHA for b39d75b

• First iteration of changes to makefile.mk

  Jooorgen

  committed
  578e5b4

  Copy full SHA for 578e5b4

• Added more clean targets

  Jooorgen

  committed
  f755f8a

  Copy full SHA for f755f8a

• Removed warning using MAKECMDGOAL

  Jooorgen

  committed
  38beccc

  Copy full SHA for 38beccc

• Removed recursiveness in target

  Jooorgen

  committed
  e7e85e9

  Copy full SHA for e7e85e9

• Fixed cleanall bug

  Jooorgen

  committed
  97c38e2

  Copy full SHA for 97c38e2

• Fixed error with clean not detecting the build directories

  Jooorgen

  committed
  f2eb850

  Copy full SHA for f2eb850

• Fixed indentation in clean target

  Jooorgen

  committed
  b41069f

  Copy full SHA for b41069f

• Fixed edgecase where target is madevent_* and the actual target variable does not get set correctly

  Jooorgen

  committed
  f2c9c45

  Copy full SHA for f2c9c45

• Fixed cudacpp_src.mk indentation in target

  Jooorgen

  committed
  db55dcc

  Copy full SHA for db55dcc

• Fixed typo in makefile

  Jooorgen

  committed
  df70200

  Copy full SHA for df70200

• make clean and make cleanavx/cuda now correctly cleans

  Jooorgen

  committed
  c890fc0

  Copy full SHA for c890fc0

• Fixed cleandir in cudacpp.mk calling cleannone in cudacpp_src.mk

  Jooorgen

  committed
  dc77630

  Copy full SHA for dc77630

• Added removing the lockfile in make clean

  Jooorgen

  committed
  b680cae

  Copy full SHA for b680cae

• Fixed syntax in make clean logic, now corectly cleans lockfile

  Jooorgen

  committed
  8583d62

  Copy full SHA for 8583d62

• Added ifeq if no directories are found in make clean

  Jooorgen

  committed
  3826d16

  Copy full SHA for 3826d16

• Fixed extraction of avx level in make clean

  Jooorgen

  committed
  ccc49ed

  Copy full SHA for ccc49ed

• Fixed lib directory not getting properly cleaned

  Jooorgen

  committed
  c9af7a8

  Copy full SHA for c9af7a8

• Reworked targets to allow for compilation using ALL target

  Jooorgen

  committed
  dbbb795

  Copy full SHA for dbbb795

• Absorbed the initial target calling cudacpp.mk into each seperate avx/cuda target

  Jooorgen

  committed
  bfc7739

  Copy full SHA for bfc7739

• Fixed madevent_avx/cuda_link targets

  Jooorgen

  committed
  4d4866b

  Copy full SHA for 4d4866b

• ALL target now calls the makefile itself for compiling avx/cuda targets

  Jooorgen

  committed
  3fa5b76

  Copy full SHA for 3fa5b76

• Last revision of targets

  Jooorgen

  committed
  83bacca

  Copy full SHA for 83bacca

• Did some refactoring of the makefile to remove recurring lines

  Jooorgen

  committed
  f1a2704

  Copy full SHA for f1a2704

• Code cleanup

  Jooorgen

  committed
  6cc72f7

  Copy full SHA for 6cc72f7

• Reverted change to Source makefile, no patch needed now

  Jooorgen

  committed
  cd39261

  Copy full SHA for cd39261

• Fixed lockfiles not getting cleaned properly

  Jooorgen

  committed
  7d15b06

  Copy full SHA for 7d15b06

• Fixed indentation

  Jooorgen

  committed
  752d336

  Copy full SHA for 752d336

• Fixed indentation in cudacpp_src.mk

  Jooorgen

  committed
  c121b0d

  Copy full SHA for c121b0d

• gCheck and check are now to seperate targets for use in CI

  Jooorgen

  committed
  7511431

  Copy full SHA for 7511431

• NVCC now gets properly configured when doing various tests

  Jooorgen

  committed
  328c921

  Copy full SHA for 328c921

• Removed the creation of lockfiles

  Jooorgen

  committed
  df04597

  Copy full SHA for df04597

• Added cpp target for testing

  Jooorgen

  committed
  51828ef

  Copy full SHA for 51828ef

• [CODEGEN] Ported changes in gg_tt.mad to codegen

  Jooorgen

  committed
  aace762

  Copy full SHA for aace762

Commits on Sep 28, 2023

• [CODEGEN] Added patch to makefile to patch.common in codegen

  Jooorgen

  committed
  66d0191

  Copy full SHA for 66d0191

• Readded cleaning of build directories in cleanall

  Jooorgen

  committed
  892f21c

  Copy full SHA for 892f21c

• [CODEGEN] Fixed indentation in cudacpp.mk in codegen

  Jooorgen

  committed
  b0f52b5

  Copy full SHA for b0f52b5

• Fixed indentation in cudacpp.mk in gg_tt.mad

  Jooorgen

  committed
  fd3f74d

  Copy full SHA for fd3f74d

• [CODEGEN] Removed prior patch to makefile in patch.common

  Jooorgen

  committed
  f48ab5a

  Copy full SHA for f48ab5a

• Revert "[CODEGEN] Removed prior patch to makefile in patch.common"

  Show description for 92bd1e7
  Jooorgen

  committed
  92bd1e7

  Copy full SHA for 92bd1e7

• [CODEGEN] Fixed patch not applying because string does not exist in file that it is trying to patch

  Jooorgen

  committed
  dd01050

  Copy full SHA for dd01050

• [CODEGEN] Fixed mismatch in patch.common

  Jooorgen

  committed
  e75ca38

  Copy full SHA for e75ca38

• Sets correct cppavx dependency for compiling madevent_cpp

  Jooorgen

  committed
  191e112

  Copy full SHA for 191e112

• Fixed unneccessary & in CUDACPP_BUILDDIR assignment

  Jooorgen

  committed
  67dd776

  Copy full SHA for 67dd776

• [CODEGEN] Add the dependency on cppavx target when compiling madevent_cpp in codegen patch

  Jooorgen

  committed
  9e974c0

  Copy full SHA for 9e974c0

• [CODEGEN] Now sets correct target for linking with cppavx target in runcard

  Jooorgen

  committed
  564682a

  Copy full SHA for 564682a

• [CODEGEN] Fixed patch.commen to have correct intervals in git diff

  Jooorgen

  committed
  6382b5a

  Copy full SHA for 6382b5a

• [CODEGEN] Correctly assigns CPPTARGET in compiling madevent_cpp

  Jooorgen

  committed
  6092d6a

  Copy full SHA for 6092d6a

• [CODEGEN] Correctly sets dependencies for madevent_cpp

  Jooorgen

  committed
  bedb79c

  Copy full SHA for bedb79c

• [CODEGEN] Correctly sets target if madevent is in $MAKECMDGOALS

  Jooorgen

  committed
  cf1b21b

  Copy full SHA for cf1b21b

Commits on Sep 29, 2023

• [CODEGEN] Regenerated all .sa/.mad processes

  Jooorgen

  committed
  75c5be6

  Copy full SHA for 75c5be6

Commits on Oct 19, 2023

• Add reference file for uux->ttgg tests.

  hageboeck

  committed
  8368afc

  Copy full SHA for 8368afc

Commits on Nov 21, 2023

• Remove epoch1/2 from CI, add epochX/pptt012j instead.

  hageboeck

  committed
  fa18d55

  Copy full SHA for fa18d55

• [pp->tt012j] Start refactoring the Makefiles.

  Show description for cf0fafa
  hageboeck

  committed
  cf0fafa

  Copy full SHA for cf0fafa

• Fix a signed-unsigned warning.

  hageboeck

  committed
  91f1b61

  Copy full SHA for 91f1b61

• Protect clang-specific pragmas from other compilers.

  hageboeck

  committed
  0212f8b

  Copy full SHA for 0212f8b

• Remove force override of OMPFLAGS.

  hageboeck

  committed
  434774b

  Copy full SHA for 434774b

• [gg_ttgg] Remove force override of OMPFLAGS.

  hageboeck

  committed
  d2182de

  Copy full SHA for d2182de

• [pp_tt012j] Remove a hardcoded path to non-existing madgraph

  hageboeck

  committed
  938fab6

  Copy full SHA for 938fab6

• [pp_tt012j] Completely overhaul Makefiles

  Show description for c1020b6
  hageboeck

  committed
  c1020b6

  Copy full SHA for c1020b6

• Remove conditional compilation after Makefile overhaul.

  hageboeck

  committed
  e9f18a7

  Copy full SHA for e9f18a7

• [misc.py] Fix a few typos.

  hageboeck

  committed
  2a56e6d

  Copy full SHA for 2a56e6d

Commits on Nov 22, 2023

• Merge remote-tracking branch 'madgraph/master' into refactorMakefile

  Show description for 3be8de7
  hageboeck

  committed
  3be8de7

  Copy full SHA for 3be8de7

• Adapt old CI to new Makefile workflow.

  hageboeck

  committed
  d8bfd81

  Copy full SHA for d8bfd81

Commits on Nov 27, 2023

• [pp_tt012j] More Makefile tweaks.

  Show description for 4a5447e
  hageboeck

  committed
  4a5447e

  Copy full SHA for 4a5447e

• [pp_tt012j] Reactivate GLOBAL_FLAG to work with new Makefiles.

  hageboeck

  committed
  4ac7d3c

  Copy full SHA for 4ac7d3c

• [pp_tt012j] Even more Makefile tweaks.

  hageboeck

  committed
  8ecef5b

  Copy full SHA for 8ecef5b

Commits on Nov 30, 2023

• [CODEGEN] Port makefile overhaul to CODEGEN.

  Show description for ee768b4
  hageboeck

  committed
  ee768b4

  Copy full SHA for ee768b4

• [CODEGEN] Fix compiler warnings.

  Show description for 8715ca3
  hageboeck

  committed
  8715ca3

  Copy full SHA for 8715ca3

• [CODEGEN] Protect clang-specific pragmas from other compilers.

  Show description for 58b3ab6
  hageboeck

  committed
  58b3ab6

  Copy full SHA for 58b3ab6

• [CODEGEN] Fix MatrixElementKernelDevice::setGrid()

  Show description for a2093c6
  hageboeck

  committed
  a2093c6

  Copy full SHA for a2093c6

• [CODEGEN] Instantiate madgraph test cases also for CUDA builds.

  Show description for eec9d56
  hageboeck

  committed
  eec9d56

  Copy full SHA for eec9d56

• [CODEGEN] Apply clang-format to runTest.cc

  Show description for 7452bbe
  hageboeck

  committed
  7452bbe

  Copy full SHA for 7452bbe

• [CODEGEN] Remove level 0 pre-patches from generateAndCompare

  Show description for 99c2758
  hageboeck

  committed
  99c2758

  Copy full SHA for 99c2758

Commits on Dec 13, 2023

• [CODEGEN] Make mixed-precision computations the default.

  Show description for c85de5d
  hageboeck

  committed
  c85de5d

  Copy full SHA for c85de5d

• [CODEGEN] Refine clean targets.

  Show description for 23d6470
  hageboeck

  committed
  23d6470

  Copy full SHA for 23d6470

• Regenerate all *.mad processes.

  hageboeck

  committed
  1904d74

  Copy full SHA for 1904d74

• [CI] Fix Mac build targets for CI runs.

  hageboeck

  committed
  5773856

  Copy full SHA for 5773856

• [CI] Update debug build configuration.

  hageboeck

  committed
  629d5aa

  Copy full SHA for 629d5aa