From fc2557407326220359a9bd434c69ecffead0245d Mon Sep 17 00:00:00 2001 From: Clay Hughes Date: Wed, 28 Nov 2018 08:28:34 -0700 Subject: [PATCH 1/2] Updating makefiles from -openmp to -qopenmp --- openmp-opt-knl-memkind/src/Makefile.intel.openmp | 2 +- openmp-opt-knl/src/Makefile.intel.openmp | 2 +- openmp-opt/src/Makefile.intel.openmp | 2 +- openmp/src/Makefile.intel.openmp | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/openmp-opt-knl-memkind/src/Makefile.intel.openmp b/openmp-opt-knl-memkind/src/Makefile.intel.openmp index 83a2049..1309086 100644 --- a/openmp-opt-knl-memkind/src/Makefile.intel.openmp +++ b/openmp-opt-knl-memkind/src/Makefile.intel.openmp @@ -16,7 +16,7 @@ MINIFE_MATRIX_TYPE = -DMINIFE_CSR_MATRIX #----------------------------------------------------------------------- -OPENMP=-openmp +OPENMP=-qopenmp CFLAGS = -O3 $(OPENMP) -restrict -mavx CXXFLAGS = $(CFLAGS) diff --git a/openmp-opt-knl/src/Makefile.intel.openmp b/openmp-opt-knl/src/Makefile.intel.openmp index 83a2049..1309086 100644 --- a/openmp-opt-knl/src/Makefile.intel.openmp +++ b/openmp-opt-knl/src/Makefile.intel.openmp @@ -16,7 +16,7 @@ MINIFE_MATRIX_TYPE = -DMINIFE_CSR_MATRIX #----------------------------------------------------------------------- -OPENMP=-openmp +OPENMP=-qopenmp CFLAGS = -O3 $(OPENMP) -restrict -mavx CXXFLAGS = $(CFLAGS) diff --git a/openmp-opt/src/Makefile.intel.openmp b/openmp-opt/src/Makefile.intel.openmp index 83a2049..1309086 100644 --- a/openmp-opt/src/Makefile.intel.openmp +++ b/openmp-opt/src/Makefile.intel.openmp @@ -16,7 +16,7 @@ MINIFE_MATRIX_TYPE = -DMINIFE_CSR_MATRIX #----------------------------------------------------------------------- -OPENMP=-openmp +OPENMP=-qopenmp CFLAGS = -O3 $(OPENMP) -restrict -mavx CXXFLAGS = $(CFLAGS) diff --git a/openmp/src/Makefile.intel.openmp b/openmp/src/Makefile.intel.openmp index 390f163..555a567 100644 --- a/openmp/src/Makefile.intel.openmp +++ b/openmp/src/Makefile.intel.openmp @@ -16,7 +16,7 @@ MINIFE_MATRIX_TYPE = -DMINIFE_CSR_MATRIX #----------------------------------------------------------------------- -CFLAGS = -O3 -fopenmp +CFLAGS = -O3 -qopenmp CXXFLAGS = $(CFLAGS) CPPFLAGS = -I. -I../utils -I../fem $(MINIFE_TYPES) $(MINIFE_MATRIX_TYPE) From a62036c7a2d941fcf2b438e95c7395a31f057d3d Mon Sep 17 00:00:00 2001 From: Clay Hughes Date: Wed, 28 Nov 2018 08:34:34 -0700 Subject: [PATCH 2/2] Switched to -fopenmp for backward compatability --- openmp-opt-knl-memkind/src/Makefile.intel.openmp | 2 +- openmp-opt-knl/src/Makefile.intel.openmp | 2 +- openmp-opt/src/Makefile.intel.openmp | 2 +- openmp/src/Makefile.intel.openmp | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/openmp-opt-knl-memkind/src/Makefile.intel.openmp b/openmp-opt-knl-memkind/src/Makefile.intel.openmp index 1309086..50cd607 100644 --- a/openmp-opt-knl-memkind/src/Makefile.intel.openmp +++ b/openmp-opt-knl-memkind/src/Makefile.intel.openmp @@ -16,7 +16,7 @@ MINIFE_MATRIX_TYPE = -DMINIFE_CSR_MATRIX #----------------------------------------------------------------------- -OPENMP=-qopenmp +OPENMP=-fopenmp CFLAGS = -O3 $(OPENMP) -restrict -mavx CXXFLAGS = $(CFLAGS) diff --git a/openmp-opt-knl/src/Makefile.intel.openmp b/openmp-opt-knl/src/Makefile.intel.openmp index 1309086..50cd607 100644 --- a/openmp-opt-knl/src/Makefile.intel.openmp +++ b/openmp-opt-knl/src/Makefile.intel.openmp @@ -16,7 +16,7 @@ MINIFE_MATRIX_TYPE = -DMINIFE_CSR_MATRIX #----------------------------------------------------------------------- -OPENMP=-qopenmp +OPENMP=-fopenmp CFLAGS = -O3 $(OPENMP) -restrict -mavx CXXFLAGS = $(CFLAGS) diff --git a/openmp-opt/src/Makefile.intel.openmp b/openmp-opt/src/Makefile.intel.openmp index 1309086..50cd607 100644 --- a/openmp-opt/src/Makefile.intel.openmp +++ b/openmp-opt/src/Makefile.intel.openmp @@ -16,7 +16,7 @@ MINIFE_MATRIX_TYPE = -DMINIFE_CSR_MATRIX #----------------------------------------------------------------------- -OPENMP=-qopenmp +OPENMP=-fopenmp CFLAGS = -O3 $(OPENMP) -restrict -mavx CXXFLAGS = $(CFLAGS) diff --git a/openmp/src/Makefile.intel.openmp b/openmp/src/Makefile.intel.openmp index 555a567..390f163 100644 --- a/openmp/src/Makefile.intel.openmp +++ b/openmp/src/Makefile.intel.openmp @@ -16,7 +16,7 @@ MINIFE_MATRIX_TYPE = -DMINIFE_CSR_MATRIX #----------------------------------------------------------------------- -CFLAGS = -O3 -qopenmp +CFLAGS = -O3 -fopenmp CXXFLAGS = $(CFLAGS) CPPFLAGS = -I. -I../utils -I../fem $(MINIFE_TYPES) $(MINIFE_MATRIX_TYPE)