Skip to content
This repository was archived by the owner on Apr 8, 2021. It is now read-only.

Commit 4fc8335

Browse files
climbfujiclimbfuji
authored
Merge pull request #10 from mkavulich/splib_no_openmp
Bug fix for building libsp without openmp
2 parents 53680b0 + cc870d6 commit 4fc8335

14 files changed

+43
-14
lines changed

‎macros.make.cheyenne.gnu‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,10 @@ CC = gcc
1010

1111
ifeq ($(OPENMP),1)
1212
OMPFLAGS= -fopenmp
13+
OMPCPPFLAGS= -DOPENMP
1314
else
1415
OMPFLAGS=
16+
OMPCPPFLAGS=
1517
endif
1618

1719
# Number of parallel tasks for gmake
@@ -50,7 +52,7 @@ SIGIO_FFLAGS = $(OMPFLAGS) -O0 -g -fbacktrace -ffree-form -fconvert=big-endian
5052
SIGIO_ARFLAGS = crvs
5153

5254
# Flags for sp library
53-
SP_FFLAGS = $(OMPFLAGS) -O3 -fdefault-real-8 -fconvert=big-endian -cpp -DLINUX -fPIC
55+
SP_FFLAGS = $(OMPFLAGS) -O3 -fdefault-real-8 -fconvert=big-endian -cpp -DLINUX -fPIC $(OMPCPPFLAGS)
5456
SP_ARFLAGS = -ruv
5557

5658
# Flags for w3emc library

‎macros.make.cheyenne.intel‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,10 @@ CC = icc
1010

1111
ifeq ($(OPENMP),1)
1212
OMPFLAGS= -qopenmp
13+
OMPCPPFLAGS= -DOPENMP
1314
else
1415
OMPFLAGS=
16+
OMPCPPFLAGS=
1517
endif
1618

1719
# Number of parallel tasks for gmake
@@ -50,7 +52,7 @@ SIGIO_FFLAGS = $(OMPFLAGS) -O0 -g -xHOST -traceback -free -convert big_endian -
5052
SIGIO_ARFLAGS = crvs
5153

5254
# Flags for sp library
53-
SP_FFLAGS = $(OMPFLAGS) -O3 -auto -i4 -r8 -convert big_endian -assume byterecl -fp-model strict -fpp -DLINUX -fPIC
55+
SP_FFLAGS = $(OMPFLAGS) -O3 -auto -i4 -r8 -convert big_endian -assume byterecl -fp-model strict -fpp -DLINUX -fPIC $(OMPCPPFLAGS)
5456
SP_ARFLAGS = -ruv
5557

5658
# Flags for w3emc library

‎macros.make.cheyenne.pgi‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,10 @@ CC = pgcc
1010

1111
ifeq ($(OPENMP),1)
1212
OMPFLAGS= -mp
13+
OMPCPPFLAGS= -DOPENMP
1314
else
1415
OMPFLAGS=
16+
OMPCPPFLAGS=
1517
endif
1618

1719
# Number of parallel tasks for gmake
@@ -50,7 +52,7 @@ SIGIO_FFLAGS = $(OMPFLAGS) -O0 -g -traceback -Mfree -byteswapio -c -fPIC
5052
SIGIO_ARFLAGS = crvs
5153

5254
# Flags for sp library
53-
SP_FFLAGS = $(OMPFLAGS) -traceback -O3 -Mrecursive -i4 -r8 -byteswapio -Kieee -Mpreprocess -DLINUX -fPIC
55+
SP_FFLAGS = $(OMPFLAGS) -traceback -O3 -Mrecursive -i4 -r8 -byteswapio -Kieee -Mpreprocess -DLINUX -fPIC $(OMPCPPFLAGS)
5456
SP_ARFLAGS = -ruv
5557

5658
# Flags for w3emc library

‎macros.make.gaea.intel‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,10 @@ CC = icc
1010

1111
ifeq ($(OPENMP),1)
1212
OMPFLAGS= -qopenmp
13+
OMPCPPFLAGS= -DOPENMP
1314
else
1415
OMPFLAGS=
16+
OMPCPPFLAGS=
1517
endif
1618

1719
# Number of parallel tasks for gmake
@@ -50,7 +52,7 @@ SIGIO_FFLAGS = $(OMPFLAGS) -O0 -g -xHOST -traceback -free -convert big_endian -
5052
SIGIO_ARFLAGS = crvs
5153

5254
# Flags for sp library
53-
SP_FFLAGS = $(OMPFLAGS) -O3 -auto -i4 -r8 -convert big_endian -assume byterecl -fp-model strict -fpp -DLINUX -fPIC
55+
SP_FFLAGS = $(OMPFLAGS) -O3 -auto -i4 -r8 -convert big_endian -assume byterecl -fp-model strict -fpp -DLINUX -fPIC $(OMPCPPFLAGS)
5456
SP_ARFLAGS = -ruv
5557

5658
# Flags for w3emc library

‎macros.make.hera.intel‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,10 @@ CC = icc
1010

1111
ifeq ($(OPENMP),1)
1212
OMPFLAGS= -qopenmp
13+
OMPCPPFLAGS= -DOPENMP
1314
else
1415
OMPFLAGS=
16+
OMPCPPFLAGS=
1517
endif
1618

1719
# Number of parallel tasks for gmake
@@ -50,7 +52,7 @@ SIGIO_FFLAGS = $(OMPFLAGS) -O0 -g -xHOST -traceback -free -convert big_endian -
5052
SIGIO_ARFLAGS = crvs
5153

5254
# Flags for sp library
53-
SP_FFLAGS = $(OMPFLAGS) -O3 -auto -i4 -r8 -convert big_endian -assume byterecl -fp-model strict -fpp -DLINUX -fPIC
55+
SP_FFLAGS = $(OMPFLAGS) -O3 -auto -i4 -r8 -convert big_endian -assume byterecl -fp-model strict -fpp -DLINUX -fPIC $(OMPCPPFLAGS)
5456
SP_ARFLAGS = -ruv
5557

5658
# Flags for w3emc library

‎macros.make.jet.intel‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,10 @@ CC = icc
1010

1111
ifeq ($(OPENMP),1)
1212
OMPFLAGS= -qopenmp
13+
OMPCPPFLAGS= -DOPENMP
1314
else
1415
OMPFLAGS=
16+
OMPCPPFLAGS=
1517
endif
1618

1719
# Number of parallel tasks for gmake
@@ -50,7 +52,7 @@ SIGIO_FFLAGS = $(OMPFLAGS) -O0 -g -xHOST -traceback -free -convert big_endian -
5052
SIGIO_ARFLAGS = crvs
5153

5254
# Flags for sp library
53-
SP_FFLAGS = $(OMPFLAGS) -O3 -auto -i4 -r8 -convert big_endian -assume byterecl -fp-model strict -fpp -DLINUX -fPIC
55+
SP_FFLAGS = $(OMPFLAGS) -O3 -auto -i4 -r8 -convert big_endian -assume byterecl -fp-model strict -fpp -DLINUX -fPIC $(OMPCPPFLAGS)
5456
SP_ARFLAGS = -ruv
5557

5658
# Flags for w3emc library

‎macros.make.linux.gnu‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,10 @@ ARFLAGS =
1010

1111
ifeq ($(OPENMP),1)
1212
OMPFLAGS= -fopenmp
13+
OMPCPPFLAGS= -DOPENMP
1314
else
1415
OMPFLAGS=
16+
OMPCPPFLAGS=
1517
endif
1618

1719
# Number of parallel tasks for gmake
@@ -42,7 +44,7 @@ SIGIO_FFLAGS = $(OMPFLAGS) -O0 -g -fbacktrace -ffree-form -fconvert=big-endian
4244
SIGIO_ARFLAGS = crvs
4345

4446
# Flags for sp library
45-
SP_FFLAGS = $(OMPFLAGS) -O3 -fdefault-real-8 -fconvert=big-endian -cpp -DLINUX -fPIC
47+
SP_FFLAGS = $(OMPFLAGS) -O3 -fdefault-real-8 -fconvert=big-endian -cpp -DLINUX -fPIC $(OMPCPPFLAGS)
4648
SP_ARFLAGS = -ruv
4749

4850
# Flags for w3emc library

‎macros.make.linux.intel‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,10 @@ CC = icc
1010

1111
ifeq ($(OPENMP),1)
1212
OMPFLAGS= -qopenmp
13+
OMPCPPFLAGS= -DOPENMP
1314
else
1415
OMPFLAGS=
16+
OMPCPPFLAGS=
1517
endif
1618

1719
# Number of parallel tasks for gmake
@@ -50,7 +52,7 @@ SIGIO_FFLAGS = $(OMPFLAGS) -O0 -g -xHOST -traceback -free -convert big_endian -
5052
SIGIO_ARFLAGS = crvs
5153

5254
# Flags for sp library
53-
SP_FFLAGS = $(OMPFLAGS) -O3 -auto -i4 -r8 -convert big_endian -assume byterecl -fp-model strict -fpp -DLINUX -fPIC
55+
SP_FFLAGS = $(OMPFLAGS) -O3 -auto -i4 -r8 -convert big_endian -assume byterecl -fp-model strict -fpp -DLINUX -fPIC $(OMPCPPFLAGS)
5456
SP_ARFLAGS = -ruv
5557

5658
# Flags for w3emc library

‎macros.make.macosx.gnu‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,10 @@ ARFLAGS =
1010

1111
ifeq ($(OPENMP),1)
1212
OMPFLAGS= -fopenmp
13+
OMPCPPFLAGS= -DOPENMP
1314
else
1415
OMPFLAGS=
16+
OMPCPPFLAGS=
1517
endif
1618

1719
# Number of parallel tasks for gmake
@@ -50,7 +52,7 @@ SIGIO_FFLAGS = $(OMPFLAGS) -O0 -g -fbacktrace -ffree-form -fconvert=big-endian
5052
SIGIO_ARFLAGS = crvs
5153

5254
# Flags for sp library
53-
SP_FFLAGS = $(OMPFLAGS) -O3 -fdefault-real-8 -fconvert=big-endian -cpp -DLINUX -fPIC
55+
SP_FFLAGS = $(OMPFLAGS) -O3 -fdefault-real-8 -fconvert=big-endian -cpp -DLINUX -fPIC $(OMPCPPFLAGS)
5456
SP_ARFLAGS = -ruv
5557

5658
# Flags for w3emc library

‎macros.make.theia.gnu‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,10 @@ CC = gcc
1010

1111
ifeq ($(OPENMP),1)
1212
OMPFLAGS= -fopenmp
13+
OMPCPPFLAGS= -DOPENMP
1314
else
1415
OMPFLAGS=
16+
OMPCPPFLAGS=
1517
endif
1618

1719
# Number of parallel tasks for gmake
@@ -50,7 +52,7 @@ SIGIO_FFLAGS = $(OMPFLAGS) -O0 -g -fbacktrace -ffree-form -fconvert=big-endian
5052
SIGIO_ARFLAGS = crvs
5153

5254
# Flags for sp library
53-
SP_FFLAGS = $(OMPFLAGS) -O3 -fdefault-real-8 -fconvert=big-endian -cpp -DLINUX -fPIC
55+
SP_FFLAGS = $(OMPFLAGS) -O3 -fdefault-real-8 -fconvert=big-endian -cpp -DLINUX -fPIC $(OMPCPPFLAGS)
5456
SP_ARFLAGS = -ruv
5557

5658
# Flags for w3emc library

0 commit comments

Comments
 (0)