Skip to content

Commit

Permalink
[makefiles] remove g*.cu symlinks (except for gcheck_sa.cu), build as…
Browse files Browse the repository at this point in the history
… *_cu.o from *.cc
  • Loading branch information
valassi committed Feb 1, 2022
1 parent ffdf654 commit 1c8c16b
Show file tree
Hide file tree
Showing 7 changed files with 6 additions and 12 deletions.
12 changes: 6 additions & 6 deletions epochX/cudacpp/gg_tt/SubProcesses/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ CXXFLAGS+= -ffast-math # see issue #117
# install target
INSTALL_HEADERS=CPPProcess.h MatrixElementKernels.h MemoryBuffers.h checkCuda.h MemoryAccessMomenta.h MemoryAccessHelpers.h MemoryAccessVectors.h
INSTALL_INC_DIR=../../include
INSTALL_OBJECTS=CPPProcess.o gCPPProcess.o MatrixElementKernels.o gMatrixElementKernels.o
INSTALL_OBJECTS=CPPProcess.o CPPProcess_cu.o MatrixElementKernels.o MatrixElementKernels_cu.o

# Note: AR and CXX are implicitly defined if not set externally
# See https://www.gnu.org/software/make/manual/html_node/Implicit-Variables.html
Expand Down Expand Up @@ -106,7 +106,7 @@ ifneq ($(wildcard $(CUDA_HOME)/bin/nvcc),)
###CUFLAGS+= --maxrregcount 96 # degrades throughput: 4.1E8 (16384 32 12) up to 4.5E8 (65536 128 12)
###CUFLAGS+= --maxrregcount 64 # degrades throughput: 1.7E8 (16384 32 12) flat at 1.7E8 (65536 128 12)
cu_main = $(BUILDDIR)/gcheck.exe
cu_objects = $(BUILDDIR)/gCPPProcess.o $(BUILDDIR)/gRandomNumberKernels.o $(BUILDDIR)/gRamboSamplingKernels.o $(BUILDDIR)/gMatrixElementKernels.o $(BUILDDIR)/gBridgeKernels.o $(BUILDDIR)/gCrossSectionKernels.o
cu_objects = $(BUILDDIR)/CPPProcess_cu.o $(BUILDDIR)/RandomNumberKernels_cu.o $(BUILDDIR)/RamboSamplingKernels_cu.o $(BUILDDIR)/MatrixElementKernels_cu.o $(BUILDDIR)/BridgeKernels_cu.o $(BUILDDIR)/CrossSectionKernels_cu.o
else
# No cuda. Switch cuda compilation off and go to common random numbers in C++
$(warning CUDA_HOME is not set or is invalid. Export CUDA_HOME to compile with cuda)
Expand Down Expand Up @@ -295,14 +295,14 @@ $(BUILDDIR)/%.o : %.cc *.h ../../src/*.h
@if [ ! -d $(BUILDDIR) ]; then mkdir -p $(BUILDDIR); fi
$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(CUINC) -c $< -o $@

# Apply special build flags only to CrossSectionKernel.cc and gCrossSectionKernel.cu (no fast math, see #117)
# Apply special build flags only to CrossSectionKernel.o and CrossSectionKernel_cu.o for C++/CUDA compilation (no fast math, see #117)
$(BUILDDIR)/CrossSectionKernels.o: CXXFLAGS += -fno-fast-math
$(BUILDDIR)/gCrossSectionKernels.o: CUFLAGS += -Xcompiler -fno-fast-math
$(BUILDDIR)/CrossSectionKernels_cu.o: CUFLAGS += -Xcompiler -fno-fast-math

#### Apply special build flags only to CPPProcess.cc (-flto)
#### Apply special build flags only to CPPProcess.o (-flto)
###$(BUILDDIR)/CPPProcess.o: CXXFLAGS += -flto

#### Apply special build flags only to CPPProcess.cc (AVXFLAGS)
#### Apply special build flags only to CPPProcess.o (AVXFLAGS)
###$(BUILDDIR)/CPPProcess.o: CXXFLAGS += $(AVXFLAGS)

ifneq ($(shell $(CXX) --version | grep ^Intel),)
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

0 comments on commit 1c8c16b

Please # to comment.