Skip to content

Commit 93f0ed1

Browse files
committed
try to fix some problems with GCC 9.2.0 on Hawk
1 parent c1b0609 commit 93f0ed1

File tree

337 files changed

+750
-748
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

337 files changed

+750
-748
lines changed

DDalphaAMG_interface.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@
2525
#define DDalphaAMG_INTERFACE_H_
2626
#include "global.h"
2727
#include "su3.h"
28-
#include"solver/matrix_mult_typedef.h"
29-
#include"solver/matrix_mult_typedef_nd.h"
28+
#include "solver/matrix_mult_typedef.h"
29+
#include "solver/matrix_mult_typedef_nd.h"
3030

3131
extern int mg_setup_iter;
3232
extern int mg_coarse_setup_iter;

DirectPut.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
***********************************************************************/
1919

2020
#ifdef HAVE_CONFIG_H
21-
# include<tmlqcd_config.h>
21+
# include "tmlqcd_config.h"
2222
#endif
2323
#include <stdlib.h>
2424
#include <stdio.h>

GPU/DEBUG/MATRIX_DEBUG.cuh

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
extern "C" {
88
//#ifdef HAVE_CONFIG_H
9-
//# include<tmlqcd_config.h>
9+
//#include "tmlqcd_config.h"
1010
//#endif
1111
//#include <stdlib.h>
1212
//#include <stdio.h>

GPU/DEBUG/MATRIX_MPI_DEBUG.cuh

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
extern "C" {
88
//#ifdef HAVE_CONFIG_H
9-
//# include<tmlqcd_config.h>
9+
//#include "tmlqcd_config.h"
1010
//#endif
1111
//#include <stdlib.h>
1212
//#include <stdio.h>

GPU/mixed_solve.cu

+1-1
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ extern "C" {
8383

8484

8585
#ifdef HAVE_CONFIG_H
86-
#include<tmlqcd_config.h>
86+
#include "tmlqcd_config.h"
8787
#endif
8888

8989

GPU/mixed_solve_eo_nd.cuh

+1-1
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363

6464

6565
#ifdef HAVE_CONFIG_H
66-
#include<tmlqcd_config.h>
66+
#include "tmlqcd_config.h"
6767
#endif
6868

6969
extern "C" {

GPU/textures.cuh

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828

2929

3030
#ifdef HAVE_CONFIG_H
31-
#include<tmlqcd_config.h>
31+
#include "tmlqcd_config.h"
3232
#endif
3333

3434
/* texture for nearest neighbours*/

LapH_ev.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
*******************************************************************************/
2525

2626
#ifdef HAVE_CONFIG_H
27-
# include "tmlqcd_config.h"
27+
#include "tmlqcd_config.h"
2828
#else
2929
#error "no tmlqcd_config.h"
3030
#endif
@@ -37,7 +37,7 @@
3737
# include <rts.h>
3838
#endif
3939
#ifdef TM_USE_MPI
40-
# include <mpi.h>
40+
#include <mpi.h>
4141
#endif
4242
#include "global.h"
4343
#include <io/params.h>

P_M_eta.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
***********************************************************************/
2020

2121
#ifdef HAVE_CONFIG_H
22-
# include<tmlqcd_config.h>
22+
#include "tmlqcd_config.h"
2323
#endif
2424

2525
#include <stdlib.h>

Ptilde_nd.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,13 @@
1919
***********************************************************************/
2020

2121
#ifdef HAVE_CONFIG_H
22-
# include<tmlqcd_config.h>
22+
#include "tmlqcd_config.h"
2323
#endif
2424
#include <stdlib.h>
2525
#include <stdio.h>
2626
#include <math.h>
2727
#ifdef TM_USE_MPI
28-
# include <mpi.h>
28+
#include <mpi.h>
2929
#endif
3030
#include "global.h"
3131
#include "linalg_eo.h"

README.bgp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Configure with
22

3-
../hmc/configure --with-lapack --enable-mpi --with-mpidimension=4 --enable-gaugecopy --with-limedir=../../c-lime/ --host=ppc-ibm-bprts --build=ppc64-ibm-linux --enable-largefile --with-lapack="-L/bgsys/local/lib/ -lesslbg -llapack -lesslbg -lxlf90_r" CC="mpixlc_r" CCFLAGS="-I/bgsys/drivers/ppcfloor/arch/include/ -I/bgsys/drivers/ppcfloor/comm/include" F77="bgf77"
3+
../hmc/configure --with-lapack --enable-mpi --with-mpidimension=4 --enable-gaugecopy --with-limedir=../../c-lime/ --host=ppc-ibm-bprts --build=ppc64-ibm-linux --enable-largefile --with-lapack="-L/bgsys/local/lib/ -lesslbg -llapack -lesslbg -lxlf90_r" CC="mpixlc_r" CCFLAGS="-I/bgsys/drivers/ppcfloor/arch/include/ -I/bgsys/drivers/ppcfloor/comm/include " F77="bgf77"
44

55
may need some path adjustment, in particular where to find ESSL for
66
BG.

X_psi.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@
1919
***********************************************************************/
2020

2121
#ifdef HAVE_CONFIG_H
22-
# include<tmlqcd_config.h>
22+
#include "tmlqcd_config.h"
2323
#endif
2424
#include <stdlib.h>
2525
#include <math.h>
2626
#ifdef HAVE_CONFIG_H
27-
# include<tmlqcd_config.h>
27+
#include "tmlqcd_config.h"
2828
#endif
2929
#include "global.h"
3030
#include "su3.h"

aligned_malloc.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
***********************************************************************/
2020

2121
#if HAVE_CONFIG_H
22-
#include <tmlqcd_config.h>
22+
#include "tmlqcd_config.h"
2323
#endif
2424

2525
#include <stdlib.h>

benchmark.c

+4-4
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
*******************************************************************************/
2525

2626
#ifdef HAVE_CONFIG_H
27-
# include<tmlqcd_config.h>
27+
#include "tmlqcd_config.h"
2828
#endif
2929
#include <stdlib.h>
3030
#include <stdio.h>
@@ -35,15 +35,15 @@
3535
# include <rts.h>
3636
#endif
3737
#ifdef TM_USE_MPI
38-
# include <mpi.h>
38+
#include <mpi.h>
3939
# ifdef HAVE_LIBLEMON
4040
# include <io/params.h>
4141
# include <io/gauge.h>
4242
# endif
4343
#endif
4444
#ifdef TM_USE_OMP
45-
# include <omp.h>
46-
# include "init/init_openmp.h"
45+
#include <omp.h>
46+
#include "init/init_openmp.h"
4747
#endif
4848
#include "gettime.h"
4949
#include "su3.h"

block.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
***********************************************************************/
2121

2222
#ifdef HAVE_CONFIG_H
23-
# include<tmlqcd_config.h>
23+
#include "tmlqcd_config.h"
2424
#endif
2525
#include <errno.h>
2626
#include <math.h>

boundary.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
***********************************************************************/
2424

2525
#ifdef HAVE_CONFIG_H
26-
# include<tmlqcd_config.h>
26+
#include "tmlqcd_config.h"
2727
#endif
2828
#include <stdlib.h>
2929
#include <math.h>

buffers/gauge.ih

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#ifdef HAVE_CONFIG_H
2-
# include <tmlqcd_config.h>
2+
#include "tmlqcd_config.h"
33
#endif
44

55
#include <stdio.h>

buffers/utils.ih

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#ifdef HAVE_CONFIG_H
2-
# include <tmlqcd_config.h>
2+
#include "tmlqcd_config.h"
33
#endif
44

55
#include <string.h>

chebyshev_polynomial.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
***********************************************************************/
2121

2222
#ifdef HAVE_CONFIG_H
23-
# include<tmlqcd_config.h>
23+
#include "tmlqcd_config.h"
2424
#endif
2525
#include <stdlib.h>
2626
#include <stdio.h>

chebyshev_polynomial_nd.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
***********************************************************************/
2020

2121
#ifdef HAVE_CONFIG_H
22-
# include<tmlqcd_config.h>
22+
#include "tmlqcd_config.h"
2323
#endif
2424
#include <stdlib.h>
2525
#include <stdio.h>

check_locallity.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717
* along with tmLQCD. If not, see <http://www.gnu.org/licenses/>.
1818
***********************************************************************/
1919

20-
#include"lime.h"
20+
#include "lime.h"
2121
#ifdef HAVE_CONFIG_H
22-
# include<tmlqcd_config.h>
22+
#include "tmlqcd_config.h"
2323
#endif
2424
#include <stdlib.h>
2525
#include <stdio.h>

config.guess

+2-2
Original file line numberDiff line numberDiff line change
@@ -1313,8 +1313,8 @@ esac
13131313
eval $set_cc_for_build
13141314
cat >$dummy.c <<EOF
13151315
#ifdef _SEQUENT_
1316-
# include <sys/types.h>
1317-
# include <sys/utsname.h>
1316+
#include <sys/types.h>
1317+
#include <sys/utsname.h>
13181318
#endif
13191319
main ()
13201320
{

configure.in

+3-3
Original file line numberDiff line numberDiff line change
@@ -745,7 +745,7 @@ elif test "$host_cpu" = "powerpc" && test "$host_vendor" = "ibm" && test "$host_
745745
else
746746
DEPFLAGS="-M"
747747
fi
748-
CPPFLAGS="-I/bgl/BlueLight/ppcfloor/bglsys/include"
748+
CPPFLAGS="-I/bgl/BlueLight/ppcfloor/bglsys/include "
749749
INCLUDES="$INCLUDES -I/bgl/BlueLight/ppcfloor/bglsys/include/"
750750

751751
#The BLue Gene/P
@@ -776,8 +776,8 @@ elif test "$host_cpu" = "powerpc" && test "$host_vendor" = "ibm" && test "$host_
776776
else
777777
DEPFLAGS="-M"
778778
fi
779-
CPPFLAGS="-I/bgsys/drivers/ppcfloor/arch/include/ -I/bgsys/drivers/ppcfloor/comm/include"
780-
INCLUDES="$INCLUDES -I/bgsys/local/include/ -I/bgsys/drivers/ppcfloor/arch/include/ -I/bgsys/drivers/ppcfloor/comm/include"
779+
CPPFLAGS="-I/bgsys/drivers/ppcfloor/arch/include/ -I/bgsys/drivers/ppcfloor/comm/include "
780+
INCLUDES="$INCLUDES -I/bgsys/local/include/ -I/bgsys/drivers/ppcfloor/arch/include/ -I/bgsys/drivers/ppcfloor/comm/include "
781781

782782

783783

deriv_Sb.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
************************************************************************/
4040

4141
#ifdef HAVE_CONFIG_H
42-
# include<tmlqcd_config.h>
42+
#include "tmlqcd_config.h"
4343
#endif
4444
#include <stdlib.h>
4545
#include <stdio.h>

deriv_Sb_D_psi.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
***********************************************************************/
2020

2121
#ifdef HAVE_CONFIG_H
22-
# include<tmlqcd_config.h>
22+
#include "tmlqcd_config.h"
2323
#endif
2424
#include <stdlib.h>
2525
#include <stdio.h>

expo.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
************************************************************************/
3535

3636
#ifdef HAVE_CONFIG_H
37-
# include<tmlqcd_config.h>
37+
#include "tmlqcd_config.h"
3838
#endif
3939
#ifdef SSE
4040
# undef SSE

fatal_error.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
***********************************************************************/
2020

2121
#ifdef HAVE_CONFIG_H
22-
#include <tmlqcd_config.h>
22+
#include "tmlqcd_config.h"
2323
#endif
2424

2525
#include <stdio.h>

gamma.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
*******************************************************************************/
2828

2929
#ifdef HAVE_CONFIG_H
30-
# include<tmlqcd_config.h>
30+
#include "tmlqcd_config.h"
3131
#endif
3232
#include <stdlib.h>
3333
#include <stdio.h>

gen_sources.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828

2929
#include "lime.h"
3030
#ifdef HAVE_CONFIG_H
31-
# include<tmlqcd_config.h>
31+
#include "tmlqcd_config.h"
3232
#endif
3333
#include <stdlib.h>
3434
#include <stdio.h>
@@ -37,10 +37,10 @@
3737
#include <sys/time.h>
3838
#include <string.h>
3939
#ifdef TM_USE_MPI
40-
# include <mpi.h>
40+
#include <mpi.h>
4141
#endif
4242
#ifdef TM_USE_OMP
43-
# include <omp.h>
43+
#include <omp.h>
4444
#endif
4545
#include "global.h"
4646
#include "getopt.h"

geometry_eo.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
*******************************************************************************/
3333

3434
#ifdef HAVE_CONFIG_H
35-
# include<tmlqcd_config.h>
35+
#include "tmlqcd_config.h"
3636
#endif
3737
#include <stdlib.h>
3838
#include <stdio.h>

get_rectangle_staples.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
***********************************************************************/
1919

2020
#ifdef HAVE_CONFIG_H
21-
# include<tmlqcd_config.h>
21+
#include "tmlqcd_config.h"
2222
#endif
2323
#include <stdlib.h>
2424
#include <stdio.h>

get_staples.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
***********************************************************************/
1919

2020
#ifdef HAVE_CONFIG_H
21-
# include<tmlqcd_config.h>
21+
#include "tmlqcd_config.h"
2222
#endif
2323
#include <stdlib.h>
2424
#include <stdio.h>

get_staples.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
#ifndef _GET_STAPLES_H
2121
#define _GET_STAPLES_H
2222

23-
#include"su3.h"
23+
#include "su3.h"
2424

2525
void get_staples(su3* const staple, const int x, const int mu, const su3 ** in_gauge_field);
2626
void get_timelike_staples(su3* const staple, const int x, const int mu, const su3 ** in_gauge_field);

0 commit comments

Comments
 (0)