Skip to content

Commit

Permalink
Fixing bad source references when building KLU with suitesparse from …
Browse files Browse the repository at this point in the history
…source
  • Loading branch information
sanurielf committed Aug 1, 2020
1 parent 5733c58 commit 65535cb
Show file tree
Hide file tree
Showing 99 changed files with 121 additions and 115 deletions.
3 changes: 2 additions & 1 deletion setup.py
Expand Up @@ -213,7 +213,8 @@
sources = ['src/C/klu.c'])
else:
klu = Extension('klu',
include_dirs = [ SUITESPARSE_SRC_DIR + '/KLU/Include',
include_dirs = [ SUITESPARSE_SRC_DIR + '/KLU/Include',
SUITESPARSE_SRC_DIR + '/KLU/Source',
SUITESPARSE_SRC_DIR + '/AMD/Include',
SUITESPARSE_SRC_DIR + '/AMD/Source',
SUITESPARSE_SRC_DIR + '/COLAMD/Include',
Expand Down
3 changes: 0 additions & 3 deletions src/C/SuiteSparse_cvxopt_extra/klu/amd_1.c

This file was deleted.

3 changes: 0 additions & 3 deletions src/C/SuiteSparse_cvxopt_extra/klu/amd_2.c

This file was deleted.

3 changes: 0 additions & 3 deletions src/C/SuiteSparse_cvxopt_extra/klu/amd_aat.c

This file was deleted.

1 change: 0 additions & 1 deletion src/C/SuiteSparse_cvxopt_extra/klu/amd_global.c

This file was deleted.

3 changes: 3 additions & 0 deletions src/C/SuiteSparse_cvxopt_extra/klu/amd_i_1.c
@@ -0,0 +1,3 @@
#define DINT

#include "amd_1.c"
3 changes: 3 additions & 0 deletions src/C/SuiteSparse_cvxopt_extra/klu/amd_i_2.c
@@ -0,0 +1,3 @@
#define DINT

#include "amd_2.c"
3 changes: 3 additions & 0 deletions src/C/SuiteSparse_cvxopt_extra/klu/amd_i_aat.c
@@ -0,0 +1,3 @@
#define DINT

#include "amd_aat.c"
3 changes: 3 additions & 0 deletions src/C/SuiteSparse_cvxopt_extra/klu/amd_i_order.c
@@ -0,0 +1,3 @@
#define DINT

#include "amd_order.c"
3 changes: 3 additions & 0 deletions src/C/SuiteSparse_cvxopt_extra/klu/amd_i_post_tree.c
@@ -0,0 +1,3 @@
#define DINT

#include "amd_post_tree.c"
3 changes: 3 additions & 0 deletions src/C/SuiteSparse_cvxopt_extra/klu/amd_i_postorder.c
@@ -0,0 +1,3 @@
#define DINT

#include "amd_postorder.c"
3 changes: 3 additions & 0 deletions src/C/SuiteSparse_cvxopt_extra/klu/amd_i_preprocess.c
@@ -0,0 +1,3 @@
#define DINT

#include "amd_preprocess.c"
3 changes: 3 additions & 0 deletions src/C/SuiteSparse_cvxopt_extra/klu/amd_i_valid.c
@@ -0,0 +1,3 @@
#define DINT

#include "amd_valid.c"
2 changes: 1 addition & 1 deletion src/C/SuiteSparse_cvxopt_extra/klu/amd_l1.c
@@ -1,3 +1,3 @@
#define DLONG

#include "../../SuiteSparse/AMD/Source/amd_1.c"
#include "amd_1.c"
2 changes: 1 addition & 1 deletion src/C/SuiteSparse_cvxopt_extra/klu/amd_l2.c
@@ -1,3 +1,3 @@
#define DLONG

#include "../../SuiteSparse/AMD/Source/amd_2.c"
#include "amd_2.c"
2 changes: 1 addition & 1 deletion src/C/SuiteSparse_cvxopt_extra/klu/amd_l_aat.c
@@ -1,3 +1,3 @@
#define DLONG

#include "../../SuiteSparse/AMD/Source/amd_aat.c"
#include "amd_aat.c"
2 changes: 1 addition & 1 deletion src/C/SuiteSparse_cvxopt_extra/klu/amd_l_order.c
@@ -1,3 +1,3 @@
#define DLONG

#include "../../SuiteSparse/AMD/Source/amd_order.c"
#include "amd_order.c"
2 changes: 1 addition & 1 deletion src/C/SuiteSparse_cvxopt_extra/klu/amd_l_post_tree.c
@@ -1,3 +1,3 @@
#define DLONG

#include "../../SuiteSparse/AMD/Source/amd_post_tree.c"
#include "amd_post_tree.c"
2 changes: 1 addition & 1 deletion src/C/SuiteSparse_cvxopt_extra/klu/amd_l_postorder.c
@@ -1,3 +1,3 @@
#define DLONG

#include "../../SuiteSparse/AMD/Source/amd_postorder.c"
#include "amd_postorder.c"
2 changes: 1 addition & 1 deletion src/C/SuiteSparse_cvxopt_extra/klu/amd_l_preprocess.c
@@ -1,3 +1,3 @@
#define DLONG

#include "../../SuiteSparse/AMD/Source/amd_preprocess.c"
#include "amd_preprocess.c"
2 changes: 1 addition & 1 deletion src/C/SuiteSparse_cvxopt_extra/klu/amd_l_valid.c
@@ -1,3 +1,3 @@
#define DLONG

#include "../../SuiteSparse/AMD/Source/amd_valid.c"
#include "amd_valid.c"
3 changes: 0 additions & 3 deletions src/C/SuiteSparse_cvxopt_extra/klu/amd_order.c

This file was deleted.

3 changes: 0 additions & 3 deletions src/C/SuiteSparse_cvxopt_extra/klu/amd_post_tree.c

This file was deleted.

3 changes: 0 additions & 3 deletions src/C/SuiteSparse_cvxopt_extra/klu/amd_postorder.c

This file was deleted.

3 changes: 0 additions & 3 deletions src/C/SuiteSparse_cvxopt_extra/klu/amd_preprocess.c

This file was deleted.

3 changes: 0 additions & 3 deletions src/C/SuiteSparse_cvxopt_extra/klu/amd_valid.c

This file was deleted.

3 changes: 3 additions & 0 deletions src/C/SuiteSparse_cvxopt_extra/klu/btf_i_maxtrans.c
@@ -0,0 +1,3 @@
#define DINT

#include "btf_maxtrans.c"
3 changes: 3 additions & 0 deletions src/C/SuiteSparse_cvxopt_extra/klu/btf_i_order.c
@@ -0,0 +1,3 @@
#define DINT

#include "btf_order.c"
3 changes: 3 additions & 0 deletions src/C/SuiteSparse_cvxopt_extra/klu/btf_i_strongcomp.c
@@ -0,0 +1,3 @@
#define DINT

#include "btf_strongcomp.c"
2 changes: 1 addition & 1 deletion src/C/SuiteSparse_cvxopt_extra/klu/btf_l_maxtrans.c
@@ -1,3 +1,3 @@
#define DLONG

#include "../../SuiteSparse/BTF/Source/btf_maxtrans.c"
#include "btf_maxtrans.c"
2 changes: 1 addition & 1 deletion src/C/SuiteSparse_cvxopt_extra/klu/btf_l_order.c
@@ -1,3 +1,3 @@
#define DLONG

#include "../../SuiteSparse/BTF/Source/btf_order.c"
#include "btf_order.c"
2 changes: 1 addition & 1 deletion src/C/SuiteSparse_cvxopt_extra/klu/btf_l_strongcomp.c
@@ -1,3 +1,3 @@
#define DLONG

#include "../../SuiteSparse/BTF/Source/btf_strongcomp.c"
#include "btf_strongcomp.c"
3 changes: 0 additions & 3 deletions src/C/SuiteSparse_cvxopt_extra/klu/btf_maxtrans.c

This file was deleted.

3 changes: 0 additions & 3 deletions src/C/SuiteSparse_cvxopt_extra/klu/btf_order.c

This file was deleted.

3 changes: 0 additions & 3 deletions src/C/SuiteSparse_cvxopt_extra/klu/btf_strongcomp.c

This file was deleted.

3 changes: 0 additions & 3 deletions src/C/SuiteSparse_cvxopt_extra/klu/colamd.c

This file was deleted.

3 changes: 3 additions & 0 deletions src/C/SuiteSparse_cvxopt_extra/klu/colamd_i.c
@@ -0,0 +1,3 @@
#define DINT

#include "colamd.c"
2 changes: 1 addition & 1 deletion src/C/SuiteSparse_cvxopt_extra/klu/colamd_l.c
@@ -1,3 +1,3 @@
#define DLONG

#include "../../SuiteSparse/COLAMD/Source/colamd.c"
#include "colamd.c"
2 changes: 0 additions & 2 deletions src/C/SuiteSparse_cvxopt_extra/klu/klu.c

This file was deleted.

2 changes: 0 additions & 2 deletions src/C/SuiteSparse_cvxopt_extra/klu/klu_analyze.c

This file was deleted.

2 changes: 0 additions & 2 deletions src/C/SuiteSparse_cvxopt_extra/klu/klu_analyze_given.c

This file was deleted.

2 changes: 0 additions & 2 deletions src/C/SuiteSparse_cvxopt_extra/klu/klu_defaults.c

This file was deleted.

2 changes: 0 additions & 2 deletions src/C/SuiteSparse_cvxopt_extra/klu/klu_diagnostics.c

This file was deleted.

2 changes: 0 additions & 2 deletions src/C/SuiteSparse_cvxopt_extra/klu/klu_factor.c

This file was deleted.

2 changes: 0 additions & 2 deletions src/C/SuiteSparse_cvxopt_extra/klu/klu_free_numeric.c

This file was deleted.

2 changes: 0 additions & 2 deletions src/C/SuiteSparse_cvxopt_extra/klu/klu_free_symbolic.c

This file was deleted.

2 changes: 2 additions & 0 deletions src/C/SuiteSparse_cvxopt_extra/klu/klu_i.c
@@ -0,0 +1,2 @@
#define DINT
#include "klu.c"
2 changes: 2 additions & 0 deletions src/C/SuiteSparse_cvxopt_extra/klu/klu_i_analyze.c
@@ -0,0 +1,2 @@
#define DINT
#include "klu_analyze.c"
2 changes: 2 additions & 0 deletions src/C/SuiteSparse_cvxopt_extra/klu/klu_i_analyze_given.c
@@ -0,0 +1,2 @@
#define DINT
#include "klu_analyze_given.c"
2 changes: 2 additions & 0 deletions src/C/SuiteSparse_cvxopt_extra/klu/klu_i_defaults.c
@@ -0,0 +1,2 @@
#define DINT
#include "klu_defaults.c"
2 changes: 2 additions & 0 deletions src/C/SuiteSparse_cvxopt_extra/klu/klu_i_diagnostics.c
@@ -0,0 +1,2 @@
#define DINT
#include "klu_diagnostics.c"
2 changes: 2 additions & 0 deletions src/C/SuiteSparse_cvxopt_extra/klu/klu_i_factor.c
@@ -0,0 +1,2 @@
#define DINT
#include "klu_factor.c"
2 changes: 2 additions & 0 deletions src/C/SuiteSparse_cvxopt_extra/klu/klu_i_free_numeric.c
@@ -0,0 +1,2 @@
#define DINT
#include "klu_free_numeric.c"
2 changes: 2 additions & 0 deletions src/C/SuiteSparse_cvxopt_extra/klu/klu_i_free_symbolic.c
@@ -0,0 +1,2 @@
#define DINT
#include "klu_free_symbolic.c"
2 changes: 2 additions & 0 deletions src/C/SuiteSparse_cvxopt_extra/klu/klu_i_kernel.c
@@ -0,0 +1,2 @@
#define DINT
#include "klu_kernel.c"
2 changes: 2 additions & 0 deletions src/C/SuiteSparse_cvxopt_extra/klu/klu_i_memory.c
@@ -0,0 +1,2 @@
#define DINT
#include "klu_memory.c"
2 changes: 2 additions & 0 deletions src/C/SuiteSparse_cvxopt_extra/klu/klu_i_refactor.c
@@ -0,0 +1,2 @@
#define DINT
#include "klu_refactor.c"
2 changes: 2 additions & 0 deletions src/C/SuiteSparse_cvxopt_extra/klu/klu_i_scale.c
@@ -0,0 +1,2 @@
#define DINT
#include "klu_scale.c"
2 changes: 2 additions & 0 deletions src/C/SuiteSparse_cvxopt_extra/klu/klu_i_solve.c
@@ -0,0 +1,2 @@
#define DINT
#include "klu_solve.c"
2 changes: 2 additions & 0 deletions src/C/SuiteSparse_cvxopt_extra/klu/klu_i_tsolve.c
@@ -0,0 +1,2 @@
#define DINT
#include "klu_tsolve.c"
2 changes: 0 additions & 2 deletions src/C/SuiteSparse_cvxopt_extra/klu/klu_kernel.c

This file was deleted.

2 changes: 1 addition & 1 deletion src/C/SuiteSparse_cvxopt_extra/klu/klu_l.c
@@ -1,2 +1,2 @@
#define DLONG
#include "../../SuiteSparse/KLU/Source/klu.c"
#include "klu.c"
2 changes: 1 addition & 1 deletion src/C/SuiteSparse_cvxopt_extra/klu/klu_l_analyze.c
@@ -1,2 +1,2 @@
#define DLONG
#include "../../SuiteSparse/KLU/Source/klu_analyze.c"
#include "klu_analyze.c"
2 changes: 1 addition & 1 deletion src/C/SuiteSparse_cvxopt_extra/klu/klu_l_analyze_given.c
@@ -1,2 +1,2 @@
#define DLONG
#include "../../SuiteSparse/KLU/Source/klu_analyze_given.c"
#include "klu_analyze_given.c"
2 changes: 1 addition & 1 deletion src/C/SuiteSparse_cvxopt_extra/klu/klu_l_defaults.c
@@ -1,2 +1,2 @@
#define DLONG
#include "../../SuiteSparse/KLU/Source/klu_defaults.c"
#include "klu_defaults.c"
2 changes: 1 addition & 1 deletion src/C/SuiteSparse_cvxopt_extra/klu/klu_l_diagnostics.c
@@ -1,2 +1,2 @@
#define DLONG
#include "../../SuiteSparse/KLU/Source/klu_diagnostics.c"
#include "klu_diagnostics.c"
2 changes: 1 addition & 1 deletion src/C/SuiteSparse_cvxopt_extra/klu/klu_l_factor.c
@@ -1,2 +1,2 @@
#define DLONG
#include "../../SuiteSparse/KLU/Source/klu_factor.c"
#include "klu_factor.c"
2 changes: 1 addition & 1 deletion src/C/SuiteSparse_cvxopt_extra/klu/klu_l_free_numeric.c
@@ -1,2 +1,2 @@
#define DLONG
#include "../../SuiteSparse/KLU/Source/klu_free_numeric.c"
#include "klu_free_numeric.c"
2 changes: 1 addition & 1 deletion src/C/SuiteSparse_cvxopt_extra/klu/klu_l_free_symbolic.c
@@ -1,2 +1,2 @@
#define DLONG
#include "../../SuiteSparse/KLU/Source/klu_free_symbolic.c"
#include "klu_free_symbolic.c"
2 changes: 1 addition & 1 deletion src/C/SuiteSparse_cvxopt_extra/klu/klu_l_kernel.c
@@ -1,2 +1,2 @@
#define DLONG
#include "../../SuiteSparse/KLU/Source/klu_kernel.c"
#include "klu_kernel.c"
2 changes: 1 addition & 1 deletion src/C/SuiteSparse_cvxopt_extra/klu/klu_l_memory.c
@@ -1,2 +1,2 @@
#define DLONG
#include "../../SuiteSparse/KLU/Source/klu_memory.c"
#include "klu_memory.c"
2 changes: 1 addition & 1 deletion src/C/SuiteSparse_cvxopt_extra/klu/klu_l_refactor.c
@@ -1,2 +1,2 @@
#define DLONG
#include "../../SuiteSparse/KLU/Source/klu_refactor.c"
#include "klu_refactor.c"
2 changes: 1 addition & 1 deletion src/C/SuiteSparse_cvxopt_extra/klu/klu_l_scale.c
@@ -1,2 +1,2 @@
#define DLONG
#include "../../SuiteSparse/KLU/Source/klu_scale.c"
#include "klu_scale.c"
2 changes: 1 addition & 1 deletion src/C/SuiteSparse_cvxopt_extra/klu/klu_l_solve.c
@@ -1,2 +1,2 @@
#define DLONG
#include "../../SuiteSparse/KLU/Source/klu_solve.c"
#include "klu_solve.c"
2 changes: 1 addition & 1 deletion src/C/SuiteSparse_cvxopt_extra/klu/klu_l_tsolve.c
@@ -1,2 +1,2 @@
#define DLONG
#include "../../SuiteSparse/KLU/Source/klu_tsolve.c"
#include "klu_tsolve.c"
2 changes: 0 additions & 2 deletions src/C/SuiteSparse_cvxopt_extra/klu/klu_memory.c

This file was deleted.

2 changes: 0 additions & 2 deletions src/C/SuiteSparse_cvxopt_extra/klu/klu_refactor.c

This file was deleted.

2 changes: 0 additions & 2 deletions src/C/SuiteSparse_cvxopt_extra/klu/klu_scale.c

This file was deleted.

2 changes: 0 additions & 2 deletions src/C/SuiteSparse_cvxopt_extra/klu/klu_solve.c

This file was deleted.

2 changes: 0 additions & 2 deletions src/C/SuiteSparse_cvxopt_extra/klu/klu_tsolve.c

This file was deleted.

2 changes: 1 addition & 1 deletion src/C/SuiteSparse_cvxopt_extra/klu/klu_z.c
@@ -1,3 +1,3 @@
#define COMPLEX
#define DINT
#include "../../SuiteSparse/KLU/Source/klu.c"
#include "klu.c"
2 changes: 1 addition & 1 deletion src/C/SuiteSparse_cvxopt_extra/klu/klu_z_diagnostics.c
@@ -1,3 +1,3 @@
#define COMPLEX
#define DINT
#include "../../SuiteSparse/KLU/Source/klu_diagnostics.c"
#include "klu_diagnostics.c"
2 changes: 1 addition & 1 deletion src/C/SuiteSparse_cvxopt_extra/klu/klu_z_factor.c
@@ -1,3 +1,3 @@
#define COMPLEX
#define DINT
#include "../../SuiteSparse/KLU/Source/klu_factor.c"
#include "klu_factor.c"
2 changes: 1 addition & 1 deletion src/C/SuiteSparse_cvxopt_extra/klu/klu_z_free_numeric.c
@@ -1,3 +1,3 @@
#define COMPLEX
#define DINT
#include "../../SuiteSparse/KLU/Source/klu_free_numeric.c"
#include "klu_free_numeric.c"
2 changes: 1 addition & 1 deletion src/C/SuiteSparse_cvxopt_extra/klu/klu_z_kernel.c
@@ -1,4 +1,4 @@
#define COMPLEX
#define DINT

#include "../../SuiteSparse/KLU/Source/klu_kernel.c"
#include "klu_kernel.c"
2 changes: 1 addition & 1 deletion src/C/SuiteSparse_cvxopt_extra/klu/klu_z_refactor.c
@@ -1,3 +1,3 @@
#define COMPLEX
#define DINT
#include "../../SuiteSparse/KLU/Source/klu_refactor.c"
#include "klu_refactor.c"
2 changes: 1 addition & 1 deletion src/C/SuiteSparse_cvxopt_extra/klu/klu_z_scale.c
@@ -1,3 +1,3 @@
#define COMPLEX
#define DINT
#include "../../SuiteSparse/KLU/Source/klu_scale.c"
#include "klu_scale.c"
2 changes: 1 addition & 1 deletion src/C/SuiteSparse_cvxopt_extra/klu/klu_z_solve.c
@@ -1,3 +1,3 @@
#define COMPLEX
#define DINT
#include "../../SuiteSparse/KLU/Source/klu_solve.c"
#include "klu_solve.c"
2 changes: 1 addition & 1 deletion src/C/SuiteSparse_cvxopt_extra/klu/klu_z_tsolve.c
@@ -1,3 +1,3 @@
#define COMPLEX
#define DINT
#include "../../SuiteSparse/KLU/Source/klu_tsolve.c"
#include "klu_tsolve.c"
2 changes: 1 addition & 1 deletion src/C/SuiteSparse_cvxopt_extra/klu/klu_zl.c
@@ -1,3 +1,3 @@
#define COMPLEX
#define DLONG
#include "../../SuiteSparse/KLU/Source/klu.c"
#include "klu.c"
2 changes: 1 addition & 1 deletion src/C/SuiteSparse_cvxopt_extra/klu/klu_zl_diagnostics.c
@@ -1,3 +1,3 @@
#define COMPLEX
#define DLONG
#include "../../SuiteSparse/KLU/Source/klu_diagnostics.c"
#include "klu_diagnostics.c"
2 changes: 1 addition & 1 deletion src/C/SuiteSparse_cvxopt_extra/klu/klu_zl_factor.c
@@ -1,3 +1,3 @@
#define COMPLEX
#define DLONG
#include "../../SuiteSparse/KLU/Source/klu_factor.c"
#include "klu_factor.c"
2 changes: 1 addition & 1 deletion src/C/SuiteSparse_cvxopt_extra/klu/klu_zl_free_numeric.c
@@ -1,3 +1,3 @@
#define COMPLEX
#define DLONG
#include "../../SuiteSparse/KLU/Source/klu_free_numeric.c"
#include "klu_free_numeric.c"
3 changes: 1 addition & 2 deletions src/C/SuiteSparse_cvxopt_extra/klu/klu_zl_kernel.c
@@ -1,4 +1,3 @@
#define COMPLEX
#define DLONG

#include "../../SuiteSparse/KLU/Source/klu_kernel.c"
#include "klu_kernel.c"
2 changes: 1 addition & 1 deletion src/C/SuiteSparse_cvxopt_extra/klu/klu_zl_refactor.c
@@ -1,3 +1,3 @@
#define COMPLEX
#define DLONG
#include "../../SuiteSparse/KLU/Source/klu_refactor.c"
#include "klu_refactor.c"
2 changes: 1 addition & 1 deletion src/C/SuiteSparse_cvxopt_extra/klu/klu_zl_scale.c
@@ -1,3 +1,3 @@
#define COMPLEX
#define DLONG
#include "../../SuiteSparse/KLU/Source/klu_scale.c"
#include "klu_scale.c"
2 changes: 1 addition & 1 deletion src/C/SuiteSparse_cvxopt_extra/klu/klu_zl_solve.c
@@ -1,3 +1,3 @@
#define COMPLEX
#define DLONG
#include "../../SuiteSparse/KLU/Source/klu_solve.c"
#include "klu_solve.c"
2 changes: 1 addition & 1 deletion src/C/SuiteSparse_cvxopt_extra/klu/klu_zl_tsolve.c
@@ -1,3 +1,3 @@
#define COMPLEX
#define DLONG
#include "../../SuiteSparse/KLU/Source/klu_tsolve.c"
#include "klu_tsolve.c"

0 comments on commit 65535cb

Please sign in to comment.