Skip to content

Commit

Permalink
Merge branch 'clang' (full PR madgraph5#905 for clang16/17 fixes madg…
Browse files Browse the repository at this point in the history 
…raph5#904) into gtest
  • Loading branch information
@valassi
valassi committed Jul 12, 2024
2 parents ff512a9 + 0a8d8b3 commit bca578b
Show file tree
Hide file tree
Showing 21 changed files with 147 additions and 21 deletions.
8 changes: 7 additions & 1 deletion epochX/cudacpp/ee_mumu.mad/SubProcesses/cudacpp.mk
View file
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
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
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
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
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
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
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
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
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
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
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
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/heft_gg_bb.mad/SubProcesses/cudacpp.mk
View file
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/heft_gg_bb.sa/SubProcesses/cudacpp.mk
View file
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

0 comments on commit bca578b

Please sign in to comment.