Skip to content

Commit

Permalink
Suppress realloc-lhs warnings; add openmp flag to CFLAGS
Browse files Browse the repository at this point in the history
  • Loading branch information
@mkrack
mkrack committed Aug 6, 2020
1 parent 484564f commit 6ac2e2a
Show file tree
Hide file tree
Showing 4 changed files with 115 additions and 47 deletions.
40 changes: 29 additions & 11 deletions arch/Linux-x86-64-gfortran-regtest.pdbg
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Tested with: GFortran 8.3.0, MPICH 3.3, LAPACK 3.8.0, ScaLAPACK 2.0.2, FFTW 3.3,
# Libint 2.6.0, Libxc 4.3.4, ELPA 2019.05.001, PLUMED 2.5.2, SPGLIB 1.12.2
# Author: Matthias Krack (matthias.krack@psi.ch, PSI, May 2020)
# Author: Matthias Krack (matthias.krack@psi.ch, PSI, August 2020)

CC = mpicc
FC = mpif90
Expand All @@ -27,20 +27,38 @@ SPGLIB_LIB = $(GNU_PATH)/spglib/1.12.2/lib

CFLAGS = -O1 -g -mtune=generic

DFLAGS = -D__ELPA -D__FFTW3 -D__LIBINT -D__LIBXC
DFLAGS += -D__MPI_VERSION=3 -D__PLUMED2 -D__SPGLIB
DFLAGS += -D__parallel -D__SCALAPACK
DFLAGS = -D__ELPA
DFLAGS += -D__FFTW3
DFLAGS += -D__LIBINT
DFLAGS += -D__LIBXC
DFLAGS += -D__MPI_VERSION=3
DFLAGS += -D__PLUMED2
DFLAGS += -D__SPGLIB
DFLAGS += -D__parallel
DFLAGS += -D__SCALAPACK
DFLAGS += -D__CHECK_DIAG

WFLAGS = -Werror=aliasing -Werror=ampersand -Werror=c-binding-type
WFLAGS += -Werror=conversion -Werror=intrinsic-shadow -Werror=intrinsics-std
WFLAGS += -Werror=line-truncation -Wrealloc-lhs -Werror=tabs
WFLAGS += -Werror=target-lifetime -Werror=underflow -Werror=unused-but-set-variable
WFLAGS += -Werror=unused-dummy-argument -Werror=unused-variable
WFLAGS = -Werror=aliasing
WFLAGS += -Werror=ampersand
WFLAGS += -Werror=c-binding-type
WFLAGS += -Werror=conversion
WFLAGS += -Werror=intrinsic-shadow
WFLAGS += -Werror=intrinsics-std
WFLAGS += -Werror=line-truncation
#WFLAGS += -Wrealloc-lhs
WFLAGS += -Werror=tabs
WFLAGS += -Werror=target-lifetime
WFLAGS += -Werror=underflow
WFLAGS += -Werror=unused-but-set-variable
WFLAGS += -Werror=unused-dummy-argument
WFLAGS += -Werror=unused-variable

FCFLAGS = $(CFLAGS) $(DFLAGS) $(WFLAGS)
FCFLAGS += -fcheck=bounds,do,recursion,pointer -ffree-form
FCFLAGS += -ffree-line-length-none -fimplicit-none -fno-omit-frame-pointer
FCFLAGS += -fcheck=bounds,do,recursion,pointer
FCFLAGS += -ffree-form
FCFLAGS += -ffree-line-length-none
FCFLAGS += -fimplicit-none
FCFLAGS += -fno-omit-frame-pointer
FCFLAGS += -std=f2008
FCFLAGS += -I$(ELPA_INC)/elpa -I$(ELPA_INC)/modules
FCFLAGS += -I$(FFTW_INC) -I$(LIBINT_INC) -I$(LIBXC_INC)
Expand Down
44 changes: 31 additions & 13 deletions arch/Linux-x86-64-gfortran-regtest.psmp
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Tested with: GFortran 8.3.0, MPICH 3.3, LAPACK 3.8.0, ScaLAPACK 2.0.2, FFTW 3.3,
# Libint 2.6.0, Libxc 4.3.4, ELPA 2019.05.001, PLUMED 2.5.2, SPGLIB 1.12.2
# Author: Matthias Krack (matthias.krack@psi.ch, PSI, May 2020)
# Author: Matthias Krack (matthias.krack@psi.ch, PSI, August 2020)

CC = mpicc
FC = mpif90
Expand All @@ -25,23 +25,41 @@ LIBXC_LIB = $(GNU_PATH)/libxc/4.3.4-regtest/lib
SPGLIB_INC = $(GNU_PATH)/spglib/1.12.2/include
SPGLIB_LIB = $(GNU_PATH)/spglib/1.12.2/lib

CFLAGS = -O1 -g -mtune=generic
CFLAGS = -O1 -fopenmp -g -mtune=generic

DFLAGS = -D__ELPA -D__FFTW3 -D__LIBINT -D__LIBXC
DFLAGS += -D__MPI_VERSION=3 -D__PLUMED2 -D__SPGLIB
DFLAGS += -D__parallel -D__SCALAPACK
DFLAGS = -D__ELPA
DFLAGS += -D__FFTW3
DFLAGS += -D__LIBINT
DFLAGS += -D__LIBXC
DFLAGS += -D__MPI_VERSION=3
DFLAGS += -D__PLUMED2
DFLAGS += -D__SPGLIB
DFLAGS += -D__parallel
DFLAGS += -D__SCALAPACK
DFLAGS += -D__CHECK_DIAG

WFLAGS = -Werror=aliasing -Werror=ampersand -Werror=c-binding-type
WFLAGS += -Werror=conversion -Werror=intrinsic-shadow -Werror=intrinsics-std
WFLAGS += -Werror=line-truncation -Wrealloc-lhs -Werror=tabs
WFLAGS += -Werror=target-lifetime -Werror=underflow -Werror=unused-but-set-variable
WFLAGS += -Werror=unused-dummy-argument -Werror=unused-variable
WFLAGS = -Werror=aliasing
WFLAGS += -Werror=ampersand
WFLAGS += -Werror=c-binding-type
WFLAGS += -Werror=conversion
WFLAGS += -Werror=intrinsic-shadow
WFLAGS += -Werror=intrinsics-std
WFLAGS += -Werror=line-truncation
#WFLAGS += -Wrealloc-lhs
WFLAGS += -Werror=tabs
WFLAGS += -Werror=target-lifetime
WFLAGS += -Werror=underflow
WFLAGS += -Werror=unused-but-set-variable
WFLAGS += -Werror=unused-dummy-argument
WFLAGS += -Werror=unused-variable

FCFLAGS = $(CFLAGS) $(DFLAGS) $(WFLAGS)
FCFLAGS += -fcheck=bounds,do,recursion,pointer -ffree-form
FCFLAGS += -ffree-line-length-none -fimplicit-none -fno-omit-frame-pointer
FCFLAGS += -fopenmp -std=f2008
FCFLAGS += -fcheck=bounds,do,recursion,pointer
FCFLAGS += -ffree-form
FCFLAGS += -ffree-line-length-none
FCFLAGS += -fimplicit-none
FCFLAGS += -fno-omit-frame-pointer
FCFLAGS += -std=f2008
FCFLAGS += -I$(ELPA_INC)/elpa -I$(ELPA_INC)/modules
FCFLAGS += -I$(FFTW_INC) -I$(LIBINT_INC) -I$(LIBXC_INC)

Expand Down
36 changes: 26 additions & 10 deletions arch/Linux-x86-64-gfortran-regtest.sdbg
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Tested with: GFortran 8.3.0, FFTW 3.3, LAPACK 3.8.0, Libint 2.6.0, Libxc 4.3.4, SPGLIB 1.12.2
# Author: Matthias Krack (matthias.krack@psi.ch, PSI, May 2020)
# Author: Matthias Krack (matthias.krack@psi.ch, PSI, August 2020)

CC = gcc
FC = gfortran
Expand All @@ -20,17 +20,33 @@ SPGLIB_LIB = $(GNU_PATH)/spglib/1.12.2/lib

CFLAGS = -O1 -g -mtune=generic

DFLAGS = -D__FFTW3 -D__LIBINT -D__LIBXC -D__SPGLIB -D__CHECK_DIAG

WFLAGS = -Werror=aliasing -Werror=ampersand -Werror=c-binding-type
WFLAGS += -Werror=conversion -Werror=intrinsic-shadow -Werror=intrinsics-std
WFLAGS += -Werror=line-truncation -Wrealloc-lhs -Werror=tabs
WFLAGS += -Werror=target-lifetime -Werror=underflow -Werror=unused-but-set-variable
WFLAGS += -Werror=unused-dummy-argument -Werror=unused-variable
DFLAGS = -D__FFTW3
DFLAGS += -D__LIBINT
DFLAGS += -D__LIBXC
DFLAGS += -D__SPGLIB
DFLAGS += -D__CHECK_DIAG

WFLAGS = -Werror=aliasing
WFLAGS += -Werror=ampersand
WFLAGS += -Werror=c-binding-type
WFLAGS += -Werror=conversion
WFLAGS += -Werror=intrinsic-shadow
WFLAGS += -Werror=intrinsics-std
WFLAGS += -Werror=line-truncation
#WFLAGS += -Wrealloc-lhs
WFLAGS += -Werror=tabs
WFLAGS += -Werror=target-lifetime
WFLAGS += -Werror=underflow
WFLAGS += -Werror=unused-but-set-variable
WFLAGS += -Werror=unused-dummy-argument
WFLAGS += -Werror=unused-variable

FCFLAGS = $(CFLAGS) $(DFLAGS) $(WFLAGS)
FCFLAGS += -fcheck=bounds,do,recursion,pointer -ffree-form
FCFLAGS += -ffree-line-length-none -fimplicit-none -fno-omit-frame-pointer
FCFLAGS += -fcheck=bounds,do,recursion,pointer
FCFLAGS += -ffree-form
FCFLAGS += -ffree-line-length-none
FCFLAGS += -fimplicit-none
FCFLAGS += -fno-omit-frame-pointer
FCFLAGS += -std=f2008
FCFLAGS += -I$(FFTW_INC) -I$(LIBINT_INC) -I$(LIBXC_INC)

Expand Down
42 changes: 29 additions & 13 deletions arch/Linux-x86-64-gfortran-regtest.ssmp
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Tested with: GFortran 8.3.0, FFTW 3.3, LAPACK 3.8.0, Libint 2.6.0, Libxc 4.3.4, SPGLIB 1.12.2
# Author: Matthias Krack (matthias.krack@psi.ch, PSI, May 2020)
# Author: Matthias Krack (matthias.krack@psi.ch, PSI, August 2020)

CC = gcc
FC = gfortran
Expand All @@ -18,20 +18,36 @@ LIBXC_LIB = $(GNU_PATH)/libxc/4.3.4-regtest/lib
SPGLIB_INC = $(GNU_PATH)/spglib/1.12.2/include
SPGLIB_LIB = $(GNU_PATH)/spglib/1.12.2/lib

CFLAGS = -O1 -g -mtune=generic

DFLAGS = -D__FFTW3 -D__LIBINT -D__LIBXC -D__SPGLIB -D__CHECK_DIAG

WFLAGS = -Werror=aliasing -Werror=ampersand -Werror=c-binding-type
WFLAGS += -Werror=conversion -Werror=intrinsic-shadow -Werror=intrinsics-std
WFLAGS += -Werror=line-truncation -Wrealloc-lhs -Werror=tabs
WFLAGS += -Werror=target-lifetime -Werror=underflow -Werror=unused-but-set-variable
WFLAGS += -Werror=unused-dummy-argument -Werror=unused-variable
CFLAGS = -O1 -fopenmp -g -mtune=generic

DFLAGS = -D__FFTW3
DFLAGS += -D__LIBINT
DFLAGS += -D__LIBXC
DFLAGS += -D__SPGLIB
DFLAGS += -D__CHECK_DIAG

WFLAGS = -Werror=aliasing
WFLAGS += -Werror=ampersand
WFLAGS += -Werror=c-binding-type
WFLAGS += -Werror=conversion
WFLAGS += -Werror=intrinsic-shadow
WFLAGS += -Werror=intrinsics-std
WFLAGS += -Werror=line-truncation
#WFLAGS += -Wrealloc-lhs
WFLAGS += -Werror=tabs
WFLAGS += -Werror=target-lifetime
WFLAGS += -Werror=underflow
WFLAGS += -Werror=unused-but-set-variable
WFLAGS += -Werror=unused-dummy-argument
WFLAGS += -Werror=unused-variable

FCFLAGS = $(CFLAGS) $(DFLAGS) $(WFLAGS)
FCFLAGS += -fcheck=bounds,do,recursion,pointer -ffree-form
FCFLAGS += -ffree-line-length-none -fimplicit-none -fno-omit-frame-pointer
FCFLAGS += -fopenmp -std=f2008
FCFLAGS += -fcheck=bounds,do,recursion,pointer
FCFLAGS += -ffree-form
FCFLAGS += -ffree-line-length-none
FCFLAGS += -fimplicit-none
FCFLAGS += -fno-omit-frame-pointer
FCFLAGS += -std=f2008
FCFLAGS += -I$(FFTW_INC) -I$(LIBINT_INC) -I$(LIBXC_INC)

LDFLAGS = $(FCFLAGS) -fsanitize=leak
Expand Down

0 comments on commit 6ac2e2a

Please sign in to comment.