Skip to content

Commit

Permalink
Merge pull request #146 from linbox-team/remove_sage_interface
Browse files Browse the repository at this point in the history
remove sage binding
  • Loading branch information
david-lucas committed Dec 5, 2018
2 parents 330783c + 512d27e commit ffd6681
Show file tree
Hide file tree
Showing 7 changed files with 6 additions and 380 deletions.
2 changes: 0 additions & 2 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,6 @@ LB_CHECK_NTL

LB_CHECK_SACLIB
LB_CHECK_MAPLE
LB_CHECK_SAGE

LB_CHECK_EXPAT

Expand Down Expand Up @@ -338,7 +337,6 @@ interfaces/Makefile
interfaces/driver/Makefile
interfaces/maple/Makefile
interfaces/kaapi/Makefile
interfaces/sage/Makefile
macros/Makefile
macros/CodeChunk/Makefile
benchmarks/Makefile
Expand Down
3 changes: 1 addition & 2 deletions interfaces/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@



SUBDIRS=driver kaapi maple sage

SUBDIRS=driver kaapi maple


42 changes: 0 additions & 42 deletions interfaces/sage/Makefile.am

This file was deleted.

175 changes: 0 additions & 175 deletions interfaces/sage/linbox-sage.C

This file was deleted.

65 changes: 0 additions & 65 deletions interfaces/sage/linbox-sage.h

This file was deleted.

34 changes: 5 additions & 29 deletions linbox-auto-install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,6 @@ EXTRA=""
EXTRA_VAR=""
IML="--with-iml"
IML_VAR=""
SAGE=""
SAGE_VAR="false"
DRIV=""
DRIV_VAR="false"
OPENBLAS=""
Expand Down Expand Up @@ -131,8 +129,6 @@ help() {
echo " Default : disabled. May be \'full\' "
echo " --enable-optimization : build with compile-time optimization."
echo " Default : enabled."
echo " --enable-sage : build with sage support."
echo " Default : disabled."
echo " --enable-drivers : build with drivers support."
echo " Default : disabled."
echo
Expand Down Expand Up @@ -241,21 +237,11 @@ for i in "$@" ; do
IML="$i "
IML_VAR="true"
;;
"--enable-sage")
if [ "x$SAGE_VAR" = "xfalse" ] ; then echo "enable-sage or not ?"; help ; exit -1; fi
SAGE="$i"
SAGE_VAR="true"
;;
"--enable-drivers")
if [ "x$DRIV_VAR" = "xfalse" ] ; then echo "enable-drivers or not ?" ; help ; exit -1; fi
DRIV="$i"
DRIV_VAR="true"
;;
"--disable-sage")
if [ "x$SAGE_VAR" = "xtrue" ] ; then echo "enable-sage or not ?"; help ; exit -1; fi
SAGE=""
SAGE_VAR="false"
;;
"--disable-drivers")
if [ "x$DRIV_VAR" = "xtrue" ] ; then echo "enable-drivers or not ?" ; help ; exit -1; fi
DRIV=""
Expand Down Expand Up @@ -379,16 +365,6 @@ for i in "$@" ; do
CHECK_VAR="false"
fi
;;
"--enable-sage")
[[ "$QUOI" =~ y|yes|Y|1 ]] && OK=1 || OK=0
if [ "x$SAGE_VAR" = "xtrue" -a "OK" = "0" ] ; then echo "sage or not sage ?" ; help ; exit -1; fi
if [ "x$SAGE_VAR" = "xfalse" -a "OK" = "1" ] ; then echo "sage or not sage ?" ; help ; exit -1; fi
if [[ "x$OK" = "x1" ]] ; then
SAGE=$QUI ; SAGE_VAR="true"
else
SAGE_VAR="false"
fi
;;
"--enable-drivers")
[[ "$QUOI" =~ y|yes|Y|1 ]] && OK=1 || OK=0
if [ "x$OPTIM_VAR" = "xtrue" -a "OK" = "0" ] ; then echo "drivers or not drivers ?" ; help ; exit -1; fi
Expand Down Expand Up @@ -859,12 +835,12 @@ echo -e " * to ensure you don't get undefined symbols !"| tee -a ./auto-install.
echo ""| tee -a ./auto-install.log

if [ -x autogen.sh ] ; then
echo "./autogen.sh $PREFIX $DEBUG $OPTIM $GMP $BLAS $NTL $WARNINGS $IML $SAGE $DRIV"| tee -a ./auto-install.log
./autogen.sh "$PREFIX" "$DEBUG" "$OPTIM" "$GMP" "$BLAS" "$NTL" "$WARNINGS" "$IML" "$SAGE" "$DRIV" | tee -a ./auto-install.log|| die
echo "./autogen.sh $PREFIX $DEBUG $OPTIM $GMP $BLAS $NTL $WARNINGS $IML $DRIV"| tee -a ./auto-install.log
./autogen.sh "$PREFIX" "$DEBUG" "$OPTIM" "$GMP" "$BLAS" "$NTL" "$WARNINGS" "$IML" "$DRIV" | tee -a ./auto-install.log|| die
else
echo "./configure $PREFIX $DEBUG $OPTIM $GMP $BLAS $NTL $WARNINGS $IML $SAGE $DRIV"| tee -a ./auto-install.log
# ./configure $PREFIX $DEBUG $OPTIM $GMP $BLAS $NTL $WARNINGS $IML $SAGE $DRIV || die
./configure "$PREFIX" "$DEBUG" "$OPTIM" "$GMP" "$BLAS" "$NTL" "$WARNINGS" "$IML" "$SAGE" "$DRIV" | tee -a ./auto-install.log|| die
echo "./configure $PREFIX $DEBUG $OPTIM $GMP $BLAS $NTL $WARNINGS $IML $DRIV"| tee -a ./auto-install.log
# ./configure $PREFIX $DEBUG $OPTIM $GMP $BLAS $NTL $WARNINGS $IML $DRIV || die
./configure "$PREFIX" "$DEBUG" "$OPTIM" "$GMP" "$BLAS" "$NTL" "$WARNINGS" "$IML" "$DRIV" | tee -a ./auto-install.log|| die
fi

echo -e "${BEG}building LinBox..."| tee -a ./auto-install.log
Expand Down
Loading

0 comments on commit ffd6681

Please sign in to comment.