[cig-commits] r22949 - in seismo/3D/SPECFEM3D_GLOBE/trunk/src: meshfem3D shared specfem3D
elliott.sales.de.andrade at geodynamics.org
elliott.sales.de.andrade at geodynamics.org
Tue Oct 8 00:13:34 PDT 2013
Author: elliott.sales.de.andrade
Date: 2013-10-08 00:13:34 -0700 (Tue, 08 Oct 2013)
New Revision: 22949
Modified:
seismo/3D/SPECFEM3D_GLOBE/trunk/src/meshfem3D/rules.mk
seismo/3D/SPECFEM3D_GLOBE/trunk/src/shared/rules.mk
seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/rules.mk
Log:
build: Rename clashing variable names in Makefiles.
Since rules.mk is included into the main Makefile, it's as if they are
all one file. Because of the way recursive variables work (expand at
last use, not first), it's important not to have variable names that
clash. In this case, we'd only get the last-set ADIOS files in our
targets (which would be xspecfem3D's objects, even for xmeshfem3D).
Daniel already updated some names so that they don't clash, but I think
it's better to make sure the rest all conform to the same naming scheme.
Modified: seismo/3D/SPECFEM3D_GLOBE/trunk/src/meshfem3D/rules.mk
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/trunk/src/meshfem3D/rules.mk 2013-10-08 07:13:28 UTC (rev 22948)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/src/meshfem3D/rules.mk 2013-10-08 07:13:34 UTC (rev 22949)
@@ -210,10 +210,10 @@
$O/adios_manager.shared_adios.o \
$(EMPTY_MACRO)
-adios_STUBS = \
+adios_meshfem3D_STUBS = \
$(EMPTY_MACRO)
-adios_SHARED_STUBS = \
+adios_meshfem3D_SHARED_STUBS = \
$O/adios_method_stubs.shared.o \
$(EMPTY_MACRO)
@@ -222,8 +222,8 @@
meshfem3D_OBJECTS += $(adios_meshfem3D_OBJECTS)
meshfem3D_SHARED_OBJECTS += $(adios_meshfem3D_SHARED_OBJECTS)
else
-meshfem3D_OBJECTS += $(adios_STUBS)
-meshfem3D_SHARED_OBJECTS += $(adios_SHARED_STUBS)
+meshfem3D_OBJECTS += $(adios_meshfem3D_STUBS)
+meshfem3D_SHARED_OBJECTS += $(adios_meshfem3D_SHARED_STUBS)
endif
#######################################
Modified: seismo/3D/SPECFEM3D_GLOBE/trunk/src/shared/rules.mk
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/trunk/src/shared/rules.mk 2013-10-08 07:13:28 UTC (rev 22948)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/src/shared/rules.mk 2013-10-08 07:13:34 UTC (rev 22949)
@@ -77,28 +77,28 @@
$(FC_MODDIR)/shared_parameters.$(FC_MODEXT) \
$(EMPTY_MACRO)
-ADIOS_OBJECTS = \
+adios_shared_OBJECTS = \
$O/adios_helpers_definitions.shared_adios_module.o \
$O/adios_helpers_writers.shared_adios_module.o \
$O/adios_helpers.shared_adios.o \
$O/adios_manager.shared_adios.o \
$(EMPTY_MACRO)
-ADIOS_MODULES = \
+adios_shared_MODULES = \
$(FC_MODDIR)/adios_helpers_definitions_mod.$(FC_MODEXT) \
$(FC_MODDIR)/adios_helpers_mod.$(FC_MODEXT) \
$(FC_MODDIR)/adios_helpers_writers_mod.$(FC_MODEXT) \
$(EMPTY_MACRO)
-ADIOS_STUBS = \
+adios_shared_STUBS = \
$O/adios_method_stubs.shared.o \
$(EMPTY_MACRO)
ifeq ($(ADIOS),yes)
-shared_OBJECTS += $(ADIOS_OBJECTS)
-shared_MODULES += $(ADIOS_MODULES)
+shared_OBJECTS += $(adios_shared_OBJECTS)
+shared_MODULES += $(adios_shared_MODULES)
else
-shared_OBJECTS += $(ADIOS_STUBS)
+shared_OBJECTS += $(adios_shared_STUBS)
endif
#######################################
Modified: seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/rules.mk
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/rules.mk 2013-10-08 07:13:28 UTC (rev 22948)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/rules.mk 2013-10-08 07:13:34 UTC (rev 22949)
@@ -151,7 +151,7 @@
### CUDA
###
-cuda_OBJECTS = \
+cuda_specfem3D_OBJECTS = \
$O/assemble_MPI_scalar_cuda.cuda.o \
$O/assemble_MPI_vector_cuda.cuda.o \
$O/check_fields_cuda.cuda.o \
@@ -172,28 +172,28 @@
$O/save_and_compare_cpu_vs_gpu.cudacc.o \
$(EMPTY_MACRO)
-cuda_STUBS = \
+cuda_specfem3D_STUBS = \
$O/specfem3D_gpu_cuda_method_stubs.cudacc.o \
$(EMPTY_MACRO)
-cuda_DEVICE_OBJ = \
+cuda_specfem3D_DEVICE_OBJ = \
$O/cuda_device_obj.o \
$(EMPTY_MACRO)
ifeq ($(CUDA),yes)
-specfem3D_OBJECTS += $(cuda_OBJECTS)
+specfem3D_OBJECTS += $(cuda_specfem3D_OBJECTS)
ifeq ($(CUDA5),yes)
-specfem3D_OBJECTS += $(cuda_DEVICE_OBJ)
+specfem3D_OBJECTS += $(cuda_specfem3D_DEVICE_OBJ)
endif
else
-specfem3D_OBJECTS += $(cuda_STUBS)
+specfem3D_OBJECTS += $(cuda_specfem3D_STUBS)
endif
###
### ADIOS
###
-adios_OBJECTS = \
+adios_specfem3D_OBJECTS = \
$O/read_arrays_solver_adios.solverstatic_adios.o \
$O/read_attenuation_adios.solverstatic_adios.o \
$O/read_forward_arrays_adios.solverstatic_adios.o \
@@ -203,46 +203,46 @@
$O/write_specfem_adios_header.solverstatic_adios.o \
$(EMPTY_MACRO)
-adios_SHARED_OBJECTS = \
+adios_specfem3D_SHARED_OBJECTS = \
$O/adios_helpers_definitions.shared_adios_module.o \
$O/adios_helpers_writers.shared_adios_module.o \
$O/adios_helpers.shared_adios.o \
$O/adios_manager.shared_adios.o \
$(EMPTY_MACRO)
-adios_STUBS = \
+adios_specfem3D_STUBS = \
$(EMPTY_MACRO)
-adios_SHARED_STUBS = \
+adios_specfem3D_SHARED_STUBS = \
$O/adios_method_stubs.shared.o \
$(EMPTY_MACRO)
# conditional adios linking
ifeq ($(ADIOS),yes)
-specfem3D_OBJECTS += $(adios_OBJECTS)
-specfem3D_SHARED_OBJECTS += $(adios_SHARED_OBJECTS)
+specfem3D_OBJECTS += $(adios_specfem3D_OBJECTS)
+specfem3D_SHARED_OBJECTS += $(adios_specfem3D_SHARED_OBJECTS)
else
-specfem3D_OBJECTS += $(adios_STUBS)
-specfem3D_SHARED_OBJECTS += $(adios_SHARED_STUBS)
+specfem3D_OBJECTS += $(adios_specfem3D_STUBS)
+specfem3D_SHARED_OBJECTS += $(adios_specfem3D_SHARED_STUBS)
endif
###
### VTK
###
-vtk_OBJECTS = \
+vtk_specfem3D_OBJECTS = \
$O/visual_vtk.visualcc.o \
$(EMPTY_MACRO)
-vtk_STUBS = \
+vtk_specfem3D_STUBS = \
$O/visual_vtk_stubs.visualc.o \
$(EMPTY_MACRO)
# conditional adios linking
ifeq ($(VTK),yes)
-specfem3D_OBJECTS += $(vtk_OBJECTS)
+specfem3D_OBJECTS += $(vtk_specfem3D_OBJECTS)
else
-specfem3D_OBJECTS += $(vtk_STUBS)
+specfem3D_OBJECTS += $(vtk_specfem3D_STUBS)
endif
@@ -262,7 +262,7 @@
@echo ""
@echo "building xspecfem3D with CUDA 5 support"
@echo ""
- ${NVCCLINK} -o $(cuda_DEVICE_OBJ) $(cuda_OBJECTS)
+ ${NVCCLINK} -o $(cuda_specfem3D_DEVICE_OBJ) $(cuda_OBJECTS)
${FCLINK} -o ${E}/xspecfem3D $(specfem3D_OBJECTS) $(specfem3D_SHARED_OBJECTS) $(LDFLAGS) $(MPILIBS) $(CUDA_LINK) $(LIBS)
@echo ""
More information about the CIG-COMMITS
mailing list