Commit f3f68b0b authored by Kelleher, Michael's avatar Kelleher, Michael
Browse files

Merge branch '25k/makefile-fixes' into 'master' 

Update makefiles

See merge request hydro/triton!3

Former-commit-id: 36d9a4ba
parents 8ad0a2aa cf2ecd37

makefile

+4 −0
Original line number Diff line number Diff line
@@ -19,11 +19,15 @@ summit_omp: 
afw_gpu:

	make -f makefile.afw ACTIVE_GPU=1 SRCDIR=$(SRCDIR) BUILDDIR=$(BUILDDIR)



afw_cuda:	afw_gpu



afw_omp:

	make -f makefile.afw ACTIVE_OMP=1 SRCDIR=$(SRCDIR) BUILDDIR=$(BUILDDIR)



frontier_gpu:

	make -f makefile.frontier ACTIVE_GPU=1 SRCDIR=$(SRCDIR) BUILDDIR=$(BUILDDIR)



frontier_hip:	frontier_gpu



clean:

	rm -rf $(BUILDDIR)/triton

makefile.afw

+25 −19
Original line number Diff line number Diff line 
ifdef ACTIVE_GPU

	CC := nvcc -ccbin CC

	INC_DIRS := /opt/cray/pe/mpich/8.1.6/ofi/gnu/9.1/include

	FLAGS := -arch=sm_70 -x cu

	LIBRARIES := -L$(CUDA_DIR)/targets/ppc64le-linux/lib/stubs -L/opt/cray/pe/mpich/8.1.6/ofi/gnu/9.1/lib -lnvidia-ml

	INC_DIRS := $(MPICH_DIR)/include

	FLAGS := -arch=sm_80 -x cu

	DFLAGS := -DACTIVE_GPU=1

	LIBRARIES := -L$(MPICH_DIR)/lib -lcuda $(PE_MPICH_GTL_DIR_nvidia80) $(PE_MPICH_GTL_LIBS_nvidia80) -lmpi

else

	CC := CC

	INC_DIRS := /opt/cray/pe/mpich/8.1.6/ofi/gnu/9.1/include

	INC_DIRS := $(MPICH_DIR)/include

	FLAGS := -Wall -fopenmp

	LIBRARIES := -L/opt/cray/pe/mpich/8.1.6/ofi/gnu/9.1/lib 

	LIBRARIES := -L$(MPICH_DIR)/lib

	DFLAGS := -DACTIVE_OMP=1

endif



triton: $(SRCDIR)/main.cpp

	if [ ! -d $(BUILDDIR) ]; then mkdir $(BUILDDIR); fi

	@echo 'Compiling file: $<'

	$(CC) $(INC_DIRS:%=-I%) $(FLAGS) $(DFLAGS) -O3 $(LIBRARIES) -o "$(BUILDDIR)/$@" "$<" --std=c++11

	$(CC) \

		$(INC_DIRS:%=-I%) \

		$(FLAGS) \

		$(DFLAGS) \

		-O3 \

		$(LIBRARIES) \

		-o "$(BUILDDIR)/$@" "$<" --std=c++11

	@echo 'Building finished: $@'

makefile.frontier

+22 −11
Original line number Diff line number Diff line 
CC := hipcc

INC_DIRS := $(HIP_PATH)/include/hip  $(MPICH_DIR)/include

INC_DIRS := $(ROCM_PATH)/include/hip $(MPICH_DIR)/include

LIB_DIRS := -L$(MPICH_DIR)/lib -L$(HIP_LIB_PATH)

FLAGS := --rocm-path=$(ROCM_PATH) --offload-arch=gfx90a -x hip

LIBRARIES := -L$(MPICH_DIR)/lib -L$(HIP_PATH)/../lib -lmpi

LIBRARIES := -lmpi -lamdhip64

GTL_LIBS := $(PE_MPICH_GTL_DIR_amd_gfx90a) $(PE_MPICH_GTL_LIBS_amd_gfx90a)

DFLAGS := -D__HIP_ROCclr__ -D__HIP_ARCH_GFX90A__=1 -DACTIVE_GPU=1 -DAMDGPU=1



triton: $(SRCDIR)/main.cpp

	if [ ! -d "$(BUILDDIR)" ]; then mkdir $(BUILDDIR); fi

	@echo 'Compiling file: $<'

	$(CC) $(INC_DIRS:%=-I%) $(FLAGS) $(DFLAGS) -O3 $(LIBRARIES) -o "$(BUILDDIR)/$@" "$<" --std=c++11

	$(CC) \

		$(INC_DIRS:%=-I%) \

		$(LIB_DIRS) \

		$(FLAGS) \

		$(DFLAGS) \

		-O3 \

		$(LIBRARIES) \

		$(GTL_LIBS) \

		-o "$(BUILDDIR)/$@" "$<" \

		--std=c++11

	@echo 'Building finished: $@'