]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Some progress for contrib umfpack
authormaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Fri, 10 Aug 2012 10:02:52 +0000 (10:02 +0000)
committermaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Fri, 10 Aug 2012 10:02:52 +0000 (10:02 +0000)
git-svn-id: https://svn.dealii.org/branches/branch_cmake@25864 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/CMakeLists.txt
deal.II/contrib/cmake/modules/prepare_threads.cmake
deal.II/contrib/cmake/modules/prepare_umfpack.cmake
deal.II/contrib/umfpack/AMD/Source/CMakeLists.txt [new file with mode: 0644]
deal.II/contrib/umfpack/AMD/Source/Makefile [deleted file]
deal.II/contrib/umfpack/CMakeLists.txt [deleted file]
deal.II/contrib/umfpack/Makefile [deleted file]
deal.II/contrib/umfpack/UMFPACK/Source/CMakeLists.txt [new file with mode: 0644]
deal.II/contrib/umfpack/UMFPACK/Source/Makefile [deleted file]
deal.II/source/CMakeLists.txt

index 06e421facbf0bdfa136d4072839843179a3a2b01..c0cfc84210b9f8833f5e73678c42fdce6f000656 100644 (file)
@@ -14,7 +14,7 @@ SET(CMAKE_INCLUDE_CURRENT_DIR true)
 
 OPTION(DEAL_II_USE_CONTRIB
   "Build and use contrib libraries bundled with the source tarball."
-  ON
+  OFF
   )
 OPTION(DEAL_II_WITH_THREADS
   "Build deal.II with support for threads. This pulls in libtbb as a dependency."
index 1b958145b04794d53bc11477d8069c9124a45c6f..da77eb0825a5a7aa9693c9155ed86f9a257f221c 100644 (file)
@@ -1,14 +1,25 @@
 FIND_PACKAGE(Threads REQUIRED)
 
 IF(DEAL_II_USE_CONTRIB)
-  # Compiles and links libtbb, exports the TBB_* variables as well:
+  # compile and link the contrib tbb library:
   ADD_SUBDIRECTORY(contrib/tbb)
+
+  # This sets TBB_LIBRARY and TBB_DEBUG_LIBRARY to the full path of the
+  # _installed_ library location
+
 ELSE()
   FIND_PACKAGE(TBB REQUIRED)
 ENDIF()
 
 INCLUDE_DIRECTORIES(${TBB_INCLUDE_DIR})
 
+IF(NOT DEAL_II_USE_CONTRIB)
+  SET(deal_ii_include_paths
+    ${deal_ii_include_paths}
+    ${TBB_INCLUDE_DIR}
+    )
+ENDIF()
+
 SET(deal_ii_external_libraries
   ${deal_ii_external_libraries}
   ${TBB_LIBRARY}
index dffc0a9b9842d2651ca623e828915113a8f77498..8fd60cf01d02a4c42c0db5bb39c755f944952f74 100644 (file)
@@ -2,24 +2,45 @@ FIND_PACKAGE(LAPACK REQUIRED)
 FIND_PACKAGE(BLAS REQUIRED)
 
 IF(DEAL_II_USE_CONTRIB)
-  # Compiles and links libumfpack, exports the Umfpack_* variables as well:
-  ADD_SUBDIRECTORY(contrib/umfpack)
+  #
+  # Add umfpack and amd directly to the object files of deal.II
+  #
+
+  ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/contrib/umfpack/UMFPACK/Source)
+  ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/contrib/umfpack/AMD/Source)
+
+  INCLUDE_DIRECTORIES(
+    ${CMAKE_SOURCE_DIR}/contrib/umfpack/UMFPACK/Include
+    ${CMAKE_SOURCE_DIR}/contrib/umfpack/AMD/Include
+    )
+
+  SET(deal_ii_additional_object_files
+    ${deal_ii_additional_object_files}
+    $<TARGET_OBJECTS:obj_umfpack>
+    $<TARGET_OBJECTS:obj_amd>
+    )
 ELSE()
   FIND_PACKAGE(Umfpack REQUIRED)
   FIND_PACKAGE(AMD REQUIRED)
-ENDIF()
 
-INCLUDE_DIRECTORIES(${Umfpack_INCLUDE_DIR} ${AMD_INCLUDE_DIR})
+  INCLUDE_DIRECTORIES(${Umfpack_INCLUDE_DIR} ${AMD_INCLUDE_DIR})
 
-SET(deal_ii_external_libraries
-  ${deal_ii_external_libraries}
-  ${Umfpack_LIBRARY} ${AMD_LIBRARY} ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES}
-  )
+  #
+  # We skip *_INCLUDE_DIR because it is not needed for the use of the
+  # deal.II library
+  #
+
+  SET(deal_ii_external_libraries
+    ${deal_ii_external_libraries}
+    ${Umfpack_LIBRARY} ${AMD_LIBRARY} ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES}
+    )
+
+  SET(deal_ii_external_debug_libraries
+    ${deal_ii_external_debug_libraries}
+    ${Umfpack_LIBRARY} ${AMD_LIBRARY} ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES}
+    )
+ENDIF()
 
-SET(deal_ii_external_debug_libraries
-  ${deal_ii_external_debug_libraries}
-  ${Umfpack_LIBRARY} ${AMD_LIBRARY} ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES}
-  )
 
 SET(HAVE_LIBBLAS TRUE)
 SET(HAVE_LIBLAPACK TRUE)
diff --git a/deal.II/contrib/umfpack/AMD/Source/CMakeLists.txt b/deal.II/contrib/umfpack/AMD/Source/CMakeLists.txt
new file mode 100644 (file)
index 0000000..cab431a
--- /dev/null
@@ -0,0 +1,17 @@
+SET(src_amd
+  amd_1.c
+  amd_2.c
+  amd_aat.c
+  amd_control.c
+  amd_defaults.c
+  amd_dump.c
+  amd_global.c
+  amd_info.c
+  amd_order.c
+  amd_postorder.c
+  amd_post_tree.c
+  amd_preprocess.c
+  amd_valid.c
+  )
+
+ADD_LIBRARY(obj_amd OBJECT ${src_amd})
diff --git a/deal.II/contrib/umfpack/AMD/Source/Makefile b/deal.II/contrib/umfpack/AMD/Source/Makefile
deleted file mode 100644 (file)
index 8aebbe4..0000000
+++ /dev/null
@@ -1,40 +0,0 @@
-#-------------------------------------------------------------------------------
-# AMD Makefile for compiling on Unix systems (for GNU make only)
-#-------------------------------------------------------------------------------
-
-include ../../../../common/Make.global_options
-
-#-------------------------------------------------------------------------------
-# source files
-#-------------------------------------------------------------------------------
-
-AMD = amd_aat amd_1 amd_2 amd_dump amd_postorder amd_post_tree amd_defaults \
-       amd_order amd_control amd_info amd_valid amd_preprocess
-
-INC = ../Include/amd.h
-
-#-------------------------------------------------------------------------------
-# object files for each version
-#-------------------------------------------------------------------------------
-
-AMDI = $(addprefix $D/lib/contrib/umfpack/, $(addsuffix .$(OBJEXT), $(subst amd_,amd_i_,$(AMD))))
-AMDL = $(addprefix $D/lib/contrib/umfpack/, $(addsuffix .$(OBJEXT), $(subst amd_,amd_l_,$(AMD))))
-
-#-------------------------------------------------------------------------------
-# compile each int and long routine (with no real/complex version)
-#-------------------------------------------------------------------------------
-
-$D/lib/contrib/umfpack/amd_i_%.$(OBJEXT): amd_%.c $(INC)
-       @echo =====umfpack==========optimized====== $(<F)
-       @$(CC) $(CFLAGS.o) -I../Include -DDINT -c $< -o $@
-
-$D/lib/contrib/umfpack/amd_l_%.$(OBJEXT): amd_%.c $(INC)
-       @echo =====umfpack==========optimized====== $(<F)
-       @$(CC) $(CFLAGS.o) -I../Include -DDLONG -c $< -o $@
-
-$D/lib/contrib/umfpack/amd_global.$(OBJEXT): amd_global.c $(INC)
-       @echo =====umfpack==========optimized====== $(<F)
-       @$(CC) $(CFLAGS.o) -I../Include -c $< -o $@
-
-
-all: $(AMDI) $(AMDL) $D/lib/contrib/umfpack/amd_global.$(OBJEXT)
diff --git a/deal.II/contrib/umfpack/CMakeLists.txt b/deal.II/contrib/umfpack/CMakeLists.txt
deleted file mode 100644 (file)
index 8e69788..0000000
+++ /dev/null
@@ -1 +0,0 @@
-message( "Yo..." )
diff --git a/deal.II/contrib/umfpack/Makefile b/deal.II/contrib/umfpack/Makefile
deleted file mode 100644 (file)
index c37ae36..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-include ../../common/Make.global_options
-
-deplibs = 
-
-# for cygwin, lapack and other libraries are necessary to link with
-ifeq ($(findstring cygwin,$(TARGET)),cygwin)
-  deplibs = $(LIBS)
-endif
-
-
-# rules
-lib: AMD UMFPACK
-
-
-AMD:
-       cd AMD/Source ; $(MAKE) all
-
-UMFPACK:
-       cd UMFPACK/Source ; $(MAKE) all
-
-clean:
-
-
-.PHONY: AMD UMFPACK clean lib
diff --git a/deal.II/contrib/umfpack/UMFPACK/Source/CMakeLists.txt b/deal.II/contrib/umfpack/UMFPACK/Source/CMakeLists.txt
new file mode 100644 (file)
index 0000000..a2fc174
--- /dev/null
@@ -0,0 +1,87 @@
+SET(src_umfpack
+  umf_2by2.c
+  umf_analyze.c
+  umf_apply_order.c
+  umf_assemble.c
+  umf_blas3_update.c
+  umf_build_tuples.c
+  umf_colamd.c
+  umf_create_element.c
+  umf_dump.c
+  umf_extend_front.c
+  umf_free.c
+  umf_fsize.c
+  umf_garbage_collection.c
+  umf_get_memory.c
+  umf_grow_front.c
+  umf_init_front.c
+  umf_is_permutation.c
+  umf_kernel.c
+  umf_kernel_init.c
+  umf_kernel_wrapup.c
+  umf_local_search.c
+  umf_lsolve.c
+  umf_ltsolve.c
+  umf_malloc.c
+  umf_mem_alloc_element.c
+  umf_mem_alloc_head_block.c
+  umf_mem_alloc_tail_block.c
+  umf_mem_free_tail_block.c
+  umf_mem_init_memoryspace.c
+  umf_multicompile.c
+  umfpack_col_to_triplet.c
+  umfpack_defaults.c
+  umfpack_free_numeric.c
+  umfpack_free_symbolic.c
+  umfpack_get_determinant.c
+  umfpack_get_lunz.c
+  umfpack_get_numeric.c
+  umfpack_get_symbolic.c
+  umfpack_global.c
+  umfpack_load_numeric.c
+  umfpack_load_symbolic.c
+  umfpack_numeric.c
+  umfpack_qsymbolic.c
+  umfpack_report_control.c
+  umfpack_report_info.c
+  umfpack_report_matrix.c
+  umfpack_report_numeric.c
+  umfpack_report_perm.c
+  umfpack_report_status.c
+  umfpack_report_symbolic.c
+  umfpack_report_triplet.c
+  umfpack_report_vector.c
+  umfpack_save_numeric.c
+  umfpack_save_symbolic.c
+  umfpack_scale.c
+  umfpack_solve.c
+  umfpack_symbolic.c
+  umfpack_tictoc.c
+  umfpack_timer.c
+  umfpack_transpose.c
+  umfpack_triplet_to_col.c
+  umf_realloc.c
+  umf_report_perm.c
+  umf_report_vector.c
+  umf_row_search.c
+  umf_scale.c
+  umf_scale_column.c
+  umf_set_stats.c
+  umf_singletons.c
+  umf_solve.c
+  umf_start_front.c
+  umf_store_lu.c
+  umf_symbolic_usage.c
+  umf_transpose.c
+  umf_triplet.c
+  umf_tuple_lengths.c
+  umf_usolve.c
+  umf_utsolve.c
+  umf_valid_numeric.c
+  umf_valid_symbolic.c
+  )
+
+#
+# TODO: This would be way too easy...
+#       We must set also set a lot of DEFINES via TARGET_PROPERTIES
+ADD_LIBRARY(obj_umfpack OBJECT ${src_umfpack})
diff --git a/deal.II/contrib/umfpack/UMFPACK/Source/Makefile b/deal.II/contrib/umfpack/UMFPACK/Source/Makefile
deleted file mode 100644 (file)
index 9977c20..0000000
+++ /dev/null
@@ -1,193 +0,0 @@
-#-------------------------------------------------------------------------------
-# UMFPACK Makefile for compiling on Unix systems (for GNU Make)
-#-------------------------------------------------------------------------------
-
-include ../../../../common/Make.global_options
-
-#-------------------------------------------------------------------------------
-# source files
-#-------------------------------------------------------------------------------
-
-# non-user-callable umf_*.[ch] files:
-UMFCH = umf_assemble umf_blas3_update umf_build_tuples umf_create_element \
-       umf_dump umf_extend_front umf_garbage_collection umf_get_memory \
-       umf_init_front umf_kernel umf_kernel_init umf_kernel_wrapup \
-       umf_local_search umf_lsolve umf_ltsolve umf_mem_alloc_element \
-       umf_mem_alloc_head_block umf_mem_alloc_tail_block \
-       umf_mem_free_tail_block umf_mem_init_memoryspace \
-       umf_report_vector umf_row_search umf_scale_column \
-       umf_set_stats umf_solve umf_symbolic_usage umf_transpose \
-       umf_tuple_lengths umf_usolve umf_utsolve umf_valid_numeric \
-       umf_valid_symbolic umf_grow_front umf_start_front umf_2by2 \
-       umf_store_lu umf_scale
-
-# non-user-callable umf_*.[ch] files, int/long versions only (no real/complex):
-UMFINT = umf_analyze umf_apply_order umf_colamd umf_free umf_fsize \
-       umf_is_permutation umf_malloc umf_realloc umf_report_perm \
-       umf_singletons
-
-# non-user-callable, created from umf_ltsolve.c, umf_utsolve.c,
-# umf_triplet.c, and umf_assemble.c , with int/long and real/complex versions:
-UMF_CREATED = umf_lhsolve umf_uhsolve umf_triplet_map_nox \
-       umf_triplet_nomap_x umf_triplet_nomap_nox umf_triplet_map_x \
-       umf_assemble_fixq umf_store_lu_drop
-
-# non-user-callable, int/long and real/complex versions:
-UMF = $(UMF_CREATED) $(UMFCH)
-
-# user-callable umfpack_*.[ch] files (int/long and real/complex):
-UMFPACK = umfpack_col_to_triplet umfpack_defaults umfpack_free_numeric \
-       umfpack_free_symbolic umfpack_get_numeric umfpack_get_lunz \
-       umfpack_get_symbolic umfpack_numeric umfpack_qsymbolic \
-       umfpack_report_control umfpack_report_info umfpack_report_matrix \
-       umfpack_report_numeric umfpack_report_perm umfpack_report_status \
-       umfpack_report_symbolic umfpack_report_triplet \
-       umfpack_report_vector umfpack_solve umfpack_symbolic \
-       umfpack_transpose umfpack_triplet_to_col umfpack_scale \
-       umfpack_load_numeric umfpack_save_numeric \
-       umfpack_load_symbolic umfpack_save_symbolic
-
-# user-callable, created from umfpack_solve.c (umfpack_wsolve.h exists, though):
-# with int/long and real/complex versions:
-UMFPACKW = umfpack_wsolve
-
-USER = $(UMFPACKW) $(UMFPACK)
-
-# user-callable, only one version for int/long, real/complex, *.[ch] files:
-GENERIC = umfpack_timer umfpack_tictoc
-
-#-------------------------------------------------------------------------------
-# include files:
-#-------------------------------------------------------------------------------
-
-INC = ../Include/umfpack.h \
-       umf_config.h umf_version.h umf_internal.h umf_triplet.h \
-       $(addsuffix .h,$(UMFCH)) \
-       $(addsuffix .h,$(UMFINT)) \
-       $(addprefix ../Include/, $(addsuffix .h,$(USER))) \
-       $(addprefix ../Include/, $(addsuffix .h,$(GENERIC))) \
-       ../../AMD/Include/amd_internal.h ../../AMD/Include/amd.h
-
-#-------------------------------------------------------------------------------
-# object files for each version
-#-------------------------------------------------------------------------------
-
-DI = $(addprefix $D/lib/contrib/umfpack/, $(addsuffix .$(OBJEXT), $(subst umf_,umf_di_,$(UMF)) $(subst umfpack_,umfpack_di_,$(USER))))
-DL = $(addprefix $D/lib/contrib/umfpack/, $(addsuffix .$(OBJEXT), $(subst umf_,umf_dl_,$(UMF)) $(subst umfpack_,umfpack_dl_,$(USER))))
-I  = $(addprefix $D/lib/contrib/umfpack/, $(addsuffix .$(OBJEXT), $(subst umf_,umf_i_,$(UMFINT))))
-L  = $(addprefix $D/lib/contrib/umfpack/, $(addsuffix .$(OBJEXT), $(subst umf_,umf_l_,$(UMFINT))))
-GN = $(addprefix $D/lib/contrib/umfpack/, $(addsuffix .$(OBJEXT), $(subst umfpack_,umfpack_gn_,$(GENERIC))))
-
-#-------------------------------------------------------------------------------
-# compile each int and long routine (with no real/complex version)
-#-------------------------------------------------------------------------------
-
-$D/lib/contrib/umfpack/umf_i_%.$(OBJEXT): umf_%.c $(INC)
-       @echo =====umfpack==========optimized====== $(<F)
-       @$(CC) $(CFLAGS.o) -I../Include -I../../AMD/Include -I../../AMD/Source -DDINT -c $< -o $@
-
-$D/lib/contrib/umfpack/umf_l_%.$(OBJEXT): umf_%.c $(INC)
-       @echo =====umfpack==========optimized====== $(<F)
-       @$(CC) $(CFLAGS.o) -I../Include -I../../AMD/Include -I../../AMD/Source -DDLONG -c $< -o $@
-
-#-------------------------------------------------------------------------------
-# compile each routine in the DI version
-#-------------------------------------------------------------------------------
-
-$D/lib/contrib/umfpack/umf_di_%.$(OBJEXT): umf_%.c $(INC)
-       @echo =====umfpack==========optimized====== $(<F)
-       @$(CC) $(CFLAGS.o) -I../Include -I../../AMD/Include -I../../AMD/Source -DDINT -c $< -o $@
-
-$D/lib/contrib/umfpack/umf_di_%hsolve.$(OBJEXT): umf_%tsolve.c $(INC)
-       @echo =====umfpack==========optimized====== $(<F)
-       @$(CC) $(CFLAGS.o) -I../Include -I../../AMD/Include -I../../AMD/Source -DDINT -DCONJUGATE_SOLVE -c $< -o $@
-
-$D/lib/contrib/umfpack/umf_di_triplet_map_x.$(OBJEXT): umf_triplet.c $(INC)
-       @echo =====umfpack==========optimized====== $(<F)
-       @$(CC) $(CFLAGS.o) -I../Include -I../../AMD/Include -I../../AMD/Source -DDINT -DDO_MAP -DDO_VALUES -c $< -o $@
-
-$D/lib/contrib/umfpack/umf_di_triplet_map_nox.$(OBJEXT): umf_triplet.c $(INC)
-       @echo =====umfpack==========optimized====== $(<F)
-       @$(CC) $(CFLAGS.o) -I../Include -I../../AMD/Include -I../../AMD/Source -DDINT -DDO_MAP -c $< -o $@
-
-$D/lib/contrib/umfpack/umf_di_triplet_nomap_x.$(OBJEXT): umf_triplet.c $(INC)
-       @echo =====umfpack==========optimized====== $(<F)
-       @$(CC) $(CFLAGS.o) -I../Include -I../../AMD/Include -I../../AMD/Source -DDINT -DDO_VALUES -c $< -o $@
-
-$D/lib/contrib/umfpack/umf_di_triplet_nomap_nox.$(OBJEXT): umf_triplet.c $(INC)
-       @echo =====umfpack==========optimized====== $(<F)
-       @$(CC) $(CFLAGS.o) -I../Include -I../../AMD/Include -I../../AMD/Source -DDINT -c $< -o $@
-
-$D/lib/contrib/umfpack/umf_di_assemble_fixq.$(OBJEXT): umf_assemble.c $(INC)
-       @echo =====umfpack==========optimized====== $(<F)
-       @$(CC) $(CFLAGS.o) -I../Include -I../../AMD/Include -I../../AMD/Source -DDINT -DFIXQ -c $< -o $@
-
-$D/lib/contrib/umfpack/umf_di_store_lu_drop.$(OBJEXT): umf_store_lu.c $(INC)
-       @echo =====umfpack==========optimized====== $(<F)
-       @$(CC) $(CFLAGS.o) -I../Include -I../../AMD/Include -I../../AMD/Source -DDINT -DDROP -c $< -o $@
-
-$D/lib/contrib/umfpack/umfpack_di_wsolve.$(OBJEXT): umfpack_solve.c $(INC)
-       @echo =====umfpack==========optimized====== $(<F)
-       @$(CC) $(CFLAGS.o) -I../Include -I../../AMD/Include -I../../AMD/Source -DDINT -DWSOLVE -c $< -o $@
-
-$D/lib/contrib/umfpack/umfpack_di_%.$(OBJEXT): umfpack_%.c $(INC)
-       @echo =====umfpack==========optimized====== $(<F)
-       @$(CC) $(CFLAGS.o) -I../Include -I../../AMD/Include -I../../AMD/Source -DDINT -c $< -o $@
-
-#-------------------------------------------------------------------------------
-# compile each routine in the DL version
-#-------------------------------------------------------------------------------
-
-$D/lib/contrib/umfpack/umf_dl_%.$(OBJEXT): umf_%.c $(INC)
-       @echo =====umfpack==========optimized====== $(<F)
-       @$(CC) $(CFLAGS.o) -I../Include -I../../AMD/Include -I../../AMD/Source -DDLONG -c $< -o $@
-
-$D/lib/contrib/umfpack/umf_dl_%hsolve.$(OBJEXT): umf_%tsolve.c $(INC)
-       @echo =====umfpack==========optimized====== $(<F)
-       @$(CC) $(CFLAGS.o) -I../Include -I../../AMD/Include -I../../AMD/Source -DDLONG -DCONJUGATE_SOLVE -c $< -o $@
-
-$D/lib/contrib/umfpack/umf_dl_triplet_map_x.$(OBJEXT): umf_triplet.c $(INC)
-       @echo =====umfpack==========optimized====== $(<F)
-       @$(CC) $(CFLAGS.o) -I../Include -I../../AMD/Include -I../../AMD/Source -DDLONG -DDO_MAP -DDO_VALUES -c $< -o $@
-
-$D/lib/contrib/umfpack/umf_dl_triplet_map_nox.$(OBJEXT): umf_triplet.c $(INC)
-       @echo =====umfpack==========optimized====== $(<F)
-       @$(CC) $(CFLAGS.o) -I../Include -I../../AMD/Include -I../../AMD/Source -DDLONG -DDO_MAP -c $< -o $@
-
-$D/lib/contrib/umfpack/umf_dl_triplet_nomap_x.$(OBJEXT): umf_triplet.c $(INC)
-       @echo =====umfpack==========optimized====== $(<F)
-       @$(CC) $(CFLAGS.o) -I../Include -I../../AMD/Include -I../../AMD/Source -DDLONG -DDO_VALUES -c $< -o $@
-
-$D/lib/contrib/umfpack/umf_dl_triplet_nomap_nox.$(OBJEXT): umf_triplet.c $(INC)
-       @echo =====umfpack==========optimized====== $(<F)
-       @$(CC) $(CFLAGS.o) -I../Include -I../../AMD/Include -I../../AMD/Source -DDLONG -c $< -o $@
-
-$D/lib/contrib/umfpack/umf_dl_assemble_fixq.$(OBJEXT): umf_assemble.c $(INC)
-       @echo =====umfpack==========optimized====== $(<F)
-       @$(CC) $(CFLAGS.o) -I../Include -I../../AMD/Include -I../../AMD/Source -DDLONG -DFIXQ -c $< -o $@
-
-$D/lib/contrib/umfpack/umf_dl_store_lu_drop.$(OBJEXT): umf_store_lu.c $(INC)
-       @echo =====umfpack==========optimized====== $(<F)
-       @$(CC) $(CFLAGS.o) -I../Include -I../../AMD/Include -I../../AMD/Source -DDLONG -DDROP -c $< -o $@
-
-$D/lib/contrib/umfpack/umfpack_dl_wsolve.$(OBJEXT): umfpack_solve.c $(INC)
-       @echo =====umfpack==========optimized====== $(<F)
-       @$(CC) $(CFLAGS.o) -I../Include -I../../AMD/Include -I../../AMD/Source -DDLONG -DWSOLVE -c $< -o $@
-
-$D/lib/contrib/umfpack/umfpack_dl_%.$(OBJEXT): umfpack_%.c $(INC)
-       @echo =====umfpack==========optimized====== $(<F)
-       @$(CC) $(CFLAGS.o) -I../Include -I../../AMD/Include -I../../AMD/Source -DDLONG -c $< -o $@
-
-#-------------------------------------------------------------------------------
-# Create the generic routines (GN) using a generic rule
-#-------------------------------------------------------------------------------
-
-$D/lib/contrib/umfpack/umfpack_gn_%.$(OBJEXT): umfpack_%.c $(INC)
-       @echo =====umfpack==========optimized====== $(<F)
-       @$(CC) $(CFLAGS.o) -I../Include -I../../AMD/Include -I../../AMD/Source -c $< -o $@
-
-#-------------------------------------------------------------------------------
-# Create the libumfpack.a library
-#-------------------------------------------------------------------------------
-
-all: $(I) $(L) $(GN) $(DI) $(DL)
index 5f77721944aed000b1165c641c228f195d76c35f..2060862131f6be38a4e0331440dd941c74c5b0f5 100644 (file)
@@ -18,4 +18,7 @@ ADD_LIBRARY(deal_II SHARED
  $<TARGET_OBJECTS:obj_lac>
  $<TARGET_OBJECTS:obj_multigrid>
  $<TARGET_OBJECTS:obj_numerics>
+ ${deal_ii_additional_object_files}
  )
+
+ message( "${deal_ii_additional_object_files}" )

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.