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

Update makefiles for new modules


Former-commit-id: b5ea2f4e
parent 98ff4fe3
Loading
Loading
Loading
Loading
+10 −2
Original line number Diff line number Diff line
@@ -3,7 +3,9 @@ ifdef ACTIVE_GPU
	INC_DIRS := $(MPICH_DIR)/include
	FLAGS := -arch=sm_70 -x cu
	DFLAGS := -DACTIVE_GPU=1
	LIBRARIES := -L$(MPICH_DIR)/lib -lnvidia-ml -lcuda $(PE_MPICH_GTL_DIR_nvidia70) $(PE_MPICH_GTL_LIBS_nvidia70)
	LIBRARIES := -L$(MPICH_DIR)/lib -lcuda
	# Holding these for GPU aware MPI
	# $(PE_MPICH_GTL_DIR_nvidia70) $(PE_MPICH_GTL_LIBS_nvidia70)
else
	CC := CC
	INC_DIRS := $(MPICH_DIR)/include
@@ -15,5 +17,11 @@ 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: $@'
+14 −3
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 $(PE_MPICH_GTL_DIR_amd_gfx90a) $(PE_MPICH_GTL_LIBS_amd_gfx90a)
LIBRARIES := -lmpi
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: $@'