Changeset 5d4bee in git


Ignore:
Timestamp:
Mar 1, 2021, 10:42:45 AM (3 years ago)
Author:
Hans Schoenemann <hannes@…>
Branches:
(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'd25190065115c859833252500a64cfb7b11e3a50')
Children:
aa00f22b18ef5a46d13b45fd9680d515cecba785
Parents:
22ff92e70eab88027fc485df829726f2cd395149fba40bd20c43a0fa08dce03d6c5846f476cec7e9
Message:
Merge branch 'disable-python-by-default' of https://github.com/mkoeppe/Sources into mkoeppe-disable-python-by-default
Files:
14 edited

Legend:

Unmodified
Added
Removed
  • .github/workflows/ci-sage.yml

    rfba40b r5d4bee  
    5353  # Sage distribution packages to build
    5454  TARGETS_PRE: build/make/Makefile
    55   TARGETS:     SAGE_CHECK=yes singular
    56   TARGETS_OPTIONAL: SAGE_CHECK=warn pynac pysingular
     55  TARGETS:     SAGE_CHECK=yes singular pynac
     56  TARGETS_OPTIONAL: SAGE_CHECK=warn pysingular
    5757  # Standard setting: Test the current beta release of Sage:
    5858  SAGE_REPO:   sagemath/sage
  • Singular/dyn_modules/python/CF_wrap.cc

    r22ff92 r5d4bee  
    11#include "kernel/mod2.h"
    2 #ifdef HAVE_PYTHON_MOD
    32#include <sstream>
    43#include <boost/python.hpp>
     
    4746    .def(self/=int());
    4847}
    49 #endif
  • Singular/dyn_modules/python/ideal_wrap.cc

    r22ff92 r5d4bee  
    11#include "kernel/mod2.h"
    2 #ifdef HAVE_PYTHON_MOD
    32#include <boost/python.hpp>
    43#include "Poly.h"
     
    7978
    8079}
    81 #endif
  • Singular/dyn_modules/python/interpreter_support.cc

    r22ff92 r5d4bee  
    11#include "kernel/mod2.h"
    2 #ifdef HAVE_PYTHON_MOD
    32#include <sstream>
    43#include <boost/python.hpp>
     
    563562  def("is_builtin", is_builtin);
    564563}
    565 #endif
  • Singular/dyn_modules/python/intvec_wrap.cc

    r22ff92 r5d4bee  
    11#include "kernel/mod2.h"
    2 #ifdef HAVE_PYTHON_MOD
    32#include <boost/python.hpp>
    43#include <boost/python/suite/indexing/vector_indexing_suite.hpp>
     
    3433     .def(boost::python::vector_indexing_suite<Intvec>());
    3534}
    36 #endif
    37 
  • Singular/dyn_modules/python/number_wrap.cc

    r22ff92 r5d4bee  
    11#include "kernel/mod2.h"
    2 #ifdef HAVE_PYTHON_MOD
    32#include <boost/python.hpp>
    43#include "Number.h"
     
    4847    .def("ring",Number_get_Ring);
    4948}
    50 #endif
  • Singular/dyn_modules/python/playground.cc

    r22ff92 r5d4bee  
    11#include "kernel/mod2.h"
    2 #ifdef HAVE_PYTHON_MOD
    32#include <boost/python.hpp>
    43#include "Poly.h"
     
    5453  def("foo2",foo2);
    5554}
    56 #endif
  • Singular/dyn_modules/python/poly_wrap.cc

    r22ff92 r5d4bee  
    11#include "kernel/mod2.h"
    2 #ifdef HAVE_PYTHON_MOD
    32#include <boost/python.hpp>
    43#include "Poly.h"
     
    6059
    6160}
    62 #endif
  • Singular/dyn_modules/python/python_module.cc

    r22ff92 r5d4bee  
    1717
    1818#include <time.h>
    19 #if defined(HAVE_PYTHON_MOD) && defined(HAVE_PYTHON)
    2019#include <boost/python.hpp>
    2120#include <Python.h>
     
    8584  return MAX_TOK;
    8685}
    87 #endif
  • Singular/dyn_modules/python/ring_wrap.cc

    r22ff92 r5d4bee  
    11#include "kernel/mod2.h"
    2 #ifdef HAVE_PYTHON_MOD
    32#include <boost/python.hpp>
    43#include "Singular/ipshell.h"
     
    3736     .def(boost::python::init <>());
    3837}
    39 #endif
  • Singular/dyn_modules/python/vector_wrap.cc

    r22ff92 r5d4bee  
    11#include "kernel/mod2.h"
    2 #ifdef HAVE_PYTHON_MOD
    32#include <boost/python.hpp>
    43#include "Poly.h"
     
    3433    .def("ring",Vector_get_Ring);
    3534}
    36 #endif
  • configure.ac

    r22ff92 r5d4bee  
    137137LB_CHECK_CCLUSTER()
    138138
    139 AX_PYTHON_DEFAULT()
    140 AX_PYTHON_WITH()
    141 AX_PYTHON_ENABLE()
    142 AX_PYTHON_PATH()
    143 AX_PYTHON_VERSION_ENSURE([2.7])
    144 AX_PYTHON_CSPEC
    145 AX_PYTHON_LSPEC
    146 
    147139LB_CHECK_MATHICGB
    148140
     
    172164SING_CHECK_PLURAL
    173165
    174 SING_CHECK_PYTHON_MODULE
     166SING_ENABLE_MODULES
    175167SING_DISABLE_MODULES
    176168SING_BUILTIN_MODULES
     169
     170AX_PYTHON_DEFAULT()
     171AS_IF([test x$enable_python_module != xno -o x$enable_pyobject_module != xno], [
     172  AX_PYTHON_WITH()
     173  AX_PYTHON_ENABLE()
     174  AX_PYTHON_PATH()
     175  AX_PYTHON_VERSION_ENSURE([2.7])
     176  AX_PYTHON_CSPEC
     177  AX_PYTHON_LSPEC
     178])
    177179
    178180AC_ARG_ENABLE(countedref, AS_HELP_STRING([--enable-countedref], [Enable autoloading of reference counted types]),
  • factory/canonicalform.h

    rfba40b r5d4bee  
    206206operator + ( const CanonicalForm&, const CanonicalForm& );
    207207
    208 CF_NO_INLINE CanonicalForm
     208CF_NO_INLINE FACTORY_PUBLIC CanonicalForm
    209209operator - ( const CanonicalForm&, const CanonicalForm& );
    210210
     
    212212operator * ( const CanonicalForm&, const CanonicalForm& );
    213213
    214 CF_NO_INLINE CanonicalForm
     214CF_NO_INLINE FACTORY_PUBLIC CanonicalForm
    215215operator / ( const CanonicalForm&, const CanonicalForm& );
    216216
    217 CF_NO_INLINE CanonicalForm
     217CF_NO_INLINE FACTORY_PUBLIC CanonicalForm
    218218operator % ( const CanonicalForm&, const CanonicalForm& );
    219219
    220 CF_NO_INLINE CanonicalForm
     220CF_NO_INLINE FACTORY_PUBLIC CanonicalForm
    221221div ( const CanonicalForm&, const CanonicalForm& );
    222222
    223 CF_NO_INLINE CanonicalForm
     223CF_NO_INLINE FACTORY_PUBLIC CanonicalForm
    224224mod ( const CanonicalForm&, const CanonicalForm& );
    225225
  • m4/options.m4

    r22ff92 r5d4bee  
    264264])
    265265
    266 AC_DEFUN([SING_CHECK_PYTHON_MODULE],
    267 [
    268 AC_ARG_ENABLE(python_module, AS_HELP_STRING([--enable-python_module], [Enable python_module.so]),
    269 [if test $enableval = yes; then
    270      ENABLE_PYTHON_MODULE="yes"
    271      AC_DEFINE(HAVE_PYTHON_MOD,1,[Enable python_module.so])
    272  else
    273      ENABLE_PYTHON_MODULE="no"
    274  fi
    275 ],[ENABLE_PYTHON_MODULE="no"])
     266AC_DEFUN([SING_ENABLE_MODULES], [dnl
     267  m4_foreach([MOD], [pyobject, python], [dnl
     268    AC_ARG_ENABLE(MOD[-module],
     269                  AS_HELP_STRING([--enable-]MOD[-module], [Enable building optional module ]MOD), [dnl
     270      dnl Nothing to do
     271    ], [dnl
     272      dnl Per default, these modules are disabled
     273      AS_VAR_SET([enable_]MOD[_module], [no])
     274    ])dnl
     275    AM_CONDITIONAL([ENABLE_]m4_toupper(MOD)[_MODULE], [test x$enable_]MOD[_module != xno])dnl
     276  ])dnl
    276277])
    277278
    278279AC_DEFUN([SING_DISABLE_MODULES], [dnl
    279280  m4_foreach([MOD], [staticdemo, subsets, freealgebra, partialgb, syzextra,
    280                      pyobject, gfanlib, polymake, python, customstd,
     281                     gfanlib, polymake, customstd,
    281282                     singmathic, bigintm, Order, gitfan, interval, systhreads,
    282283                     loctriv, cohomo, machinelearning], [dnl
     
    285286      dnl Nothing to do
    286287    ], [dnl
    287       dnl Per default, all modules are enabled
     288      dnl Per default, these modules are enabled
    288289      AS_VAR_SET([enable_]MOD[_module], [yes])
    289290    ])dnl
Note: See TracChangeset for help on using the changeset viewer.