[cig-commits] [commit] QA: build: Use consistent rules for building ADIOS files. (d9daf54)

cig_noreply at geodynamics.org cig_noreply at geodynamics.org
Mon Jan 20 07:11:55 PST 2014 

Repository : ssh://geoshell/specfem3d

On branch  : QA
Link       : https://github.com/geodynamics/specfem3d/compare/4359ed56c14ef8f87387f46c8b705a1d395a40ba...8e7fca259d3e520c105549cfacfb92b6c83f8971

>---------------------------------------------------------------

commit d9daf54528e897c2248b0bb0f707beb5bf633f20
Author: Elliott Sales de Andrade <esalesde at physics.utoronto.ca>
Date:   Sun Jan 19 20:28:35 2014 -0500

    build: Use consistent rules for building ADIOS files.
    
    We should use *COMPILE_CHECK or else build options aren't the same in
    all cases.
    
    Also, change 'byte' type to 'integer(kind=1)', as the former is a GNU
    compiler (and probably others) extension, and does not compile in
    standards mode.


>---------------------------------------------------------------

d9daf54528e897c2248b0bb0f707beb5bf633f20
 src/generate_databases/Makefile.in       | 20 ++++++++++----------
 src/meshfem3D/Makefile.in                | 20 ++++++++++----------
 src/shared/adios_helpers_definitions.f90 |  2 +-
 src/specfem3D/Makefile.in                | 16 ++++++++--------
 4 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/src/generate_databases/Makefile.in b/src/generate_databases/Makefile.in
index 7118469..0cdd29b 100644
--- a/src/generate_databases/Makefile.in
+++ b/src/generate_databases/Makefile.in
@@ -51,11 +51,11 @@ OUTPUT=../../OUTPUT_FILES
 # with configure: ./configure --with-adios ADIOS_CONFIG=..
 
 MPI_INCLUDES = @MPI_INCLUDES@
-ADIOS_INC = @ADIOS_FCFLAGS@ -I../../
+ADIOS_INC = @ADIOS_FCFLAGS@
 ADIOS_LINK = @ADIOS_LIBS@
 
-FCCOMPILE_CHECK =@FCENV@ ${FC} ${FCFLAGS} $(FLAGS_CHECK) -I${SHARED} ${ADIOS_LINK}
-MPIFCCOMPILE_CHECK =@FCENV@ ${MPIFC} ${FCFLAGS} $(FLAGS_CHECK) -I${SHARED} ${ADIOS_LINK}
+FCCOMPILE_CHECK =@FCENV@ ${FC} ${FCFLAGS} $(FLAGS_CHECK) -I${SHARED} ${ADIOS_INC}
+MPIFCCOMPILE_CHECK =@FCENV@ ${MPIFC} ${FCFLAGS} $(FLAGS_CHECK) -I${SHARED} ${ADIOS_INC}
 @COND_MPI_TRUE at FCLINK = $(MPIFCCOMPILE_CHECK)
 @COND_MPI_FALSE at FCLINK = $(FCCOMPILE_CHECK)
 
@@ -262,25 +262,25 @@ $O/adios_helpers.shared_adios.o: \
 ###
 
 $O/%.adios.o: %.F90 ${SHARED}constants.h
-	${MPIFCCOMPILE_CHECK} -c $(ADIOS_INC) $(FCFLAGS) $(MPI_INCLUDES) -o $@ $<
+	${MPIFCCOMPILE_CHECK} -c $(MPI_INCLUDES) -o $@ $<
 
 $O/%.adios.o: %.f90 ${SHARED}constants.h
-	${MPIFCCOMPILE_CHECK} -c $(ADIOS_INC) $(FCFLAGS) $(MPI_INCLUDES) -o $@ $<
+	${MPIFCCOMPILE_CHECK} -c $(MPI_INCLUDES) -o $@ $<
 
 $O/%.noadios.o: %.F90 
-	${FC} -c -o $@ $<
+	${FCCOMPILE_CHECK} -c -o $@ $<
 
 $O/%.noadios.o: %.f90 
-	${FC} -c -o $@ $<
+	${FCCOMPILE_CHECK} -c -o $@ $<
 
 $O/%.shared_noadios.o: ${SHARED}/%.f90
-	${FC} -c -o $@ $<
+	${FCCOMPILE_CHECK} -c -o $@ $<
 
 $O/%.shared_adios.o: ${SHARED}/%.f90 ${SHARED}/constants.h
-	${MPIFC} -c $(ADIOS_INC) $(FCFLAGS) $(MPI_INCLUDES) -o $@ $<
+	${MPIFCCOMPILE_CHECK} -c $(MPI_INCLUDES) -o $@ $<
 
 $O/%.shared_adios.o: ${SHARED}/%.F90 ${SHARED}/constants.h
-	${MPIFC} -c $(ADIOS_INC) $(FCFLAGS) $(MPI_INCLUDES) -o $@ $<
+	${MPIFCCOMPILE_CHECK} -c $(MPI_INCLUDES) -o $@ $<
 
 #######################################
 
diff --git a/src/meshfem3D/Makefile.in b/src/meshfem3D/Makefile.in
index 80e5648..8d29a6d 100644
--- a/src/meshfem3D/Makefile.in
+++ b/src/meshfem3D/Makefile.in
@@ -48,11 +48,11 @@ FCFLAGS_f90 = @FCFLAGS_f90@
 # with configure: ./configure --with-adios ADIOS_CONFIG=..
 
 MPI_INCLUDES = @MPI_INCLUDES@
-ADIOS_INC = @ADIOS_FCFLAGS@ -I../../
+ADIOS_INC = @ADIOS_FCFLAGS@
 ADIOS_LINK = @ADIOS_LIBS@
 
-FCCOMPILE_CHECK =@FCENV@ ${FC} ${FCFLAGS} $(FLAGS_CHECK) -I${SHARED} ${ADIOS_LINK}
-MPIFCCOMPILE_CHECK =@FCENV@ ${MPIFC} ${FCFLAGS} $(FLAGS_CHECK) -I${SHARED} ${ADIOS_LINK}
+FCCOMPILE_CHECK =@FCENV@ ${FC} ${FCFLAGS} $(FLAGS_CHECK) -I${SHARED} ${ADIOS_INC}
+MPIFCCOMPILE_CHECK =@FCENV@ ${MPIFC} ${FCFLAGS} $(FLAGS_CHECK) -I${SHARED} ${ADIOS_INC}
 @COND_MPI_TRUE at FCLINK = $(MPIFCCOMPILE_CHECK)
 @COND_MPI_FALSE at FCLINK = $(FCCOMPILE_CHECK)
 
@@ -210,25 +210,25 @@ $O/adios_helpers.shared_adios.o: \
 ###
 
 $O/%.adios.o: %.F90 ${SHARED}constants.h
-	${MPIFCCOMPILE_CHECK} -c $(ADIOS_INC) $(FCFLAGS) $(MPI_INCLUDES) -o $@ $<
+	${MPIFCCOMPILE_CHECK} -c $(MPI_INCLUDES) -o $@ $<
 
 $O/%.adios.o: %.f90 ${SHARED}constants.h
-	${MPIFCCOMPILE_CHECK} -c $(ADIOS_INC) $(FCFLAGS) $(MPI_INCLUDES) -o $@ $<
+	${MPIFCCOMPILE_CHECK} -c $(MPI_INCLUDES) -o $@ $<
 
 $O/%.noadios.o: %.F90 
-	${FC} -c -o $@ $<
+	${FCCOMPILE_CHECK} -c -o $@ $<
 
 $O/%.noadios.o: %.f90
-	${FC} -c -o $@ $<
+	${FCCOMPILE_CHECK} -c -o $@ $<
 
 $O/%.shared_noadios.o: ${SHARED}/%.f90
-	${FC} -c -o $@ $<
+	${FCCOMPILE_CHECK} -c -o $@ $<
 
 $O/%.shared_adios.o: ${SHARED}/%.f90 ${SHARED}/constants.h
-	${MPIFC} -c $(ADIOS_INC) $(FCFLAGS) $(MPI_INCLUDES) -o $@ $<
+	${MPIFCCOMPILE_CHECK} -c $(MPI_INCLUDES) -o $@ $<
 
 $O/%.shared_adios.o: ${SHARED}/%.F90 ${SHARED}/constants.h
-	${MPIFC} -c $(ADIOS_INC) $(FCFLAGS) $(MPI_INCLUDES) -o $@ $<
+	${MPIFCCOMPILE_CHECK} -c $(MPI_INCLUDES) -o $@ $<
 
 #######################################
 ###
diff --git a/src/shared/adios_helpers_definitions.f90 b/src/shared/adios_helpers_definitions.f90
index 69d7952..5009113 100644
--- a/src/shared/adios_helpers_definitions.f90
+++ b/src/shared/adios_helpers_definitions.f90
@@ -251,7 +251,7 @@ subroutine define_adios_byte_scalar (adios_group, group_size_inc, &
   integer(kind=8),  intent(in)     :: adios_group
   character(len=*), intent(in)     :: name, path
   integer(kind=8),  intent(inout)  :: group_size_inc
-  byte,     intent(in)             :: var
+  integer(kind=1),  intent(in)     :: var
   ! Local Variables
   integer(kind=8)                  :: varid ! dummy variable, adios use var name
 
diff --git a/src/specfem3D/Makefile.in b/src/specfem3D/Makefile.in
index 02979b3..b83d16c 100644
--- a/src/specfem3D/Makefile.in
+++ b/src/specfem3D/Makefile.in
@@ -317,7 +317,7 @@ COMBINE_VOL_DATA_OBJECTS += \
 # with configure: ./configure --with-adios ADIOS_CONFIG=..
 
 MPI_INCLUDES = @MPI_INCLUDES@
-ADIOS_INC = @ADIOS_FCFLAGS@ -I../../
+ADIOS_INC = @ADIOS_FCFLAGS@
 ADIOS_LINK = @ADIOS_LIBS@
 
 #@COND_ADIOS_TRUE at CPPFLAGS = @CPPFLAGS@
@@ -524,25 +524,25 @@ $O/adios_helpers.shared_adios.o: \
 ###
 
 $O/%.adios.o: %.F90
-	${MPIFCCOMPILE_CHECK} -c $(ADIOS_INC) $(FCFLAGS) $(MPI_INCLUDES) -o $@ $<
+	${MPIFCCOMPILE_CHECK} -c $(MPI_INCLUDES) -o $@ $<
 
 $O/%.adios.o: %.f90
-	${MPIFCCOMPILE_CHECK} -c $(ADIOS_INC) $(FCFLAGS) $(MPI_INCLUDES) -o $@ $<
+	${MPIFCCOMPILE_CHECK} -c $(MPI_INCLUDES) -o $@ $<
 
 $O/%.noadios.o: %.F90 
-	${FC} -c -o $@ $<
+	${FCCOMPILE_CHECK} -c -o $@ $<
 
 $O/%.noadios.o: %.f90 
-	${FC} -c -o $@ $<
+	${FCCOMPILE_CHECK} -c -o $@ $<
 
 $O/%.shared_noadios.o: ${SHARED}/%.f90
-	${FC} -c -o $@ $<
+	${FCCOMPILE_CHECK} -c -o $@ $<
 
 $O/%.shared_adios.o: ${SHARED}/%.f90 ${SHARED}/constants.h
-	${MPIFC} -c $(ADIOS_INC) $(FCFLAGS) $(MPI_INCLUDES) -o $@ $<
+	${MPIFCCOMPILE_CHECK} -c $(MPI_INCLUDES) -o $@ $<
 
 $O/%.shared_adios.o: ${SHARED}/%.F90 ${SHARED}/constants.h
-	${MPIFC} -c $(ADIOS_INC) $(FCFLAGS) $(MPI_INCLUDES) -o $@ $<
+	${MPIFCCOMPILE_CHECK} -c $(MPI_INCLUDES) -o $@ $<
 
 #######################################
 $O/%.o: %.f90 $(SHARED)constants.h

More information about the CIG-COMMITS mailing list