Skip to content

remove symbolik links in the .sa directories makefile->kokkos.mk#760

Merged
roiser merged 1 commit intomadgraph5:masterfrom
roiser:fixKokkosMakefilesMacOS
Sep 8, 2023
Merged

remove symbolik links in the .sa directories makefile->kokkos.mk#760
roiser merged 1 commit intomadgraph5:masterfrom
roiser:fixKokkosMakefilesMacOS

Conversation

@roiser
Copy link
Member

@roiser roiser commented Sep 8, 2023

because of the parallel existence of a file Makefile (upper case M) this creates a problem on standard MacOS filesystems which is case insensitive.

@roiser
Copy link
Member Author

roiser commented Sep 8, 2023

self-merging

@roiser roiser changed the title WIP: remove symbolik links in the .sa directories makefile->kokkos.mk remove symbolik links in the .sa directories makefile->kokkos.mk Sep 8, 2023
@roiser roiser merged commit 58d80a3 into madgraph5:master Sep 8, 2023
@roiser roiser deleted the fixKokkosMakefilesMacOS branch September 8, 2023 10:34
valassi added a commit to valassi/madgraph4gpu that referenced this pull request Oct 28, 2023
This adds the following commits by Stefan for madgraph5#760 and madgraph5#761
8e34cca       Stefan Roiser   Fri Sep 8 14:53:46 2023 +0200   Merge pull request madgraph5#761 from roiser/fixRemoveNonRunningCouplings
97fdd8f       Stefan Roiser   Fri Sep 8 14:36:48 2023 +0200   when ordering the running couplings this was done from a list from the base class called "wanted_couplings", this list also contained the independent couplings which need to be removed / filtered out before applying the ordering
58d80a3       Stefan Roiser   Fri Sep 8 12:34:46 2023 +0200   Merge pull request madgraph5#760 from roiser/fixKokkosMakefilesMacOS
5460e8d       Stefan Roiser   Fri Sep 8 09:21:35 2023 +0200   remove symbolik links in the .sa directories makefile->kokkos.mk
valassi added a commit to valassi/madgraph4gpu that referenced this pull request Oct 28, 2023
…mu again) after Stefan's changes for PRs madgraph5#760 and madgraph5#761

The only code changes are in gq_ttq and in ee_mumu.
- The tput and tmad tests in gq_ttq now fail again (runTest failure and xsec mismatch). Logs not included.
- Code generation in ee_mumu is now successful (but clang format must be fixed around Ccoeff). I have not run eemumu tests yet.
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.

1 participant