mirror of
				https://github.com/paboyle/Grid.git
				synced 2025-10-30 19:44:32 +00:00 
			
		
		
		
	Warning elimination; drop to -O2 on G++ bad versions
This commit is contained in:
		| @@ -14,7 +14,6 @@ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) | ||||
| #AC_REVISION([m4_esyscmd_s([./scripts/configure.commit])]) | ||||
|  | ||||
| ############### Checks for programs | ||||
| CXXFLAGS="-O3 $CXXFLAGS" | ||||
| AC_PROG_CXX | ||||
| AC_PROG_RANLIB | ||||
|  | ||||
| @@ -28,6 +27,12 @@ AX_GXX_VERSION | ||||
| AC_DEFINE_UNQUOTED([GXX_VERSION],["$GXX_VERSION"], | ||||
|       [version of g++ that will compile the code]) | ||||
|  | ||||
| CXXFLAGS="-O3 $CXXFLAGS" | ||||
| case ${GXX_VERSION} in | ||||
|      6.0.0|6.1.0|6.2.0|5.4.1|5.4.0|5.3.0|5.2.0|5.1.0|5.0.0) | ||||
|      CXXFLAGS="-O3 $CXXFLAGS" | ||||
|         ;; | ||||
| esac | ||||
| ############### Checks for typedefs, structures, and compiler characteristics | ||||
| AC_TYPE_SIZE_T | ||||
| AC_TYPE_UINT32_T | ||||
|   | ||||
							
								
								
									
										9
									
								
								lib/Grid_Eigen_Dense.h
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										9
									
								
								lib/Grid_Eigen_Dense.h
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,9 @@ | ||||
| #pragma once | ||||
| #if defined __GNUC__ | ||||
| #pragma GCC diagnostic push | ||||
| #pragma GCC diagnostic ignored "-Wdeprecated-declarations" | ||||
| #endif | ||||
| #include <Grid/Eigen/Dense> | ||||
| #if defined __GNUC__ | ||||
| #pragma GCC diagnostic pop | ||||
| #endif | ||||
| @@ -135,8 +135,6 @@ class ConjugateGradient : public OperatorFunction<Field> { | ||||
|         Linop.HermOpAndNorm(psi, mmp, d, qq); | ||||
|         p = mmp - src; | ||||
|  | ||||
|         RealD mmpnorm = sqrt(norm2(mmp)); | ||||
|         RealD psinorm = sqrt(norm2(psi)); | ||||
|         RealD srcnorm = sqrt(norm2(src)); | ||||
|         RealD resnorm = sqrt(norm2(p)); | ||||
|         RealD true_residual = resnorm / srcnorm; | ||||
|   | ||||
| @@ -22,7 +22,7 @@ Author: paboyle <paboyle@ph.ed.ac.uk> | ||||
| #ifndef GRID_LATTICE_REDUCTION_H | ||||
| #define GRID_LATTICE_REDUCTION_H | ||||
|  | ||||
| #include <Grid/Eigen/Dense> | ||||
| #include <Grid/Grid_Eigen_Dense.h> | ||||
|  | ||||
| namespace Grid { | ||||
| #ifdef GRID_WARN_SUBOPTIMAL | ||||
|   | ||||
| @@ -205,13 +205,12 @@ public: | ||||
|   void Stop(void) { | ||||
|     count=0; | ||||
|     cycles=0; | ||||
|     size_t ign; | ||||
| #ifdef __linux__ | ||||
|     if ( fd!= -1) { | ||||
|       ::ioctl(fd, PERF_EVENT_IOC_DISABLE, 0); | ||||
|       ::ioctl(cyclefd, PERF_EVENT_IOC_DISABLE, 0); | ||||
|       ign=::read(fd, &count, sizeof(long long)); | ||||
|       ign=::read(cyclefd, &cycles, sizeof(long long)); | ||||
|       ::read(fd, &count, sizeof(long long)); | ||||
|       ::read(cyclefd, &cycles, sizeof(long long)); | ||||
|     } | ||||
|     elapsed = cyclecount() - begin; | ||||
| #else | ||||
|   | ||||
| @@ -29,7 +29,7 @@ Author: paboyle <paboyle@ph.ed.ac.uk> | ||||
|     *************************************************************************************/ | ||||
|     /*  END LEGAL */ | ||||
|  | ||||
| #include <Grid/Eigen/Dense> | ||||
| #include <Grid/Grid_Eigen_Dense.h> | ||||
| #include <Grid/qcd/action/fermion/FermionCore.h> | ||||
| #include <Grid/qcd/action/fermion/CayleyFermion5D.h> | ||||
|  | ||||
|   | ||||
| @@ -29,7 +29,7 @@ Author: paboyle <paboyle@ph.ed.ac.uk> | ||||
|     *************************************************************************************/ | ||||
|     /*  END LEGAL */ | ||||
|  | ||||
| #include <Grid/Eigen/Dense> | ||||
| #include <Grid/Grid_Eigen_Dense.h> | ||||
| #include <Grid/qcd/action/fermion/FermionCore.h> | ||||
| #include <Grid/qcd/action/fermion/CayleyFermion5D.h> | ||||
|  | ||||
|   | ||||
| @@ -106,7 +106,6 @@ class CartesianStencil { // Stencil runs along coordinate axes only; NO diagonal | ||||
|  public: | ||||
|  | ||||
|   typedef CartesianCommunicator::CommsRequest_t CommsRequest_t; | ||||
|   typedef uint32_t StencilInteger; | ||||
|   typedef typename cobj::vector_type vector_type; | ||||
|   typedef typename cobj::scalar_type scalar_type; | ||||
|   typedef typename cobj::scalar_object scalar_object; | ||||
|   | ||||
		Reference in New Issue
	
	Block a user