move to mpiicx and mpiicpx compilers

Author: JuliaRS

Makefile

@@ -74,4 +74,5 @@ clean:
 	make -C src_cpp -f Makefile TARGET=MT clean
 	make -C src_c/P2P -f Makefile TARGET=P2P clean
 	make -C src_cpp -f Makefile TARGET=MPI1 clean GPU_ENABLE=1
-	rm -f IMB-MPI1 IMB-NBC IMB-RMA IMB-EXT IMB-IO IMB-MT IMB-P2P IMB-MPI1-GPU
+	rm -f IMB-MPI1 IMB-NBC IMB-RMA IMB-EXT IMB-IO IMB-MT IMB-P2P
+	if [ -e IMB-MPI1-GPU ]; then rm -f IMB-MPI1-GPU; fi

src_c/P2P/Makefile

@@ -37,7 +37,7 @@ override CFLAGS += -O3 -Wall -Wextra -pedantic -Wno-long-long
 override LDFLAGS += -lm
 
 ifeq ($(origin CC),default)
-CC=mpiicc
+CC=mpiicx
 endif
 
 all: $(BINARY)

src_cpp/Makefile

@@ -54,20 +54,17 @@ BINARY:=imb
 endif
 
 ifeq ($(origin CC),default)
-CC=mpiicc
+CC=mpiicx
 endif
 ifeq ($(origin CXX),default)
-CXX=mpiicpc
+CXX=mpiicpx
 endif
 override CPPFLAGS += -I.
 override CFLAGS += -g -O0 -Wall -Wno-long-long
 override CXXFLAGS += -g -O0 -Wall -Wextra -pedantic -Wno-long-long
-ifeq "$(CC)" "icx"
-CFLAGS += -std=c++11
-endif
 ifdef WITH_OPENMP
-override CFLAGS += -fopenmp
-override CXXFLAGS += -fopenmp
+override CFLAGS += -qopenmp
+override CXXFLAGS += -qopenmp
 endif
 
 #ifeq ($(origin CC),default)