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.

Sign up for GitHub

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

Fix clang16 and clang17 builds #905

Merged
merged 18 commits into from
Jul 16, 2024
Merged

Fix clang16 and clang17 builds #905

Show file tree
Hide file tree
Changes from 14 commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
5cdb95a
[clang/june24] in gg_tt.mad cudacpp.mk, fix clang16 build of fcheck_c…
valassi Jul 11, 2024
a7efcb7
[clang/june24] in gg_tt.mad cudacpp.mk, fix clang16 builds by disabli…
valassi Jul 11, 2024
8a62982
[clang/june24] in CODEGEN (backport gg_tt.mad) cudacpp.mk, fix clang1…
valassi Jul 11, 2024
403180d
[clang/june24] regenerate all processes with cudacpp.mk fixes for cla…
valassi Jul 11, 2024
9ab418a
[clang/june24] move again to CODEGEN logs from the latest upstream/ma…
valassi Jul 11, 2024
acdac67
[clang/june24] in tools/compilers add clang17 wrappers for cvmfs
valassi Jul 11, 2024
ac2602f
[clang/june24] in gg_tt.mad cudacpp.mk, fix clang17 builds by disabli…
valassi Jul 11, 2024
7f112f8
[clang/june24] in CODEGEN (backport gg_tt.mad) cudacpp.mk, fix clang1…
valassi Jul 11, 2024
5c4c80f
[clang/june24] regenerate all processes with cudacpp.mk fixes for cla…
valassi Jul 11, 2024
9ef9e8e
[clang/june24] move again to CODEGEN logs from the latest upstream/ma…
valassi Jul 11, 2024
80023f6
[clang/june24] in gg_tt.mad cudacpp.mk, improve clang16/17 fix #904: …
valassi Jul 11, 2024
0d9d036
[clang/june24] in CODEGEN cudacpp.mk, improve clang16/17 fix #904: re…
valassi Jul 11, 2024
c673f21
[clang/june24] regenerate all processes with cudacpp.mk new fixes for…
valassi Jul 11, 2024
0a8d8b3
[clang/june24] ** COMPLETE CLANG (clang16/clang17) ** move again to C…
valassi Jul 11, 2024
fb7bd76
Merge remote-tracking branch 'upstream/master' (including OMP #900 an…
valassi Jul 16, 2024
284df28
[clang/june24] in gg_tt.mad and CODEGEN cudacpp.mk, fail with an erro…
valassi Jul 16, 2024
9629535
[clang/june24] regenerate all processes
valassi Jul 16, 2024
c05ffdd
[clang/june24] ** COMPLETE CLANG (again) ** move again to CODEGEN log…
valassi Jul 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion ...hX/cudacpp/CODEGEN/PLUGIN/CUDACPP_SA_OUTPUT/madgraph/iolibs/template_files/gpu/cudacpp.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -394,6 +394,10 @@ ifeq ($(override_OMPFLAGS),true)
else ifneq ($(shell $(CXX) --version | egrep '^Intel'),)
override OMPFLAGS = -fopenmp
###override OMPFLAGS = # disable OpenMP MT on Intel (was ok without GPUCC but not ok with GPUCC before #578)
else ifneq ($(shell $(CXX) --version | egrep '^clang version 16'),)
override OMPFLAGS = # disable OpenMP on clang16 #904
else ifneq ($(shell $(CXX) --version | egrep '^clang version 17'),)
override OMPFLAGS = # disable OpenMP on clang17 #904
else ifneq ($(shell $(CXX) --version | egrep '^(clang)'),)
override OMPFLAGS = -fopenmp
###override OMPFLAGS = # disable OpenMP MT on clang (was not ok without or with nvcc before #578)
Expand Down Expand Up @@ -797,9 +801,11 @@ endif
#-------------------------------------------------------------------------------

# Generic target and build rules: objects from Fortran compilation
# (NB In this makefile, this only applies to fcheck_sa_fortran.o)
# (NB -fPIC was added to fix clang16 build #904, but this seems better for other cases too and is consistent to c++ and cuda builds)
$(BUILDDIR)/%%_fortran.o : %%.f *.inc
@if [ ! -d $(BUILDDIR) ]; then echo "mkdir -p $(BUILDDIR)"; mkdir -p $(BUILDDIR); fi
$(FC) -I. -c $< -o $@
$(FC) -I. -fPIC -c $< -o $@

# Generic target and build rules: objects from Fortran compilation
###$(BUILDDIR)/%%_fortran.o : %%.f *.inc
Expand Down
8 changes: 7 additions & 1 deletion epochX/cudacpp/ee_mumu.mad/SubProcesses/cudacpp.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -394,6 +394,10 @@ ifeq ($(override_OMPFLAGS),true)
else ifneq ($(shell $(CXX) --version | egrep '^Intel'),)
override OMPFLAGS = -fopenmp
###override OMPFLAGS = # disable OpenMP MT on Intel (was ok without GPUCC but not ok with GPUCC before #578)
else ifneq ($(shell $(CXX) --version | egrep '^clang version 16'),)
override OMPFLAGS = # disable OpenMP on clang16 #904
else ifneq ($(shell $(CXX) --version | egrep '^clang version 17'),)
override OMPFLAGS = # disable OpenMP on clang17 #904
else ifneq ($(shell $(CXX) --version | egrep '^(clang)'),)
override OMPFLAGS = -fopenmp
###override OMPFLAGS = # disable OpenMP MT on clang (was not ok without or with nvcc before #578)
Expand Down Expand Up @@ -797,9 +801,11 @@ endif
#-------------------------------------------------------------------------------

# Generic target and build rules: objects from Fortran compilation
# (NB In this makefile, this only applies to fcheck_sa_fortran.o)
# (NB -fPIC was added to fix clang16 build #904, but this seems better for other cases too and is consistent to c++ and cuda builds)
$(BUILDDIR)/%_fortran.o : %.f *.inc
@if [ ! -d $(BUILDDIR) ]; then echo "mkdir -p $(BUILDDIR)"; mkdir -p $(BUILDDIR); fi
$(FC) -I. -c $< -o $@
$(FC) -I. -fPIC -c $< -o $@

# Generic target and build rules: objects from Fortran compilation
###$(BUILDDIR)/%_fortran.o : %.f *.inc
Expand Down
8 changes: 7 additions & 1 deletion epochX/cudacpp/ee_mumu.sa/SubProcesses/cudacpp.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -394,6 +394,10 @@ ifeq ($(override_OMPFLAGS),true)
else ifneq ($(shell $(CXX) --version | egrep '^Intel'),)
override OMPFLAGS = -fopenmp
###override OMPFLAGS = # disable OpenMP MT on Intel (was ok without GPUCC but not ok with GPUCC before #578)
else ifneq ($(shell $(CXX) --version | egrep '^clang version 16'),)
override OMPFLAGS = # disable OpenMP on clang16 #904
else ifneq ($(shell $(CXX) --version | egrep '^clang version 17'),)
override OMPFLAGS = # disable OpenMP on clang17 #904
else ifneq ($(shell $(CXX) --version | egrep '^(clang)'),)
override OMPFLAGS = -fopenmp
###override OMPFLAGS = # disable OpenMP MT on clang (was not ok without or with nvcc before #578)
Expand Down Expand Up @@ -797,9 +801,11 @@ endif
#-------------------------------------------------------------------------------

# Generic target and build rules: objects from Fortran compilation
# (NB In this makefile, this only applies to fcheck_sa_fortran.o)
# (NB -fPIC was added to fix clang16 build #904, but this seems better for other cases too and is consistent to c++ and cuda builds)
$(BUILDDIR)/%_fortran.o : %.f *.inc
@if [ ! -d $(BUILDDIR) ]; then echo "mkdir -p $(BUILDDIR)"; mkdir -p $(BUILDDIR); fi
$(FC) -I. -c $< -o $@
$(FC) -I. -fPIC -c $< -o $@

# Generic target and build rules: objects from Fortran compilation
###$(BUILDDIR)/%_fortran.o : %.f *.inc
Expand Down
8 changes: 7 additions & 1 deletion epochX/cudacpp/gg_tt.mad/SubProcesses/cudacpp.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -394,6 +394,10 @@ ifeq ($(override_OMPFLAGS),true)
else ifneq ($(shell $(CXX) --version | egrep '^Intel'),)
override OMPFLAGS = -fopenmp
###override OMPFLAGS = # disable OpenMP MT on Intel (was ok without GPUCC but not ok with GPUCC before #578)
else ifneq ($(shell $(CXX) --version | egrep '^clang version 16'),)
override OMPFLAGS = # disable OpenMP on clang16 #904
else ifneq ($(shell $(CXX) --version | egrep '^clang version 17'),)
override OMPFLAGS = # disable OpenMP on clang17 #904
else ifneq ($(shell $(CXX) --version | egrep '^(clang)'),)
override OMPFLAGS = -fopenmp
###override OMPFLAGS = # disable OpenMP MT on clang (was not ok without or with nvcc before #578)
Expand Down Expand Up @@ -797,9 +801,11 @@ endif
#-------------------------------------------------------------------------------

# Generic target and build rules: objects from Fortran compilation
# (NB In this makefile, this only applies to fcheck_sa_fortran.o)
# (NB -fPIC was added to fix clang16 build #904, but this seems better for other cases too and is consistent to c++ and cuda builds)
$(BUILDDIR)/%_fortran.o : %.f *.inc
@if [ ! -d $(BUILDDIR) ]; then echo "mkdir -p $(BUILDDIR)"; mkdir -p $(BUILDDIR); fi
$(FC) -I. -c $< -o $@
$(FC) -I. -fPIC -c $< -o $@

# Generic target and build rules: objects from Fortran compilation
###$(BUILDDIR)/%_fortran.o : %.f *.inc
Expand Down
8 changes: 7 additions & 1 deletion epochX/cudacpp/gg_tt.sa/SubProcesses/cudacpp.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -394,6 +394,10 @@ ifeq ($(override_OMPFLAGS),true)
else ifneq ($(shell $(CXX) --version | egrep '^Intel'),)
override OMPFLAGS = -fopenmp
###override OMPFLAGS = # disable OpenMP MT on Intel (was ok without GPUCC but not ok with GPUCC before #578)
else ifneq ($(shell $(CXX) --version | egrep '^clang version 16'),)
override OMPFLAGS = # disable OpenMP on clang16 #904
else ifneq ($(shell $(CXX) --version | egrep '^clang version 17'),)
override OMPFLAGS = # disable OpenMP on clang17 #904
else ifneq ($(shell $(CXX) --version | egrep '^(clang)'),)
override OMPFLAGS = -fopenmp
###override OMPFLAGS = # disable OpenMP MT on clang (was not ok without or with nvcc before #578)
Expand Down Expand Up @@ -797,9 +801,11 @@ endif
#-------------------------------------------------------------------------------

# Generic target and build rules: objects from Fortran compilation
# (NB In this makefile, this only applies to fcheck_sa_fortran.o)
# (NB -fPIC was added to fix clang16 build #904, but this seems better for other cases too and is consistent to c++ and cuda builds)
$(BUILDDIR)/%_fortran.o : %.f *.inc
@if [ ! -d $(BUILDDIR) ]; then echo "mkdir -p $(BUILDDIR)"; mkdir -p $(BUILDDIR); fi
$(FC) -I. -c $< -o $@
$(FC) -I. -fPIC -c $< -o $@

# Generic target and build rules: objects from Fortran compilation
###$(BUILDDIR)/%_fortran.o : %.f *.inc
Expand Down
8 changes: 7 additions & 1 deletion epochX/cudacpp/gg_tt01g.mad/SubProcesses/cudacpp.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -394,6 +394,10 @@ ifeq ($(override_OMPFLAGS),true)
else ifneq ($(shell $(CXX) --version | egrep '^Intel'),)
override OMPFLAGS = -fopenmp
###override OMPFLAGS = # disable OpenMP MT on Intel (was ok without GPUCC but not ok with GPUCC before #578)
else ifneq ($(shell $(CXX) --version | egrep '^clang version 16'),)
override OMPFLAGS = # disable OpenMP on clang16 #904
else ifneq ($(shell $(CXX) --version | egrep '^clang version 17'),)
override OMPFLAGS = # disable OpenMP on clang17 #904
else ifneq ($(shell $(CXX) --version | egrep '^(clang)'),)
override OMPFLAGS = -fopenmp
###override OMPFLAGS = # disable OpenMP MT on clang (was not ok without or with nvcc before #578)
Expand Down Expand Up @@ -797,9 +801,11 @@ endif
#-------------------------------------------------------------------------------

# Generic target and build rules: objects from Fortran compilation
# (NB In this makefile, this only applies to fcheck_sa_fortran.o)
# (NB -fPIC was added to fix clang16 build #904, but this seems better for other cases too and is consistent to c++ and cuda builds)
$(BUILDDIR)/%_fortran.o : %.f *.inc
@if [ ! -d $(BUILDDIR) ]; then echo "mkdir -p $(BUILDDIR)"; mkdir -p $(BUILDDIR); fi
$(FC) -I. -c $< -o $@
$(FC) -I. -fPIC -c $< -o $@

# Generic target and build rules: objects from Fortran compilation
###$(BUILDDIR)/%_fortran.o : %.f *.inc
Expand Down
8 changes: 7 additions & 1 deletion epochX/cudacpp/gg_ttg.mad/SubProcesses/cudacpp.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -394,6 +394,10 @@ ifeq ($(override_OMPFLAGS),true)
else ifneq ($(shell $(CXX) --version | egrep '^Intel'),)
override OMPFLAGS = -fopenmp
###override OMPFLAGS = # disable OpenMP MT on Intel (was ok without GPUCC but not ok with GPUCC before #578)
else ifneq ($(shell $(CXX) --version | egrep '^clang version 16'),)
override OMPFLAGS = # disable OpenMP on clang16 #904
else ifneq ($(shell $(CXX) --version | egrep '^clang version 17'),)
override OMPFLAGS = # disable OpenMP on clang17 #904
else ifneq ($(shell $(CXX) --version | egrep '^(clang)'),)
override OMPFLAGS = -fopenmp
###override OMPFLAGS = # disable OpenMP MT on clang (was not ok without or with nvcc before #578)
Expand Down Expand Up @@ -797,9 +801,11 @@ endif
#-------------------------------------------------------------------------------

# Generic target and build rules: objects from Fortran compilation
# (NB In this makefile, this only applies to fcheck_sa_fortran.o)
# (NB -fPIC was added to fix clang16 build #904, but this seems better for other cases too and is consistent to c++ and cuda builds)
$(BUILDDIR)/%_fortran.o : %.f *.inc
@if [ ! -d $(BUILDDIR) ]; then echo "mkdir -p $(BUILDDIR)"; mkdir -p $(BUILDDIR); fi
$(FC) -I. -c $< -o $@
$(FC) -I. -fPIC -c $< -o $@

# Generic target and build rules: objects from Fortran compilation
###$(BUILDDIR)/%_fortran.o : %.f *.inc
Expand Down
8 changes: 7 additions & 1 deletion epochX/cudacpp/gg_ttg.sa/SubProcesses/cudacpp.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -394,6 +394,10 @@ ifeq ($(override_OMPFLAGS),true)
else ifneq ($(shell $(CXX) --version | egrep '^Intel'),)
override OMPFLAGS = -fopenmp
###override OMPFLAGS = # disable OpenMP MT on Intel (was ok without GPUCC but not ok with GPUCC before #578)
else ifneq ($(shell $(CXX) --version | egrep '^clang version 16'),)
override OMPFLAGS = # disable OpenMP on clang16 #904
else ifneq ($(shell $(CXX) --version | egrep '^clang version 17'),)
override OMPFLAGS = # disable OpenMP on clang17 #904
else ifneq ($(shell $(CXX) --version | egrep '^(clang)'),)
override OMPFLAGS = -fopenmp
###override OMPFLAGS = # disable OpenMP MT on clang (was not ok without or with nvcc before #578)
Expand Down Expand Up @@ -797,9 +801,11 @@ endif
#-------------------------------------------------------------------------------

# Generic target and build rules: objects from Fortran compilation
# (NB In this makefile, this only applies to fcheck_sa_fortran.o)
# (NB -fPIC was added to fix clang16 build #904, but this seems better for other cases too and is consistent to c++ and cuda builds)
$(BUILDDIR)/%_fortran.o : %.f *.inc
@if [ ! -d $(BUILDDIR) ]; then echo "mkdir -p $(BUILDDIR)"; mkdir -p $(BUILDDIR); fi
$(FC) -I. -c $< -o $@
$(FC) -I. -fPIC -c $< -o $@

# Generic target and build rules: objects from Fortran compilation
###$(BUILDDIR)/%_fortran.o : %.f *.inc
Expand Down
8 changes: 7 additions & 1 deletion epochX/cudacpp/gg_ttgg.mad/SubProcesses/cudacpp.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -394,6 +394,10 @@ ifeq ($(override_OMPFLAGS),true)
else ifneq ($(shell $(CXX) --version | egrep '^Intel'),)
override OMPFLAGS = -fopenmp
###override OMPFLAGS = # disable OpenMP MT on Intel (was ok without GPUCC but not ok with GPUCC before #578)
else ifneq ($(shell $(CXX) --version | egrep '^clang version 16'),)
override OMPFLAGS = # disable OpenMP on clang16 #904
else ifneq ($(shell $(CXX) --version | egrep '^clang version 17'),)
override OMPFLAGS = # disable OpenMP on clang17 #904
else ifneq ($(shell $(CXX) --version | egrep '^(clang)'),)
override OMPFLAGS = -fopenmp
###override OMPFLAGS = # disable OpenMP MT on clang (was not ok without or with nvcc before #578)
Expand Down Expand Up @@ -797,9 +801,11 @@ endif
#-------------------------------------------------------------------------------

# Generic target and build rules: objects from Fortran compilation
# (NB In this makefile, this only applies to fcheck_sa_fortran.o)
# (NB -fPIC was added to fix clang16 build #904, but this seems better for other cases too and is consistent to c++ and cuda builds)
$(BUILDDIR)/%_fortran.o : %.f *.inc
@if [ ! -d $(BUILDDIR) ]; then echo "mkdir -p $(BUILDDIR)"; mkdir -p $(BUILDDIR); fi
$(FC) -I. -c $< -o $@
$(FC) -I. -fPIC -c $< -o $@

# Generic target and build rules: objects from Fortran compilation
###$(BUILDDIR)/%_fortran.o : %.f *.inc
Expand Down
8 changes: 7 additions & 1 deletion epochX/cudacpp/gg_ttgg.sa/SubProcesses/cudacpp.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -394,6 +394,10 @@ ifeq ($(override_OMPFLAGS),true)
else ifneq ($(shell $(CXX) --version | egrep '^Intel'),)
override OMPFLAGS = -fopenmp
###override OMPFLAGS = # disable OpenMP MT on Intel (was ok without GPUCC but not ok with GPUCC before #578)
else ifneq ($(shell $(CXX) --version | egrep '^clang version 16'),)
override OMPFLAGS = # disable OpenMP on clang16 #904
else ifneq ($(shell $(CXX) --version | egrep '^clang version 17'),)
override OMPFLAGS = # disable OpenMP on clang17 #904
else ifneq ($(shell $(CXX) --version | egrep '^(clang)'),)
override OMPFLAGS = -fopenmp
###override OMPFLAGS = # disable OpenMP MT on clang (was not ok without or with nvcc before #578)
Expand Down Expand Up @@ -797,9 +801,11 @@ endif
#-------------------------------------------------------------------------------

# Generic target and build rules: objects from Fortran compilation
# (NB In this makefile, this only applies to fcheck_sa_fortran.o)
# (NB -fPIC was added to fix clang16 build #904, but this seems better for other cases too and is consistent to c++ and cuda builds)
$(BUILDDIR)/%_fortran.o : %.f *.inc
@if [ ! -d $(BUILDDIR) ]; then echo "mkdir -p $(BUILDDIR)"; mkdir -p $(BUILDDIR); fi
$(FC) -I. -c $< -o $@
$(FC) -I. -fPIC -c $< -o $@

# Generic target and build rules: objects from Fortran compilation
###$(BUILDDIR)/%_fortran.o : %.f *.inc
Expand Down
8 changes: 7 additions & 1 deletion epochX/cudacpp/gg_ttggg.mad/SubProcesses/cudacpp.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -394,6 +394,10 @@ ifeq ($(override_OMPFLAGS),true)
else ifneq ($(shell $(CXX) --version | egrep '^Intel'),)
override OMPFLAGS = -fopenmp
###override OMPFLAGS = # disable OpenMP MT on Intel (was ok without GPUCC but not ok with GPUCC before #578)
else ifneq ($(shell $(CXX) --version | egrep '^clang version 16'),)
override OMPFLAGS = # disable OpenMP on clang16 #904
else ifneq ($(shell $(CXX) --version | egrep '^clang version 17'),)
override OMPFLAGS = # disable OpenMP on clang17 #904
else ifneq ($(shell $(CXX) --version | egrep '^(clang)'),)
override OMPFLAGS = -fopenmp
###override OMPFLAGS = # disable OpenMP MT on clang (was not ok without or with nvcc before #578)
Expand Down Expand Up @@ -797,9 +801,11 @@ endif
#-------------------------------------------------------------------------------

# Generic target and build rules: objects from Fortran compilation
# (NB In this makefile, this only applies to fcheck_sa_fortran.o)
# (NB -fPIC was added to fix clang16 build #904, but this seems better for other cases too and is consistent to c++ and cuda builds)
$(BUILDDIR)/%_fortran.o : %.f *.inc
@if [ ! -d $(BUILDDIR) ]; then echo "mkdir -p $(BUILDDIR)"; mkdir -p $(BUILDDIR); fi
$(FC) -I. -c $< -o $@
$(FC) -I. -fPIC -c $< -o $@

# Generic target and build rules: objects from Fortran compilation
###$(BUILDDIR)/%_fortran.o : %.f *.inc
Expand Down
8 changes: 7 additions & 1 deletion epochX/cudacpp/gg_ttggg.sa/SubProcesses/cudacpp.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -394,6 +394,10 @@ ifeq ($(override_OMPFLAGS),true)
else ifneq ($(shell $(CXX) --version | egrep '^Intel'),)
override OMPFLAGS = -fopenmp
###override OMPFLAGS = # disable OpenMP MT on Intel (was ok without GPUCC but not ok with GPUCC before #578)
else ifneq ($(shell $(CXX) --version | egrep '^clang version 16'),)
override OMPFLAGS = # disable OpenMP on clang16 #904
else ifneq ($(shell $(CXX) --version | egrep '^clang version 17'),)
override OMPFLAGS = # disable OpenMP on clang17 #904
else ifneq ($(shell $(CXX) --version | egrep '^(clang)'),)
override OMPFLAGS = -fopenmp
###override OMPFLAGS = # disable OpenMP MT on clang (was not ok without or with nvcc before #578)
Expand Down Expand Up @@ -797,9 +801,11 @@ endif
#-------------------------------------------------------------------------------

# Generic target and build rules: objects from Fortran compilation
# (NB In this makefile, this only applies to fcheck_sa_fortran.o)
# (NB -fPIC was added to fix clang16 build #904, but this seems better for other cases too and is consistent to c++ and cuda builds)
$(BUILDDIR)/%_fortran.o : %.f *.inc
@if [ ! -d $(BUILDDIR) ]; then echo "mkdir -p $(BUILDDIR)"; mkdir -p $(BUILDDIR); fi
$(FC) -I. -c $< -o $@
$(FC) -I. -fPIC -c $< -o $@

# Generic target and build rules: objects from Fortran compilation
###$(BUILDDIR)/%_fortran.o : %.f *.inc
Expand Down
8 changes: 7 additions & 1 deletion epochX/cudacpp/gq_ttq.mad/SubProcesses/cudacpp.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -394,6 +394,10 @@ ifeq ($(override_OMPFLAGS),true)
else ifneq ($(shell $(CXX) --version | egrep '^Intel'),)
override OMPFLAGS = -fopenmp
###override OMPFLAGS = # disable OpenMP MT on Intel (was ok without GPUCC but not ok with GPUCC before #578)
else ifneq ($(shell $(CXX) --version | egrep '^clang version 16'),)
override OMPFLAGS = # disable OpenMP on clang16 #904
else ifneq ($(shell $(CXX) --version | egrep '^clang version 17'),)
override OMPFLAGS = # disable OpenMP on clang17 #904
else ifneq ($(shell $(CXX) --version | egrep '^(clang)'),)
override OMPFLAGS = -fopenmp
###override OMPFLAGS = # disable OpenMP MT on clang (was not ok without or with nvcc before #578)
Expand Down Expand Up @@ -797,9 +801,11 @@ endif
#-------------------------------------------------------------------------------

# Generic target and build rules: objects from Fortran compilation
# (NB In this makefile, this only applies to fcheck_sa_fortran.o)
# (NB -fPIC was added to fix clang16 build #904, but this seems better for other cases too and is consistent to c++ and cuda builds)
$(BUILDDIR)/%_fortran.o : %.f *.inc
@if [ ! -d $(BUILDDIR) ]; then echo "mkdir -p $(BUILDDIR)"; mkdir -p $(BUILDDIR); fi
$(FC) -I. -c $< -o $@
$(FC) -I. -fPIC -c $< -o $@

# Generic target and build rules: objects from Fortran compilation
###$(BUILDDIR)/%_fortran.o : %.f *.inc
Expand Down
8 changes: 7 additions & 1 deletion epochX/cudacpp/gq_ttq.sa/SubProcesses/cudacpp.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -394,6 +394,10 @@ ifeq ($(override_OMPFLAGS),true)
else ifneq ($(shell $(CXX) --version | egrep '^Intel'),)
override OMPFLAGS = -fopenmp
###override OMPFLAGS = # disable OpenMP MT on Intel (was ok without GPUCC but not ok with GPUCC before #578)
else ifneq ($(shell $(CXX) --version | egrep '^clang version 16'),)
override OMPFLAGS = # disable OpenMP on clang16 #904
else ifneq ($(shell $(CXX) --version | egrep '^clang version 17'),)
override OMPFLAGS = # disable OpenMP on clang17 #904
else ifneq ($(shell $(CXX) --version | egrep '^(clang)'),)
override OMPFLAGS = -fopenmp
###override OMPFLAGS = # disable OpenMP MT on clang (was not ok without or with nvcc before #578)
Expand Down Expand Up @@ -797,9 +801,11 @@ endif
#-------------------------------------------------------------------------------

# Generic target and build rules: objects from Fortran compilation
# (NB In this makefile, this only applies to fcheck_sa_fortran.o)
# (NB -fPIC was added to fix clang16 build #904, but this seems better for other cases too and is consistent to c++ and cuda builds)
$(BUILDDIR)/%_fortran.o : %.f *.inc
@if [ ! -d $(BUILDDIR) ]; then echo "mkdir -p $(BUILDDIR)"; mkdir -p $(BUILDDIR); fi
$(FC) -I. -c $< -o $@
$(FC) -I. -fPIC -c $< -o $@

# Generic target and build rules: objects from Fortran compilation
###$(BUILDDIR)/%_fortran.o : %.f *.inc
Expand Down
Loading
Loading