Changeset d828d63 in git


Ignore:
Timestamp:
Aug 2, 2012, 10:29:12 AM (10 years ago)
Author:
Hans Schoenemann <hannes@…>
Branches:
(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', '96ce329119711a2b80858c8365abd29f8460bbfa')
Children:
0419aba8292e7109329604d8ad03b70f8ef65423
Parents:
85bcd6879cf375abcd839182c40d607f5e1e7884
Message:
removed MPSR stuff
Files:
16 deleted
12 edited

Legend:

Unmodified
Added
Removed
  • Singular/Makefile.am

    r85bcd6 rd828d63  
    6868   minpoly.cc\
    6969   misc_ip.cc\
    70    mpsr_Error.cc\
    71    mpsr_Get.cc\
    72    mpsr_GetMisc.cc\
    73    mpsr_GetPoly.cc\
    74    mpsr_Put.cc\
    75    mpsr_PutPoly.cc\
    76    mpsr_Timer.cc\
    77    mpsr_Tok.cc\
    78    mpsr_sl.cc\
    7970   ndbm.cc\
    8071   newstruct.cc\
     
    132123   mmalloc.h \
    133124   omSingularConfig.h \
    134    mpsr.h \
    135    mpsr_Get.h \
    136    mpsr_Put.h \
    137    mpsr_Timer.h \
    138    mpsr_Tok.h \
    139    mpsr_sl.h \
    140125   ndbm.h \
    141126   newstruct.h \
     
    158143
    159144# plural_cmd.inc
    160 nodist_libSingular_la_SOURCES = mpsr_Tok.inc iparith.inc
    161 nodist_libSingular_g_la_SOURCES = mpsr_Tok.inc iparith.inc
     145nodist_libSingular_la_SOURCES = iparith.inc
     146nodist_libSingular_g_la_SOURCES = iparith.inc
    162147
    163148noinst_HEADERS = version.h
     
    364349
    365350# These files are built first
    366 BUILT_SOURCES = feOpt.inc feOptTS.inc feOptES.inc mpsr_Tok.inc iparith.inc LIB/all.lib plural_cmd.inc \
     351BUILT_SOURCES = feOpt.inc feOptTS.inc feOptES.inc iparith.inc LIB/all.lib plural_cmd.inc \
    367352                gftables MOD
    368353
     
    384369# plural_cmd.inc: iparith.inc
    385370
    386 mpsr_Tok.inc: gentable2
    387         ${abs_builddir}/gentable2
    388 
    389 
    390371
    391372gftables: ${abs_top_srcdir}/factory/gftables
  • Singular/extra.cc

    r85bcd6 rd828d63  
    434434            //TEST_FOR("libfac")
    435435          #endif
    436           #ifdef HAVE_MPSR
    437             TEST_FOR("MP")
    438           #endif
    439436          #ifdef HAVE_READLINE
    440437            TEST_FOR("readline")
     
    22372234#    include <hc_newton.h>
    22382235#  endif
    2239 #  include <mpsr.h>
    22402236#  include <polys/mod_raw.h>
    22412237#  include <polys/monomials/ring.h>
  • Singular/feOptTab.h

    r85bcd6 rd828d63  
    140140   "LINK",     "Use LINK for connections",                             feOptString,    0,   0},
    141141
    142 #ifdef HAVE_MPSR
    143   {"MPrsh",           required_argument,   LONG_OPTION_RETURN,
    144    "RSH",     "Use RSH for MP connections",                            feOptString,    0,   0},
    145 #endif
    146 
    147142  {"ticks-per-sec",     required_argument,  LONG_OPTION_RETURN,
    148143   "TICKS",     "Sets unit of timer to TICKS per second",               feOptInt,    (void*)1,      0},
    149 
    150 // undocumented options
    151 #ifdef HAVE_MPSR
    152   {"MPtransp",         required_argument,   LONG_OPTION_RETURN,
    153    "TRANSP",    "// Use TRANSP for MP connections",                     feOptString,    0,   0},
    154 
    155   {"MPmode",           required_argument,   LONG_OPTION_RETURN,
    156    "MODE",      "// Use MODE for MP connections",                       feOptString,    0,   0},
    157 #endif
    158144
    159145// terminator -- do NOT remove
  • Singular/misc_ip.cc

    r85bcd6 rd828d63  
    367367
    368368
    369 /* version strings */
    370 #ifdef HAVE_MPSR
    371 #include <MP_Config.h>
    372 #endif
    373 
    374369/*2
    375370* the renice routine for very large jobs
     
    761756              StringAppend("NTL(%s),",NTL_VERSION);
    762757#endif
    763 #ifdef HAVE_MPSR
    764               StringAppend("MP(%s),",MP_VERSION);
    765 #endif
    766758#if SIZEOF_VOIDP == 8
    767759              StringAppendS("64bit,");
     
    1003995* the global exit routine of Singular
    1004996*/
    1005 #ifdef HAVE_MPSR
    1006 void (*MP_Exit_Env_Ptr)()=NULL;
    1007 #endif
    1008 
    1009997extern "C" {
    1010998
     
    10541042    }
    10551043  }
    1056   #ifdef HAVE_MPSR
    1057   if (MP_Exit_Env_Ptr!=NULL) (*MP_Exit_Env_Ptr)();
    1058   #endif
    10591044  exit(i);
    10601045}
  • Singular/silink.cc

    r85bcd6 rd828d63  
    834834
    835835  if (0) 0;
    836 #ifdef HAVE_MPSR
    837   else if (strcmp(type, "MPfile") == 0)
    838     s->next = slInitMPFileExtension(ns);
    839   else if (strcmp(type, "MPtcp") == 0)
    840     s->next = slInitMPTcpExtension(ns);
    841 #endif
    842836#ifdef HAVE_DBM
    843837  else if (strcmp(type, "DBM") == 0)
  • Singular/slInit.h

    r85bcd6 rd828d63  
    1313#include <Singular/silink.h>
    1414
    15 #ifdef HAVE_MPSR
    16 si_link_extension slInitMPFileExtension(si_link_extension s);
    17 si_link_extension slInitMPTcpExtension(si_link_extension s);
    18 
    19 typedef int (*BatchDoProc)(const char* port, const char* host);
    20 BatchDoProc slInitMPBatchDo();
    21 #endif // HAVE_MPSR
    22 
    2315#ifdef HAVE_DBM
    2416si_link_extension slInitDBMExtension(si_link_extension s);
  • Singular/slInit_Dynamic.cc

    r85bcd6 rd828d63  
    99 *******************************************************************/
    1010
    11 /***************************************************************
    12  *
    13  * MP link Extension inits
    14  *
    15  ***************************************************************/
    1611#include "config.h"
    1712#include <kernel/mod2.h>
     
    2116
    2217#ifdef HAVE_DL
    23 #ifdef HAVE_MPSR
    24 #include <MP.h>
    25 #include "mpsr_sl.h"
    26 
    27 static void* mpsr_so_handle = NULL;
    28 typedef void (*voidProc)();
    29 
    30 static void* slInitMPSRHandle()
    31 {
    32   if (mpsr_so_handle == NULL)
    33   {
    34     mpsr_so_handle = dynl_open_binary_warn("mpsr");
    35     if (mpsr_so_handle != NULL)
    36     {
    37       voidProc init_proc = (voidProc)
    38         dynl_sym_warn(mpsr_so_handle, "mpsr_Init");
    39       if (init_proc != NULL)
    40         (*init_proc)();
    41       else
    42         mpsr_so_handle = NULL;
    43     }
    44   }
    45   return mpsr_so_handle;
    46 }
    47 
    48 si_link_extension slInitMPFileExtension(si_link_extension s)
    49 {
    50   void* handle = slInitMPSRHandle();
    51 
    52   if (handle == NULL) return NULL;
    53 
    54   s->Open = (slOpenProc) dynl_sym_warn(handle, "slOpenMPFile");
    55   s->Close = (slCloseProc) dynl_sym_warn(handle, "slCloseMP");
    56   s->Kill = (slKillProc) s->Close;
    57   s->Read = (slReadProc) dynl_sym_warn(handle, "slReadMP");
    58   s->Dump = (slDumpProc) dynl_sym_warn(handle, "slDumpMP");
    59   s->GetDump = (slGetDumpProc) dynl_sym_warn(handle, "slGetDumpMP");
    60   s->Write = (slWriteProc) dynl_sym_warn(handle, "slWriteMP");
    61   s->Status = (slStatusProc) dynl_sym_warn(handle, "slStatusMP");
    62   if (s->Open == NULL || s->Close == NULL || s->Kill == NULL ||
    63       s->Read == NULL || s->Dump == NULL || s->GetDump == NULL ||
    64       s->Write == NULL || s->Status == NULL)
    65     return NULL;
    66 
    67   s->type="MPfile";
    68   return s;
    69 }
    70 
    71 si_link_extension slInitMPTcpExtension(si_link_extension s)
    72 {
    73   void* handle = slInitMPSRHandle();
    74 
    75   if (handle == NULL) return NULL;
    76 
    77   s->Open = (slOpenProc) dynl_sym_warn(handle, "slOpenMPTcp");
    78   s->Close = (slCloseProc) dynl_sym_warn(handle, "slCloseMP");
    79   s->Kill = (slKillProc) dynl_sym_warn(handle, "slKillMP");
    80   s->Read = (slReadProc) dynl_sym_warn(handle, "slReadMP");
    81   s->Dump = (slDumpProc) dynl_sym_warn(handle, "slDumpMP");
    82   s->GetDump = (slGetDumpProc) dynl_sym_warn(handle, "slGetDumpMP");
    83   s->Write = (slWriteProc) dynl_sym_warn(handle, "slWriteMP");
    84   s->Status = (slStatusProc) dynl_sym_warn(handle, "slStatusMP");
    85 
    86   if (s->Open == NULL || s->Close == NULL || s->Kill == NULL ||
    87       s->Read == NULL || s->Dump == NULL || s->GetDump == NULL ||
    88       s->Write == NULL || s->Status == NULL)
    89     return NULL;
    90 
    91   s->type="MPtcp";
    92   return s;
    93 }
    94 
    95 BatchDoProc slInitMPBatchDo()
    96 {
    97   void* handle = slInitMPSRHandle();
    98 
    99   if (handle == NULL) return NULL;
    100   return (BatchDoProc) dynl_sym_warn(handle, "Batch_do");
    101 }
    102 #endif
    10318
    10419#ifdef HAVE_DBM
  • Singular/slInit_Static.cc

    r85bcd6 rd828d63  
    99 *******************************************************************/
    1010
    11 /***************************************************************
    12  *
    13  * MP link Extension inits
    14  *
    15  ***************************************************************/
    1611#include "config.h"
    1712#include <kernel/mod2.h>
     
    1914#include <Singular/silink.h>
    2015#include <Singular/slInit.h>
    21 
    22 #ifdef HAVE_MPSR
    23 
    24 #include <MP.h>
    25 #include <Singular/mpsr_sl.h>
    26 
    27 extern void mpsr_Init();
    28 
    29 si_link_extension slInitMPFileExtension(si_link_extension s)
    30 {
    31   mpsr_Init();
    32   s->Open=slOpenMPFile;
    33   s->Close=slCloseMP;
    34   s->Kill=slCloseMP;
    35   s->Read=slReadMP;
    36   s->Dump=slDumpMP;
    37   s->GetDump=slGetDumpMP;
    38   s->Write=slWriteMP;
    39   s->Status=slStatusMP;
    40   s->type="MPfile";
    41   return s;
    42 }
    43 
    44 si_link_extension slInitMPTcpExtension(si_link_extension s)
    45 {
    46   mpsr_Init();
    47   s->Open=slOpenMPTcp;
    48   s->Close=slCloseMP;
    49   s->Kill=slKillMP;
    50   s->Read=slReadMP;
    51   s->Dump=slDumpMP;
    52   s->GetDump=slGetDumpMP;
    53   s->Write=slWriteMP;
    54   s->Status=slStatusMP;
    55   s->type="MPtcp";
    56   return s;
    57 }
    58 
    59 BatchDoProc slInitMPBatchDo()
    60 {
    61   mpsr_Init();
    62   return Batch_do;
    63 }
    64 #endif
    6516
    6617#ifdef HAVE_DBM
  • Singular/ssiLink.cc

    r85bcd6 rd828d63  
    4444#include <Singular/blackbox.h>
    4545#include <Singular/ssiLink.h>
    46 
    47 #ifdef HAVE_MPSR
    48 #include <Singular/mpsr.h>
    49 #endif
    5046
    5147struct snumber_dummy
     
    14141410  si_link l;
    14151411  ssiInfo *d;
    1416   #ifdef HAVE_MPSR
    1417   MP_Link_pt dd;
    1418   #endif
    14191412  int d_fd;
    14201413  fd_set  mask, fdmask;
     
    14851478        return -2;
    14861479      }
    1487     #ifdef HAVE_MPSR
    1488       if (strcmp(l->m->type,"ssi")==0)
    1489       {
    1490         d=(ssiInfo*)l->data;
    1491         d_fd=d->fd_read;
    1492         if (d->ungetc_buf=='\0')
    1493         {
    1494           FD_SET(d_fd, &fdmask);
    1495           if (d_fd > max_fd) max_fd=d_fd;
    1496         }
    1497         else
    1498           return i+1;
    1499       }
    1500       else
    1501       {
    1502         dd=(MP_Link_pt)l->data;
    1503         d_fd=((MP_TCP_t *)dd->transp.private1)->sock;
    1504         FD_SET(d_fd, &fdmask);
    1505         if (d_fd > max_fd) max_fd=d_fd;
    1506       }
    1507     #else
    15081480      d=(ssiInfo*)l->data;
    15091481      d_fd=d->fd_read;
     
    15151487      else
    15161488        return i+1;
    1517     #endif
    15181489    }
    15191490  }
     
    15581529      {
    15591530        l=(si_link)L->m[i].Data();
    1560         #ifdef HAVE_MPSR
    1561         if (strcmp(l->m->type,"ssi")!=0)
    1562         {
    1563           // for MP links, return here:
    1564           dd=(MP_Link_pt)l->data;
    1565           d_fd=((MP_TCP_t *)dd->transp.private1)->sock;
    1566           if(j==d_fd) return i+1;
    1567         }
    1568         else
    1569         {
    1570           d=(ssiInfo*)l->data;
    1571           d_fd=d->fd_read;
    1572           if(j==d_fd) break;
    1573         }
    1574         #else
    15751531        d=(ssiInfo*)l->data;
    15761532        d_fd=d->fd_read;
    15771533        if(j==d_fd) break;
    1578         #endif
    15791534      }
    15801535    }
  • Singular/tesths.cc

    r85bcd6 rd828d63  
    237237      //exit(0);
    238238    }
    239     else
    240     {
    241     #ifdef HAVE_MPSR
    242       BatchDoProc batch_do = slInitMPBatchDo();
    243       if (batch_do != NULL)
    244         return (*batch_do)((char*) feOptValue(FE_OPT_MPPORT),
    245                          (char*) feOptValue(FE_OPT_MPHOST));
    246       else
    247         return 1;
    248     #else
    249       // assume(0); // commented out as MP was deprecated!!!
    250     #endif
    251     }
    252239  }
    253240  setjmp(si_start_jmpbuf);
  • kernel/misc.cc

    r85bcd6 rd828d63  
    2121#include <coeffs/si_gmp.h>
    2222#include <omalloc/omalloc.h>
    23 
    24 #ifdef HAVE_MPSR
    25 #include <MP_Config.h>
    26 #endif
    2723
    2824/* init bins */
  • kernel/mod2.h

    r85bcd6 rd828d63  
    319319#define YYDEBUG 1
    320320
    321 /* Undefine to disable debugging of MP stuff */
    322 #ifdef HAVE_MPSR
    323 #undef HAVE_MPSR
    324 // #define MPSR_DEBUG
    325 #endif
    326 
    327 #ifdef MPSR_DEBUG
    328 #undef MPSR_DEBUG
    329 #endif
    330 
    331 
    332321/* define SPECTRUM_DEBUG and SPECTRUM_PRINT for debugging the spectrum code */
    333322/* define SPECTRUM_IOSTREAM to use C++ iostream for error messages          */
Note: See TracChangeset for help on using the changeset viewer.