From bcc2f88e123ee10817c6d6aa93d44a3e6be3c20a Mon Sep 17 00:00:00 2001
From: "petros.anastasiadis"
Date: Thu, 19 Oct 2017 13:45:40 +0300
Subject: [PATCH] Finallize
---
GPUs/Makefile | 7 ++++---
MPI/Makefile | 4 ++--
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/GPUs/Makefile b/GPUs/Makefile
index 66ca832..6830281 100644
--- a/GPUs/Makefile
+++ b/GPUs/Makefile
@@ -1,5 +1,6 @@
CC=g++
ICC =icc
+NVCC = nvcc
DEBUG ?= 0 # Set to 1 for debug
@@ -15,12 +16,12 @@ EXT_DIR = ../External_Functions/
MPI_PREFIX = $(I_MPI_ROOT)
CUDA_PREFIX = $(CUDAROOT)
-GPU_MPI_CXX = nvcc -L $(I_MPI_ROOT)/lib64 -lmpi -ccbin mpiicc
-GPU_CXX = nvcc
+GPU_MPI_CXX = $(NVCC) -L $(I_MPI_ROOT)/lib64 -lmpi -ccbin mpiicc
+GPU_CXX = $(NVCC)
LDFLAGS ?=-L $(CUDA_PREFIX)/lib64 -lcudart -lcublas -lcusparse -lm -lrt
-GPU_COMPILE = nvcc -I $(CUDA_PREFIX)/include -arch sm_35 -I$(EXT_DIR) $(LDFLAGS)
+GPU_COMPILE = $(NVCC) -I $(CUDA_PREFIX)/include -arch sm_35 -I$(EXT_DIR) $(LDFLAGS)
GPU_MPI_COMPILE = $(GPU_MPI_CXX) -I $(CUDA_PREFIX)/include -I $(I_MPI_ROOT)/include -arch sm_35 -I$(EXT_DIR) $(LDFLAGS)
CPU_COMPILE = $(CC) $(CFLAGS) -I$(EXT_DIR) $(LDFLAGS)
diff --git a/MPI/Makefile b/MPI/Makefile
index 45807e5..4b25531 100644
--- a/MPI/Makefile
+++ b/MPI/Makefile
@@ -1,5 +1,5 @@
#CC=gcc
-ICC=mpiicc
+MPICC=mpiicc
DEBUG ?= 0 # Set to 1 for debug
@@ -13,7 +13,7 @@ EXT_DIR = ../External_Functions/
ICFLAGS=-O3 -Wall -axCORE-AVX2,CORE-AVX-I
-MPI_COMPILE= $(ICC) $(ICFLAGS) -I$(EXT_DIR)
+MPI_COMPILE= $(MPICC) $(ICFLAGS) -I$(EXT_DIR)
MPI_OMP_COMPILE= $(MPI_COMPILE) -mt_mpi -qopenmp
ifeq ($(DEBUG), 1)
--
GitLab