AMD: Avoid stubs in favor of object libraries.

Avoid the stub files that were used to build objects for the int64_t interface. Instead, use object libraries that build the same source files once with `DLONG` and once without it. This also avoids building all objects twice (for the shared and the static library), effectively reducing the build time approximately by a factor of two.
DrTimothyAldenDavis · Oct 17, 2024 · d381f4d · d381f4d
1 parent 39c23ae
commit d381f4d
Show file tree

Hide file tree

Showing 13 changed files with 23 additions and 168 deletions.
diff --git a/AMD/CMakeLists.txt b/AMD/CMakeLists.txt
@@ -72,17 +72,29 @@ configure_file ( "Config/amd_version.tex.in" "${PROJECT_SOURCE_DIR}/Doc/amd_vers
 include_directories ( Source Include )
 
 #-------------------------------------------------------------------------------
-# dynamic amd library properties
+# object libraries for int32_t and int64_t
 #-------------------------------------------------------------------------------
 
+file ( GLOB AMD_C_SOURCES "Source/*.c" )
+# exclude amd_version.c because there is no int64_t variant of it
+file ( GLOB AMD_VERSION_C_SOURCE "Source/amd_version.c" )
+list ( REMOVE_ITEM AMD_C_SOURCES ${AMD_VERSION_C_SOURCE} )
+
 if ( SUITESPARSE_HAS_FORTRAN )
-    file ( GLOB AMD_SOURCES "Source/*.c" "Source/*.f" )
-else ( )
-    file ( GLOB AMD_SOURCES "Source/*.c" )
+    file ( GLOB AMD_F_SOURCES "Source/*.f" )
 endif ( )
 
+add_library ( amd_i OBJECT ${AMD_C_SOURCES} ${AMD_VERSION_C_SOURCE} ${AMD_F_SOURCES} )
+add_library ( amd_l OBJECT ${AMD_C_SOURCES} )
+target_compile_definitions ( amd_l PRIVATE DLONG )
+
+#-------------------------------------------------------------------------------
+# dynamic amd library properties
+#-------------------------------------------------------------------------------
+
 if ( BUILD_SHARED_LIBS )
-    add_library ( AMD SHARED ${AMD_SOURCES} )
+    add_library ( AMD SHARED
+        $<TARGET_OBJECTS:amd_i> $<TARGET_OBJECTS:amd_l> )
     set_target_properties ( AMD PROPERTIES
         VERSION ${AMD_VERSION_MAJOR}.${AMD_VERSION_MINOR}.${AMD_VERSION_SUB}
         C_STANDARD 11
@@ -107,7 +119,8 @@ endif ( )
 #-------------------------------------------------------------------------------
 
 if ( BUILD_STATIC_LIBS )
-    add_library ( AMD_static STATIC ${AMD_SOURCES} )
+    add_library ( AMD_static STATIC
+        $<TARGET_OBJECTS:amd_i> $<TARGET_OBJECTS:amd_l> )
     set_target_properties ( AMD_static PROPERTIES
         C_STANDARD 11
         C_STANDARD_REQUIRED ON
@@ -135,6 +148,10 @@ endif ( )
 #-------------------------------------------------------------------------------
 
 # SuiteSparseConfig:
+target_include_directories ( amd_i PRIVATE
+    "$<TARGET_PROPERTY:SuiteSparse::SuiteSparseConfig,INTERFACE_INCLUDE_DIRECTORIES>" )
+target_include_directories ( amd_l PRIVATE
+    "$<TARGET_PROPERTY:SuiteSparse::SuiteSparseConfig,INTERFACE_INCLUDE_DIRECTORIES>" )
 if ( BUILD_SHARED_LIBS )
     target_link_libraries ( AMD PRIVATE SuiteSparse::SuiteSparseConfig )
     target_include_directories ( AMD PUBLIC

diff --git a/AMD/Source/amd_l1.c b/AMD/Source/amd_l1.c
diff --git a/AMD/Source/amd_l2.c b/AMD/Source/amd_l2.c
diff --git a/AMD/Source/amd_l_aat.c b/AMD/Source/amd_l_aat.c
diff --git a/AMD/Source/amd_l_control.c b/AMD/Source/amd_l_control.c
diff --git a/AMD/Source/amd_l_defaults.c b/AMD/Source/amd_l_defaults.c
diff --git a/AMD/Source/amd_l_dump.c b/AMD/Source/amd_l_dump.c
diff --git a/AMD/Source/amd_l_info.c b/AMD/Source/amd_l_info.c
diff --git a/AMD/Source/amd_l_order.c b/AMD/Source/amd_l_order.c
diff --git a/AMD/Source/amd_l_post_tree.c b/AMD/Source/amd_l_post_tree.c
diff --git a/AMD/Source/amd_l_postorder.c b/AMD/Source/amd_l_postorder.c
diff --git a/AMD/Source/amd_l_preprocess.c b/AMD/Source/amd_l_preprocess.c
diff --git a/AMD/Source/amd_l_valid.c b/AMD/Source/amd_l_valid.c