Merge pull request #1041 from roiser/change-amd-arch

Allow setting the AMD GPU architecture from outside the makefile

Author: Qubitol

MG5aMC/mg5amcnlo

@@ -229,6 +229,8 @@ ifeq ($(BACKEND),cuda)
 
 else ifeq ($(BACKEND),hip)
 
+  # example architecture values MI200:gfx90a, MI350X:gfx942
+  MADGRAPH_HIP_ARCHITECTURE ?= gfx942
   # Set GPUCC as $(HIP_HOME)/bin/hipcc (it was already checked above that this exists)
   GPUCC = $(HIP_HOME)/bin/hipcc
   XCOMPILERFLAG =
@@ -243,7 +245,7 @@ else ifeq ($(BACKEND),hip)
   ###GPUFLAGS += -ggdb # FOR DEBUGGING ONLY
 
   # AMD HIP architecture flags
-  GPUARCHFLAGS = --offload-arch=gfx942
+  GPUARCHFLAGS = --offload-arch=${MADGRAPH_HIP_ARCHITECTURE}
   GPUFLAGS += $(GPUARCHFLAGS)
 
   # Other AMD-specific flags

epochX/cudacpp/CODEGEN/PLUGIN/CUDACPP_SA_OUTPUT/madgraph/iolibs/template_files/gpu/cudacpp.mk

@@ -19,7 +19,7 @@ CXXFLAGS += -Igoogletest/googletest/include/ -std=c++11
 all: googletest/$(INSTALLDIR)/lib64/libgtest.a
 
 googletest/CMakeLists.txt:
-	git clone https://github.com/google/googletest.git -b release-1.11.0 googletest
+	git clone https://github.com/google/googletest.git -b v1.17.0 googletest
 
 googletest/$(BUILDDIR)/Makefile: googletest/CMakeLists.txt
 	mkdir -p googletest/$(BUILDDIR)