[Getfem-commits] [getfem-commits] branch master updated: Fix matlab interface compilation problem for the link with external superlu library

[Yves Renard]

This is an automated email from the git hooks/post-receive script.

renard pushed a commit to branch master
in repository getfem.

The following commit(s) were added to refs/heads/master by this push:
     new 59a7c206 Fix matlab interface compilation problem for the link with 
external superlu library
59a7c206 is described below

commit 59a7c206b85101119f0159c8215a4ff8c185b89d
Author: Yves Renard <Yves.Renard@insa-lyon.fr>
AuthorDate: Fri Apr 5 11:26:43 2024 +0200

    Fix matlab interface compilation problem for the link with external superlu 
library
---
 interface/src/matlab/Makefile.am | 13 +++----------
 interface/src/matlab/gfm_mex.c   |  8 ++++----
 2 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/interface/src/matlab/Makefile.am b/interface/src/matlab/Makefile.am
index 9ec5c010..50d4bbf2 100644
--- a/interface/src/matlab/Makefile.am
+++ b/interface/src/matlab/Makefile.am
@@ -45,20 +45,17 @@ GETFEM_STATIC_LIB = ../../../src/.libs/libgetfem.a @LIBS@
 if BUILDMEX
 if USE_MINGW_MEX
 
-#command extremely sensitive to any modification! fragile! keep the order of 
the files
-# (gfm_mex.c must be first, libstdc++.a must be last)
+#command extremely sensitive to any modification! fragile! keep the order of
+# the files (gfm_mex.c must be first, libstdc++.a must be last)
 
 gf_matlab@MATLAB_COM_EXT@: gfm_mex.c gfm_common.c ../libgetfemint.la 
../gfi_array.c $(GETFEM_LIB_LA)
-       matlab -nodesktop -nosplash -nojvm -r "mex -v -output gf_matlab -g 
./gfm_mex.c ./gfm_common.c -largeArrayDims -I. -I.. ./../gfi_array.c 
../.libs/libgetfemint.a ../../../src/.libs/libgetfem.a 
../../../superlu/.libs/libsuperlu.a /msys/local/lib/libsmumps.a 
/msys/local/lib/libcmumps.a /msys/local/lib/libdmumps.a 
/msys/local/lib/libzmumps.a /msys/local/lib/libmumps_common.a 
/msys/local/lib/libmpiseq.a /msys/local/lib/libpord.a 
/msys/local/lib/liblapack.a /msys/local/lib/libblas.a /msys/loca [...]
+       matlab -nodesktop -nosplash -nojvm -r "mex -v -output gf_matlab -g 
./gfm_mex.c ./gfm_common.c -largeArrayDims -I. -I.. ./../gfi_array.c 
../.libs/libgetfemint.a ../../../src/.libs/libgetfem.a $(SUPERLU_LIBS) 
/msys/local/lib/libsmumps.a /msys/local/lib/libcmumps.a 
/msys/local/lib/libdmumps.a /msys/local/lib/libzmumps.a 
/msys/local/lib/libmumps_common.a /msys/local/lib/libmpiseq.a 
/msys/local/lib/libpord.a /msys/local/lib/liblapack.a /msys/local/lib/libblas.a 
/msys/local/lib/libqhull.a /Mi [...]
 
 
 #      $(GNUMEX) $(GNUMEXOPTS) -output gf_matlab -g @srcdir@/gfm_mex.c \
 #      @srcdir@/gfm_common.c -I@srcdir@ \
 #      @srcdir@/../gfi_array.c ../.libs/libgetfemint.a $(GETFEM_STATIC_LIB) 
@STDCPP_STATICLIBS@
 
-
-#        /c/MinGW/lib/libstdc++.a
-#      cmd /c "$mexbat -v -f c:/gnumex/mexopts.bat gfm_mex.c -output 
gfm_rpc_mexint gfi*.o gf_*.o matlabint*.o 
c:\\msys\\1.0\\home\\j\\getfem++-1.5\\src\\.libs\\libgetfem.a getfem_matlab.o 
c:\\mingw\\lib\\libstdc++.a -Ic:\\msys\\1.0\\home\\j\\mingw_liboncrpc-4.0"
 else !USE_MINGW_MEX
 if BUILDMEXRPC
 gf_matlab@MATLAB_COM_EXT@: ../gfi_rpc_clnt.c gfm_rpc_mexint.c gfm_common.c 
../gfi_rpc_xdr.c ../gfi_array.c
@@ -67,10 +64,6 @@ gf_matlab@MATLAB_COM_EXT@: ../gfi_rpc_clnt.c 
gfm_rpc_mexint.c gfm_common.c ../gf
        @srcdir@/gfm_rpc_mexint.c @srcdir@/gfm_common.c 
@srcdir@/../gfi_rpc_clnt.c \
         @srcdir@/../gfi_rpc_xdr.c @srcdir@/../gfi_array.c || (rm $@; false)
 else !BUILDMEXRPC
-# 2006/02/06 I remove the @STDCPP_STATICLIBS@ at the end (added to
-# avoid crashes in exception throw code when parts of getfem where
-# compiled with ifc (i.e. mumps)) of the command line, as it 
-# break the linking with g++-3.3 and matlab R14/R13 on debian (at least) ..
 gf_matlab@MATLAB_COM_EXT@: gfm_mex.c gfm_common.c ../libgetfemint.la 
../gfi_array.c $(GETFEM_LIB_LA)
        $(MEX) -largeArrayDims -output gf_matlab -g CDEBUGFLAGS="$(CFLAGS)" 
LD="$(CXX)" \
        -I@srcdir@ -I@srcdir@/.. -DMATLAB_RELEASE=@MATLAB_RELEASE@ \
diff --git a/interface/src/matlab/gfm_mex.c b/interface/src/matlab/gfm_mex.c
index 979b0c7c..eb035437 100644
--- a/interface/src/matlab/gfm_mex.c
+++ b/interface/src/matlab/gfm_mex.c
@@ -27,8 +27,8 @@
 #include "gfm_common.h"
 #include "getfem_interface.h"
 
-void set_superlu_callback(int (*cb)());
-int handle_getfem_callback();
+// void set_superlu_callback(int (*cb)());
+// int handle_getfem_callback();
 
 /* main file for the giant gf_matlab mex-file */
 /*
@@ -88,7 +88,7 @@ void sigint_callback(int sig) {
          "If you want to abort immediatly the current operation, hit CTRL-C 
again\n" \
          "In that case, you will have to restart getfem_matlab, using 'clear 
functions' for example:\n", s);
   set_cancel_flag(1);
-  assert(handle_getfem_callback() == 1);
+  // assert(handle_getfem_callback() == 1);
 }
 
 void mexFunction(int nlhs, mxArray *plhs[], int nrhs, const mxArray *prhs[]) {
@@ -96,7 +96,7 @@ void mexFunction(int nlhs, mxArray *plhs[], int nrhs, const 
mxArray *prhs[]) {
   gfi_array_list *in;
 
   set_cancel_flag(0);
-  set_superlu_callback(is_cancel_flag_set);
+  // set_superlu_callback(is_cancel_flag_set);
 
   if (nrhs == 0 || !mxIsChar(prhs[0])) {
     mexErrMsgTxt("missing function name");