Mercurial > hg > octave-lyh
diff liboctave/CSparse.cc @ 7036:daff886a8e2a
[project @ 2007-10-17 19:02:10 by jwe]
| author | jwe |
|---|---|
| date | Wed, 17 Oct 2007 19:02:11 +0000 |
| parents | a1dbe9d80eee |
| children | 3fade00a6ac7 |
line wrap: on
line diff
--- a/liboctave/CSparse.cc +++ b/liboctave/CSparse.cc @@ -5770,23 +5770,6 @@ cm->complex_divide = CHOLMOD_NAME(divcomplex); cm->hypotenuse = CHOLMOD_NAME(hypot); -#ifdef HAVE_METIS - // METIS 4.0.1 uses malloc and free, and will terminate if - // it runs out of memory. Use CHOLMOD's memory guard for - // METIS, which allocates a huge block of memory (and then - // immediately frees it) before calling METIS - cm->metis_memory = 2.0; - -#if defined(METIS_VERSION) -#if (METIS_VERSION >= METIS_VER(4,0,2)) - // METIS 4.0.2 uses function pointers for malloc and free. - METIS_malloc = cm->malloc_memory; - METIS_free = cm->free_memory; - // Turn off METIS memory guard. - cm->metis_memory = 0.0; -#endif -#endif -#endif cm->final_ll = true; cholmod_sparse Astore; @@ -6030,26 +6013,6 @@ cm->complex_divide = CHOLMOD_NAME(divcomplex); cm->hypotenuse = CHOLMOD_NAME(hypot); -#ifdef HAVE_METIS - // METIS 4.0.1 uses malloc and free, and will terminate MATLAB if - // it runs out of memory. Use CHOLMOD's memory guard for METIS, - // which mxMalloc's a huge block of memory (and then immediately - // mxFree's it) before calling METIS - cm->metis_memory = 2.0; - -#if defined(METIS_VERSION) -#if (METIS_VERSION >= METIS_VER(4,0,2)) - // METIS 4.0.2 uses function pointers for malloc and free - METIS_malloc = cm->malloc_memory; - METIS_free = cm->free_memory; - // Turn off METIS memory guard. It is not needed, because mxMalloc - // will safely terminate the mexFunction and free any workspace - // without killing all of octave. - cm->metis_memory = 0.0; -#endif -#endif -#endif - cm->final_ll = true; cholmod_sparse Astore; @@ -6341,26 +6304,6 @@ cm->complex_divide = CHOLMOD_NAME(divcomplex); cm->hypotenuse = CHOLMOD_NAME(hypot); -#ifdef HAVE_METIS - // METIS 4.0.1 uses malloc and free, and will terminate MATLAB if - // it runs out of memory. Use CHOLMOD's memory guard for METIS, - // which mxMalloc's a huge block of memory (and then immediately - // mxFree's it) before calling METIS - cm->metis_memory = 2.0; - -#if defined(METIS_VERSION) -#if (METIS_VERSION >= METIS_VER(4,0,2)) - // METIS 4.0.2 uses function pointers for malloc and free - METIS_malloc = cm->malloc_memory; - METIS_free = cm->free_memory; - // Turn off METIS memory guard. It is not needed, because mxMalloc - // will safely terminate the mexFunction and free any workspace - // without killing all of octave. - cm->metis_memory = 0.0; -#endif -#endif -#endif - cm->final_ll = true; cholmod_sparse Astore; @@ -6583,26 +6526,6 @@ cm->complex_divide = CHOLMOD_NAME(divcomplex); cm->hypotenuse = CHOLMOD_NAME(hypot); -#ifdef HAVE_METIS - // METIS 4.0.1 uses malloc and free, and will terminate MATLAB if - // it runs out of memory. Use CHOLMOD's memory guard for METIS, - // which mxMalloc's a huge block of memory (and then immediately - // mxFree's it) before calling METIS - cm->metis_memory = 2.0; - -#if defined(METIS_VERSION) -#if (METIS_VERSION >= METIS_VER(4,0,2)) - // METIS 4.0.2 uses function pointers for malloc and free - METIS_malloc = cm->malloc_memory; - METIS_free = cm->free_memory; - // Turn off METIS memory guard. It is not needed, because mxMalloc - // will safely terminate the mexFunction and free any workspace - // without killing all of octave. - cm->metis_memory = 0.0; -#endif -#endif -#endif - cm->final_ll = true; cholmod_sparse Astore;