1 --- scikits/umfpack/umfpack.i.orig 2017-10-25 11:44:24 UTC 2 +++ scikits/umfpack/umfpack.i 3 @@ -6,6 +6,8 @@ 4 /* 5 See umfpack.py for more information. 6 7 + Patched from <https://github.com/scikit-umfpack/scikit-umfpack/pull/80/files> 8 + 9 Created by: Robert Cimrman 10 */ 11 12 @@ -218,18 +220,21 @@ CONF_IN( UMFPACK_INFO ) 13 }; 14 15 %include <umfpack.h> 16 -%include <umfpack_solve.h> 17 -%include <umfpack_defaults.h> 18 -%include <umfpack_triplet_to_col.h> 19 -%include <umfpack_col_to_triplet.h> 20 -%include <umfpack_transpose.h> 21 -%include <umfpack_scale.h> 22 23 -%include <umfpack_report_symbolic.h> 24 -%include <umfpack_report_numeric.h> 25 -%include <umfpack_report_info.h> 26 -%include <umfpack_report_control.h> 27 +#if UMFPACK_MAIN_VERSION < 6 28 + %include <umfpack_solve.h> 29 + %include <umfpack_defaults.h> 30 + %include <umfpack_triplet_to_col.h> 31 + %include <umfpack_col_to_triplet.h> 32 + %include <umfpack_transpose.h> 33 + %include <umfpack_scale.h> 34 35 + %include <umfpack_report_symbolic.h> 36 + %include <umfpack_report_numeric.h> 37 + %include <umfpack_report_info.h> 38 + %include <umfpack_report_control.h> 39 +#endif 40 + 41 /* 42 The order is important below! 43 */ 44 @@ -240,21 +245,22 @@ OPAQUE_ARGOUT( void * ) 45 void **Numeric 46 } 47 48 -%include <umfpack_symbolic.h> 49 -%include <umfpack_numeric.h> 50 +#if UMFPACK_MAIN_VERSION < 6 51 + %include <umfpack_symbolic.h> 52 + %include <umfpack_numeric.h> 53 +#endif 54 55 - 56 OPAQUE_ARGINOUT( void * ) 57 %apply void ** opaque_arginout { 58 void **Symbolic, 59 void **Numeric 60 } 61 62 -%include <umfpack_free_symbolic.h> 63 -%include <umfpack_free_numeric.h> 64 +#if UMFPACK_MAIN_VERSION < 6 65 + %include <umfpack_free_symbolic.h> 66 + %include <umfpack_free_numeric.h> 67 +#endif 68 69 - 70 - 71 /* 72 * wnbell - attempt to get L,U,P,Q out 73 */ 74 @@ -280,8 +286,11 @@ OPAQUE_ARGINOUT( void * ) 75 SuiteSparse_long *n_col, 76 SuiteSparse_long *nz_udiag 77 }; 78 -%include <umfpack_get_lunz.h> 79 80 +#if UMFPACK_MAIN_VERSION < 6 81 + %include <umfpack_get_lunz.h> 82 +#endif 83 + 84 ARRAY_IN( double, double, DOUBLE ) 85 %apply double *array { 86 double Lx [ ], 87 @@ -326,6 +335,8 @@ ARRAY_IN( SuiteSparse_long, SuiteSparse_long, INT64 ) 88 }; 89 %apply long *OUTPUT { SuiteSparse_long *do_recip}; 90 91 -%include <umfpack_get_numeric.h> 92 - 93 +#if UMFPACK_MAIN_VERSION < 6 94 + %include <umfpack_get_numeric.h> 95 #endif 96 + 97 +#endif // SWIGPYTHON 98