[cig-commits] [commit] QA: build: Fix dependencies for ADIOS objects. (a8a0044)

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

Repository : ssh://geoshell/specfem3d

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

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

commit a8a0044ba891b5de4f9932a2a99dbf198cd3c9b7
Author: Elliott Sales de Andrade <esalesde at physics.utoronto.ca>
Date:   Sat Jan 18 00:43:32 2014 -0500

    build: Fix dependencies for ADIOS objects.
    
    I accidentally used ADIOS_PRESTUBS instead of ADIOS_PREOBJECTS, which
    obviously uses the wrong object when building with ADIOS enabled.


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

a8a0044ba891b5de4f9932a2a99dbf198cd3c9b7
 src/generate_databases/Makefile.in | 16 ++++++++++------
 src/meshfem3D/Makefile.in          |  6 +++++-
 src/specfem3D/Makefile.in          | 30 +++++++++++++++++++-----------
 3 files changed, 34 insertions(+), 18 deletions(-)

diff --git a/src/generate_databases/Makefile.in b/src/generate_databases/Makefile.in
index 85d5c86..3d495a8 100644
--- a/src/generate_databases/Makefile.in
+++ b/src/generate_databases/Makefile.in
@@ -230,13 +230,13 @@ $O/model_1d_socal.o: $O/generate_databases_par.o
 $O/model_default.o: $O/generate_databases_par.o
 $O/model_external_values.o: $O/generate_databases_par.o
 $O/model_gll.o: $O/generate_databases_par.o
-$O/model_gll_adios.o: $O/generate_databases_par.o
+$O/model_gll_adios.adios.o: $O/generate_databases_par.o
 $O/model_ipati.o: $O/generate_databases_par.o
-$O/model_ipati_adios.o: $O/generate_databases_par.o
+$O/model_ipati_adios.adios.o: $O/generate_databases_par.o
 $O/model_salton_trough.o: $O/generate_databases_par.o
 $O/pml_set_local_dampingcoeff.o: $O/generate_databases_par.o
 $O/read_partition_files.o: $O/generate_databases_par.o
-$O/read_partition_files_adios.o: $O/generate_databases_par.o
+$O/read_partition_files_adios.adios.o: $O/generate_databases_par.o
 $O/save_arrays_solver.o: $O/generate_databases_par.o
 $O/setup_color_perm.o: $O/generate_databases_par.o
 $O/setup_mesh.o: $O/generate_databases_par.o
@@ -246,10 +246,14 @@ $O/create_regions_mesh.o: $O/generate_databases_par.o $O/fault_generate_database
 $O/model_tomography.o: $O/generate_databases_par.o $O/tomography_par.o
 
 $O/generate_databases.o: $O/generate_databases_par.o $(ADIOS_PREOBJECTS)
-$O/save_arrays_solver_adios.o: $O/generate_databases_par.o $(ADIOS_PREOBJECTS)
-$O/save_moho_adios.o: $O/generate_databases_par.o $(ADIOS_PREOBJECTS)
+$O/save_arrays_solver_adios.adios.o: $O/generate_databases_par.o $(ADIOS_PREOBJECTS)
+$O/save_moho_adios.adios.o: $O/generate_databases_par.o $(ADIOS_PREOBJECTS)
 
-$O/generate_databases_adios_stubs.o: $(ADIOS_PREOBJECTS)
+$O/generate_databases_adios_stubs.noadios.o: $(ADIOS_PRESTUBS)
+
+$O/adios_helpers.shared_adios.o: \
+	$O/adios_helpers_definitions.shared_adios.o \
+	$O/adios_helpers_writers.shared_adios.o
 
 ###
 ### ADIOS compilation
diff --git a/src/meshfem3D/Makefile.in b/src/meshfem3D/Makefile.in
index 0e600b5..80e5648 100644
--- a/src/meshfem3D/Makefile.in
+++ b/src/meshfem3D/Makefile.in
@@ -198,9 +198,13 @@ $L/libmeshfem.a: $(libmeshfem_a_OBJECTS)
 
 $O/meshfem3D_adios_stubs.o: $O/adios_manager_stubs.shared_noadios.o
 $O/meshfem3D.o: $O/create_regions_mesh.o $O/read_mesh_parameter_file.o
-$O/save_databases.o: $O/safe_alloc_mod.shared.o $(ADIOS_PREOBJECTS)
+$O/save_databases_adios.adios.o: $O/safe_alloc_mod.shared.o $(ADIOS_PREOBJECTS)
 $O/create_regions_mesh.o: $(ADIOS_PREOBJECTS)
 
+$O/adios_helpers.shared_adios.o: \
+	$O/adios_helpers_definitions.shared_adios.o \
+	$O/adios_helpers_writers.shared_adios.o
+
 ###
 ### ADIOS compilation
 ###
diff --git a/src/specfem3D/Makefile.in b/src/specfem3D/Makefile.in
index 7e79791..8554e53 100644
--- a/src/specfem3D/Makefile.in
+++ b/src/specfem3D/Makefile.in
@@ -298,15 +298,15 @@ ADIOS_STUBS = \
 
 
 @COND_ADIOS_TRUE at COMBINE_VOL_DATA_OBJECTS = \
-	$O/combine_vol_data_adios_impl.shared_adios.o 
+	$O/combine_vol_data_adios_impl.shared_adios.o \
+	$O/combine_vol_data.shared_adios.o
 @COND_ADIOS_FALSE at COMBINE_VOL_DATA_OBJECTS = \
 	$O/adios_manager_stubs.shared_noadios.o \
-	$O/combine_vol_data_adios_stubs.shared_noadios.o 
-
+	$O/combine_vol_data_adios_stubs.shared_noadios.o \
+	$O/combine_vol_data.shared_noadios.o
 
 COMBINE_VOL_DATA_OBJECTS += \
 	$O/combine_vol_data_impl.shared.o \
-	$O/combine_vol_data.shared_adios.o \
 	$O/write_c_binary.cc.o \
 	$O/read_parameter_file.shared.o \
 	$O/read_value_parameters.shared.o \
@@ -481,8 +481,8 @@ $O/pml_allocate_arrays.o: $O/specfem3D_par.o $O/pml_par.o
 $O/pml_compute_accel_contribution.o: $O/specfem3D_par.o $O/pml_par.o
 $O/pml_compute_memory_variables.o: $O/specfem3D_par.o $O/pml_par.o
 $O/pml_output_VTKs.o: $O/specfem3D_par.o $O/pml_par.o
-$O/read_forward_arrays_adios.o: $O/specfem3D_par.o $O/pml_par.o
-$O/read_mesh_databases_adios.o: $O/specfem3D_par.o $O/pml_par.o
+$O/read_forward_arrays_adios.adios.o: $O/specfem3D_par.o $O/pml_par.o
+$O/read_mesh_databases_adios.adios.o: $O/specfem3D_par.o $O/pml_par.o
 $O/read_mesh_databases.o: $O/specfem3D_par.o $O/pml_par.o
 $O/update_displacement_scheme.o: $O/specfem3D_par.o $O/pml_par.o
 
@@ -498,14 +498,22 @@ $O/iterate_time.o: $O/specfem3D_par.o $O/gravity_perturbation.o
 
 $O/prepare_timerun.o: $O/specfem3D_par.o $O/pml_par.o $O/fault_solver_dynamic.o $O/fault_solver_kinematic.o $O/gravity_perturbation.o
 
-$O/initialize_simulation.o: $O/specfem3D_par.o $(ADIOS_PRESTUBS)
-$O/save_kernels_adios.o: $O/specfem3D_par.o $(ADIOS_PRESTUBS)
+$O/initialize_simulation.o: $O/specfem3D_par.o $(ADIOS_PREOBJECTS)
+$O/save_kernels_adios.adios.o: $O/specfem3D_par.o $(ADIOS_PREOBJECTS)
+
+$O/save_forward_arrays_adios.adios.o: $O/specfem3D_par.o $O/pml_par.o $(ADIOS_PREOBJECTS)
 
-$O/save_forward_arrays_adios.o: $O/specfem3D_par.o $O/pml_par.o $(ADIOS_PRESTUBS)
+$O/finalize_simulation.o: $O/specfem3D_par.o $O/pml_par.o $O/gravity_perturbation.o $(ADIOS_PREOBJECTS)
 
-$O/finalize_simulation.o: $O/specfem3D_par.o $O/pml_par.o $O/gravity_perturbation.o $(ADIOS_PRESTUBS)
+$O/specfem3D_adios_stubs.noadios.o: $O/adios_manager_stubs.shared_noadios.o
 
-$O/specfem3D_adios_stubs.o: $O/adios_manager_stubs.shared_noadios.o
+$O/combine_vol_data_adios_stubs.shared_noadios.o: $O/adios_manager_stubs.shared_noadios.o
+$O/combine_vol_data.shared_adios.o: $O/combine_vol_data_impl.shared.o $O/combine_vol_data_adios_impl.shared_adios.o
+$O/combine_vol_data.shared_noadios.o: $O/combine_vol_data_impl.shared.o $O/combine_vol_data_adios_stubs.shared_noadios.o
+
+$O/adios_helpers.shared_adios.o: \
+	$O/adios_helpers_definitions.shared_adios.o \
+	$O/adios_helpers_writers.shared_adios.o
 
 ###
 ### optimized flags (not dependent on values from mesher anymore)

More information about the CIG-COMMITS mailing list