From 89bf54717e0cda74c3fb2ca109eab5fdb5804fa0 Mon Sep 17 00:00:00 2001
From: Anthony Mallet <anthony.mallet@laas.fr>
Date: Mon, 15 Apr 2019 18:41:18 +0200
Subject: [PATCH] [wip/mumps] Remove (inactive)
---
Makefile | 1 -
mumps/DESCR | 4 -
mumps/Makefile | 42 ----------
mumps/PLIST | 24 ------
mumps/depend.mk | 28 -------
mumps/distinfo | 6 --
mumps/files/Makefile.am | 171 ---------------------------------------
mumps/files/configure.ac | 34 --------
mumps/patches/patch-aa | 20 -----
mumps/patches/patch-ab | 31 -------
mumps/patches/patch-ac | 18 -----
11 files changed, 379 deletions(-)
delete mode 100644 mumps/DESCR
delete mode 100644 mumps/Makefile
delete mode 100644 mumps/PLIST
delete mode 100644 mumps/depend.mk
delete mode 100644 mumps/distinfo
delete mode 100644 mumps/files/Makefile.am
delete mode 100644 mumps/files/configure.ac
delete mode 100644 mumps/patches/patch-aa
delete mode 100644 mumps/patches/patch-ab
delete mode 100644 mumps/patches/patch-ac
diff --git a/Makefile b/Makefile
index 02bcd6a2..524455c6 100644
--- a/Makefile
+++ b/Makefile
@@ -63,7 +63,6 @@ SUBDIR+= move3d-assets
SUBDIR+= move3d-studio
SUBDIR+= msgconnector
SUBDIR+= multicontact-api
-SUBDIR+= mumps
SUBDIR+= octovis
SUBDIR+= ompl
SUBDIR+= openhrp3-hrp2
diff --git a/mumps/DESCR b/mumps/DESCR
deleted file mode 100644
index 5863f9ee..00000000
--- a/mumps/DESCR
+++ /dev/null
@@ -1,4 +0,0 @@
-MUMPS (“MUltifrontal Massively Parallel Solverâ€) is a package for
-solving systems of linear equations of the form Ax = b, where A is a
-square sparse matrix that can be either unsymmetric, symmetric
-positive deï¬nite, or general symmetric.
diff --git a/mumps/Makefile b/mumps/Makefile
deleted file mode 100644
index 81c69cc8..00000000
--- a/mumps/Makefile
+++ /dev/null
@@ -1,42 +0,0 @@
-# robotpkg Makefile for: optimization/mumps
-# Created: Antonio El Khoury on Wed, 7 Mar 2012
-#
-
-VERSION= 4.10.0
-DISTNAME= MUMPS_${VERSION}
-PKGNAME= mumps-${VERSION}
-CATEGORIES= math
-MASTER_SITES= http://mumps.enseeiht.fr/
-
-COMMENT= Parallel sparse direct solver
-HOMEPAGE= http://graal.ens-lyon.fr/MUMPS/
-LICENSE= public-domain
-MAINTAINER= openrobots@laas.fr
-
-WRKSRC= ${WRKDIR}
-GNU_CONFIGURE= yes
-
-INCLUDE_DIRS.lapack= include
-LIBRARY_DIRS.lapack= lib
-RPATH_DIRS.lapack= lib
-LDFLAGS.lapack= -llapack
-
-# require f90 compiler
-DEPEND_ABI.gcc-fortran+= gcc-fortran>=4
-
-include ../../math/lapack/depend.mk
-include ../../mk/sysdep/autoconf.mk
-include ../../mk/sysdep/automake.mk
-include ../../mk/language/c.mk
-include ../../mk/language/c++.mk
-include ../../mk/language/fortran.mk
-include ../../mk/robotpkg.mk
-
-post-extract:
- ${RUN} cd ${WRKDIR}; \
- ${LN} -s MUMPS_${VERSION} MUMPS; \
- ${SED} -e 's/@VERSION@/${VERSION}/g' \
- >configure.ac <${FILESDIR}/configure.ac; \
- ${CP} ${FILESDIR}/Makefile.am Makefile.am
-
-pre-configure: autoreconf
diff --git a/mumps/PLIST b/mumps/PLIST
deleted file mode 100644
index 8377741a..00000000
--- a/mumps/PLIST
+++ /dev/null
@@ -1,24 +0,0 @@
-@comment Thu Mar 8 17:56:36 CET 2012
-include/mumps/cmumps_c.h
-include/mumps/cmumps_root.h
-include/mumps/cmumps_struc.h
-include/mumps/dmumps_c.h
-include/mumps/dmumps_root.h
-include/mumps/dmumps_struc.h
-include/mumps/mumps_c_types.h
-include/mumps/mumps_compat.h
-include/mumps/smumps_c.h
-include/mumps/smumps_root.h
-include/mumps/smumps_struc.h
-include/mumps/zmumps_c.h
-include/mumps/zmumps_root.h
-include/mumps/zmumps_struc.h
-lib/libcmumps_seq.la
-lib/libdmumps_seq.la
-lib/libmumps_common_seq.la
-lib/libsmumps_seq.la
-lib/libzmumps_seq.la
-share/mumps/ChangeLog
-share/mumps/LICENSE
-share/mumps/README
-share/mumps/VERSION
diff --git a/mumps/depend.mk b/mumps/depend.mk
deleted file mode 100644
index 8b5ee428..00000000
--- a/mumps/depend.mk
+++ /dev/null
@@ -1,28 +0,0 @@
-# robotpkg depend.mk for: optimization/mumps
-# Created: Antonio El Khoury on Wed, 7 Mar 2012
-#
-DEPEND_DEPTH:= ${DEPEND_DEPTH}+
-MUMPS_DEPEND_MK:= ${MUMPS_DEPEND_MK}+
-
-ifeq (+,$(DEPEND_DEPTH))
-DEPEND_PKG+= mumps
-endif
-
-ifeq (+,$(MUMPS_DEPEND_MK)) # ----------------------------------------------
-
-PREFER.mumps?= robotpkg
-
-DEPEND_USE+= mumps
-
-DEPEND_ABI.mumps?= mumps>=4.10.0
-DEPEND_DIR.mumps?= ../../wip/mumps
-
-SYSTEM_SEARCH.mumps=\
- 'include/mumps/dmumps_c.h:/MUMPS_VERSION.*"[0-9.]*"/s/[^0-9.]//gp' \
- 'lib/lib{s,d,c,z}mumps_seq.{so,a}'
-
-SYSTEM_PKG.Ubuntu.mumps=libmumps-seq-dev
-
-endif # MUMPS_DEPEND_MK ----------------------------------------------------
-
-DEPEND_DEPTH:= ${DEPEND_DEPTH:+=}
diff --git a/mumps/distinfo b/mumps/distinfo
deleted file mode 100644
index 829bdee1..00000000
--- a/mumps/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-SHA1 (MUMPS_4.10.0.tar.gz) = 904b1d816272d99f1f53913cbd4789a5be1838f7
-RMD160 (MUMPS_4.10.0.tar.gz) = 19ae1f4773ab1643237f791085d9721932a618fc
-Size (MUMPS_4.10.0.tar.gz) = 2481516 bytes
-SHA1 (patch-aa) = ec047ce693541de6e92a4c79980daf4d5283b1c0
-SHA1 (patch-ab) = 92a0176707f4afd0f1a59c8b875954df7184924e
-SHA1 (patch-ac) = 5efcbe62eff3428e061f54ef123c6e92a4e7973c
diff --git a/mumps/files/Makefile.am b/mumps/files/Makefile.am
deleted file mode 100644
index 36702d27..00000000
--- a/mumps/files/Makefile.am
+++ /dev/null
@@ -1,171 +0,0 @@
-# automake file for MUMPS
-
-AM_CPPFLAGS= -IMUMPS/include -IMUMPS/libseq
-
-lib_LTLIBRARIES= libmumps_common_seq.la
-lib_LTLIBRARIES+= libsmumps_seq.la
-lib_LTLIBRARIES+= libdmumps_seq.la
-lib_LTLIBRARIES+= libcmumps_seq.la
-lib_LTLIBRARIES+= libzmumps_seq.la
-
-docdir= ${datadir}/mumps
-doc_DATA=\
- MUMPS/ChangeLog \
- MUMPS/LICENSE \
- MUMPS/README \
- MUMPS/VERSION
-
-mumpsdir= ${includedir}/mumps
-mumps_HEADERS=\
- MUMPS/include/mumps_c_types.h \
- MUMPS/include/mumps_compat.h \
- \
- MUMPS/include/smumps_c.h \
- MUMPS/include/smumps_root.h \
- MUMPS/include/smumps_struc.h \
- \
- MUMPS/include/dmumps_c.h \
- MUMPS/include/dmumps_root.h \
- MUMPS/include/dmumps_struc.h \
- \
- MUMPS/include/cmumps_c.h \
- MUMPS/include/cmumps_root.h \
- MUMPS/include/cmumps_struc.h \
- \
- MUMPS/include/zmumps_c.h \
- MUMPS/include/zmumps_root.h \
- MUMPS/include/zmumps_struc.h
-
-libmumps_common_seq_la_SOURCES=\
- MUMPS/src/mumps_part9.F \
- MUMPS/src/mumps_common.c \
- MUMPS/src/mumps_ooc_common.F \
- MUMPS/src/mumps_orderings.c \
- MUMPS/src/mumps_size.c \
- MUMPS/src/mumps_io.c \
- MUMPS/src/mumps_io_basic.c \
- MUMPS/src/mumps_io_thread.c \
- MUMPS/src/mumps_io_err.c \
- MUMPS/src/mumps_static_mapping.F \
- MUMPS/src/mumps_sol_es.F \
- MUMPS/src/tools_common_mod.F \
- \
- MUMPS/libseq/mpi.f \
- MUMPS/libseq/mpic.c \
- MUMPS/libseq/elapse.c
-libmumps_common_seq_la_LIBADD=${FCLIBS}
-libmumps_common_seq_la_LDFLAGS=-release ${PACKAGE_VERSION}
-
-libsmumps_seq_la_SOURCES=\
- MUMPS/src/smumps_part1.F \
- MUMPS/src/smumps_part2.F \
- MUMPS/src/smumps_part3.F \
- MUMPS/src/smumps_part4.F \
- MUMPS/src/smumps_part5.F \
- MUMPS/src/smumps_part6.F \
- MUMPS/src/smumps_part7.F \
- MUMPS/src/smumps_part8.F \
- MUMPS/src/smumps_comm_buffer.F \
- MUMPS/src/smumps_load.F \
- MUMPS/src/smumps_c.c \
- MUMPS/src/smumps_ooc_buffer.F \
- MUMPS/src/smumps_ooc.F \
- MUMPS/src/smumps_struc_def.F
-libsmumps_seq_la_LIBADD=libmumps_common_seq.la
-libsmumps_seq_la_LDFLAGS=-release ${PACKAGE_VERSION}
-
-smumps_part1.lo smumps_part2.lo: smumps_load.lo smumps_ooc.lo
-smumps_part3.lo smumps_part4.lo: smumps_load.lo smumps_ooc.lo
-smumps_part5.lo smumps_part6.lo: smumps_load.lo smumps_ooc.lo smumps_part2.lo
-smumps_part7.lo smumps_part8.lo: smumps_load.lo smumps_ooc.lo
-
-smumps_ooc.lo smumps_load.lo: smumps_comm_buffer.lo
-smumps_ooc.lo smumps_load.lo: smumps_struc_def.lo
-smumps_ooc.lo smumps_load.lo: smumps_ooc_buffer.lo
-
-libdmumps_seq_la_SOURCES=\
- MUMPS/src/dmumps_part1.F \
- MUMPS/src/dmumps_part2.F \
- MUMPS/src/dmumps_part3.F \
- MUMPS/src/dmumps_part4.F \
- MUMPS/src/dmumps_part5.F \
- MUMPS/src/dmumps_part6.F \
- MUMPS/src/dmumps_part7.F \
- MUMPS/src/dmumps_part8.F \
- MUMPS/src/dmumps_comm_buffer.F \
- MUMPS/src/dmumps_load.F \
- MUMPS/src/dmumps_c.c \
- MUMPS/src/dmumps_ooc_buffer.F \
- MUMPS/src/dmumps_ooc.F \
- MUMPS/src/dmumps_struc_def.F
-libdmumps_seq_la_LIBADD=libmumps_common_seq.la
-libdmumps_seq_la_LDFLAGS=-release ${PACKAGE_VERSION}
-
-dmumps_part1.lo dmumps_part2.lo: dmumps_load.lo dmumps_ooc.lo
-dmumps_part3.lo dmumps_part4.lo: dmumps_load.lo dmumps_ooc.lo
-dmumps_part5.lo dmumps_part6.lo: dmumps_load.lo dmumps_ooc.lo dmumps_part2.lo
-dmumps_part7.lo dmumps_part8.lo: dmumps_load.lo dmumps_ooc.lo
-
-dmumps_ooc.lo dmumps_load.lo: dmumps_comm_buffer.lo
-dmumps_ooc.lo dmumps_load.lo: dmumps_struc_def.lo
-dmumps_ooc.lo dmumps_load.lo: dmumps_ooc_buffer.lo
-
-libcmumps_seq_la_SOURCES=\
- MUMPS/src/cmumps_part1.F \
- MUMPS/src/cmumps_part2.F \
- MUMPS/src/cmumps_part3.F \
- MUMPS/src/cmumps_part4.F \
- MUMPS/src/cmumps_part5.F \
- MUMPS/src/cmumps_part6.F \
- MUMPS/src/cmumps_part7.F \
- MUMPS/src/cmumps_part8.F \
- MUMPS/src/cmumps_comm_buffer.F \
- MUMPS/src/cmumps_load.F \
- MUMPS/src/cmumps_c.c \
- MUMPS/src/cmumps_ooc_buffer.F \
- MUMPS/src/cmumps_ooc.F \
- MUMPS/src/cmumps_struc_def.F
-libcmumps_seq_la_LIBADD=libmumps_common_seq.la
-libcmumps_seq_la_LDFLAGS=-release ${PACKAGE_VERSION}
-
-cmumps_part1.lo cmumps_part2.lo: cmumps_load.lo cmumps_ooc.lo
-cmumps_part3.lo cmumps_part4.lo: cmumps_load.lo cmumps_ooc.lo
-cmumps_part5.lo cmumps_part6.lo: cmumps_load.lo cmumps_ooc.lo cmumps_part2.lo
-cmumps_part7.lo cmumps_part8.lo: cmumps_load.lo cmumps_ooc.lo
-
-cmumps_ooc.lo cmumps_load.lo: cmumps_comm_buffer.lo
-cmumps_ooc.lo cmumps_load.lo: cmumps_struc_def.lo
-cmumps_ooc.lo cmumps_load.lo: cmumps_ooc_buffer.lo
-
-libzmumps_seq_la_SOURCES=\
- MUMPS/src/zmumps_part1.F \
- MUMPS/src/zmumps_part2.F \
- MUMPS/src/zmumps_part3.F \
- MUMPS/src/zmumps_part4.F \
- MUMPS/src/zmumps_part5.F \
- MUMPS/src/zmumps_part6.F \
- MUMPS/src/zmumps_part7.F \
- MUMPS/src/zmumps_part8.F \
- MUMPS/src/zmumps_comm_buffer.F \
- MUMPS/src/zmumps_load.F \
- MUMPS/src/zmumps_c.c \
- MUMPS/src/zmumps_ooc_buffer.F \
- MUMPS/src/zmumps_ooc.F \
- MUMPS/src/zmumps_struc_def.F
-libzmumps_seq_la_LIBADD=libmumps_common_seq.la
-libzmumps_seq_la_LDFLAGS=-release ${PACKAGE_VERSION}
-
-zmumps_part1.lo zmumps_part2.lo: zmumps_load.lo zmumps_ooc.lo
-zmumps_part3.lo zmumps_part4.lo: zmumps_load.lo zmumps_ooc.lo
-zmumps_part5.lo zmumps_part6.lo: zmumps_load.lo zmumps_ooc.lo zmumps_part2.lo
-zmumps_part7.lo zmumps_part8.lo: zmumps_load.lo zmumps_ooc.lo
-
-zmumps_ooc.lo zmumps_load.lo: zmumps_comm_buffer.lo
-zmumps_ooc.lo zmumps_load.lo: zmumps_struc_def.lo
-zmumps_ooc.lo zmumps_load.lo: zmumps_ooc_buffer.lo
-
-libsmumps_seq.la libdmumps_seq.la libcmumps_seq.la libzmumps_seq.la: \
- libmumps_common_seq.la
-MUMPS/src/%mumps_c.c: MUMPS/src/mumps_c.c
- echo '#define MUMPS_ARITH MUMPS_ARITH_$*' >$@
- ${SED} -e '' $< >>$@
diff --git a/mumps/files/configure.ac b/mumps/files/configure.ac
deleted file mode 100644
index 8c49c9ee..00000000
--- a/mumps/files/configure.ac
+++ /dev/null
@@ -1,34 +0,0 @@
-# autoconf script for MUMPS
-
-AC_PREREQ(2.62)
-AC_INIT([mumps],[@VERSION@])
-
-AC_CONFIG_SRCDIR([MUMPS/src/dmumps_part1.F])
-AM_INIT_AUTOMAKE([foreign no-define])
-
-# compilers et al.
-AC_PROG_CC
-AC_PROG_F77
-AC_FC_WRAPPERS
-AC_PROG_INSTALL
-AC_PROG_LIBTOOL
-
-# verify that we can compile Fortran 90 code
-AC_MSG_CHECKING([whether we can compile Fortran 90 code])
-AC_LANG_PUSH(Fortran 77)
-AC_COMPILE_IFELSE([ MODULE BLA
- DOUBLE PRECISION, DIMENSION(:), ALLOCATABLE :: BLUBB
- END MODULE BLA],[can_f90=yes],[can_f90=no])
-AC_MSG_RESULT([$can_f90])
-AC_LANG_POP(Fortran 77)
-if test $can_f90 = no; then
- AC_MSG_ERROR([your Fortran compiler can't compile Fortran 90])
-fi
-
-# check for pthread.h header file
-AC_CHECK_HEADER([pthread.h],,[CPPFLAGS="$CPPFLAGS -DWITHOUT_PTHREAD=1"])
-AC_CHECK_LIB([pthread],[pthread_create],[LIBS="-lpthread $LIBS"])
-
-# output
-AC_CONFIG_FILES([Makefile])
-AC_OUTPUT
diff --git a/mumps/patches/patch-aa b/mumps/patches/patch-aa
deleted file mode 100644
index 5be1c0e6..00000000
--- a/mumps/patches/patch-aa
+++ /dev/null
@@ -1,20 +0,0 @@
---- MUMPS/src/mumps_common.h~ 2011-05-10 14:56:41.000000000 +0200
-+++ MUMPS/src/mumps_common.h 2012-03-08 13:36:41.647255329 +0100
-@@ -62,6 +62,9 @@
- * knowledge, there is no way to perform the conversion with CPP
- * directives only.
- */
-+#define F_SYMBOL(lower_case,upper_case) \
-+ FC_FUNC(mumps_ ## lower_case,MUMPS_ ## upper_case)
-+#if 0
- #if defined(UPPER) || defined(MUMPS_WIN32)
- # define F_SYMBOL(lower_case,upper_case) MUMPS_##upper_case
- #elif defined(Add_)
-@@ -71,6 +74,7 @@
- #else
- # define F_SYMBOL(lower_case,upper_case) mumps_##lower_case
- #endif
-+#endif
- MUMPS_INT*
- mumps_get_mapping();
- #define MUMPS_AFFECT_MAPPING \
diff --git a/mumps/patches/patch-ab b/mumps/patches/patch-ab
deleted file mode 100644
index cb530a99..00000000
--- a/mumps/patches/patch-ab
+++ /dev/null
@@ -1,31 +0,0 @@
---- MUMPS/src/mumps_c.c~ 2011-05-10 14:56:41.000000000 +0200
-+++ MUMPS/src/mumps_c.c 2012-03-08 13:39:25.063255287 +0100
-@@ -80,6 +80,20 @@
- * CMUMPS_XXX in the code to get rid of any symbol convention annoyance.
- */
- #if MUMPS_ARITH == MUMPS_ARITH_s
-+# define F_SYM_ARITH(lower_case,upper_case) \
-+ FC_FUNC(smumps_ ## lower_case, SMUMPS_ ## upper_case)
-+#elif MUMPS_ARITH == MUMPS_ARITH_d
-+# define F_SYM_ARITH(lower_case,upper_case) \
-+ FC_FUNC(dmumps_ ## lower_case, DMUMPS_ ## upper_case)
-+#elif MUMPS_ARITH == MUMPS_ARITH_c
-+# define F_SYM_ARITH(lower_case,upper_case) \
-+ FC_FUNC(cmumps_ ## lower_case, CMUMPS_ ## upper_case)
-+#elif MUMPS_ARITH == MUMPS_ARITH_z
-+# define F_SYM_ARITH(lower_case,upper_case) \
-+ FC_FUNC(zmumps_ ## lower_case, ZMUMPS_ ## upper_case)
-+#endif
-+#if 0
-+#if MUMPS_ARITH == MUMPS_ARITH_s
- # if defined(UPPER) || defined(MUMPS_WIN32)
- # define F_SYM_ARITH(lower_case,upper_case) SMUMPS_##upper_case
- # elif defined(Add_)
-@@ -120,6 +134,7 @@
- # define F_SYM_ARITH(lower_case,upper_case) zmumps_##lower_case
- # endif
- #endif
-+#endif
- #define MUMPS_F77 \
- F_SYM_ARITH(f77,F77)
- void MUMPS_CALL
diff --git a/mumps/patches/patch-ac b/mumps/patches/patch-ac
deleted file mode 100644
index 0ab68a6f..00000000
--- a/mumps/patches/patch-ac
+++ /dev/null
@@ -1,18 +0,0 @@
---- MUMPS/libseq/elapse.h~ 2011-05-10 14:56:39.000000000 +0200
-+++ MUMPS/libseq/elapse.h 2012-03-09 11:07:51.047255368 +0100
-@@ -59,6 +59,8 @@
- #endif
- #endif
-
-+#define mumps_elapse FC_FUNC(mumps_elapse, MUMPS_ELAPSE)
-+#if 0
- #if (defined(_WIN32) && ! defined(__MINGW32__)) || defined(UPPER)
- #define mumps_elapse MUMPS_ELAPSE
- #elif defined(Add__)
-@@ -66,5 +68,6 @@
- #elif defined(Add_)
- #define mumps_elapse mumps_elapse_
- #endif
-+#endif
-
- void MUMPS_CALL mumps_elapse(double *val);
--
GitLab