Changeset 636c28 in git

Timestamp:

Mar 24, 2011, 6:36:10 PM (12 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'a800fe4b3e9d37a38c5a10cc0ae9dfa0c15a4ee6')

Children:

de4e64a426712523b3ba44188f1f75f4bb4aad7d

Parents:

e5a4ba6cad9681dda18e8cc54544efb5003d053b

Message:

ADD: "scons debug=1" for debug version
UPD: updated bigintm to support correct (debug/release) version
FIX: some minor warnings (thanks to debug version)

From: Oleksandr Motsak <motsak@mathematik.uni-kl.de>

git-svn-id: file:///usr/local/Singular/svn/trunk@14066 2c84dea3-7e68-4137-9b89-c4e89433aadc

Location:

dyn_modules

Files:

• bigintm/SConstruct (modified) (2 diffs)
• bigintm/bigintm.tst (modified) (1 diff)
• bigintm/mod_main.cc (modified) (4 diffs)
• syzextra/SConstruct (modified) (2 diffs)
• syzextra/mod_main.cc (modified) (11 diffs)
• syzextra/singularxx_defs.h (modified) (1 diff)
• syzextra/syzextra.tst (modified) (1 diff)

dyn_modules/bigintm/SConstruct

@@ -1 +1 @@
 # Emacs edit mode for this file is -*- python -*-
+
+MODNAME = 'bigintm'
+SRCS = ["bigintm.cc", "mod_main.cc"]
+
 env = Environment()
 
@@ -9 +13 @@
 
 
-sing_psico_int_if = env.SharedLibrary('bigintm',
-                               ["bigintm.cc", "mod_main.cc"],
-                               SHLIBPREFIX="", LDMODULESUFFIX=".so",
-                               CPPPATH = SING_INCLUDES,
-                               LIBS=[])
+#env.SharedObject(target = 'mod_main.o', source = 'mod_main.cc')
 
-Default(sing_psico_int_if)
+CXXTEMPLFLAGS = "-fno-implicit-templates --no-exceptions"
 
+
+
+
+### for the use with "scons debug=1"
+if ARGUMENTS.get('debug', 0):
+    ### Works with Singularg only!
+    syzextra_debug_if = env.LoadableModule( MODNAME + '_g',
+        SRCS,
+        SHLIBPREFIX="",
+        LDMODULESUFFIX=".sog",
+        SHLIBSUFFIX = ".sog",
+        CPPPATH = SING_INCLUDES,
+        CXXFLAGS = "-g -Wextra -Wall -pedantic -Wno-long-long " + CXXTEMPLFLAGS,
+        LIBS=[])
+    Default(syzextra_debug_if)
+else:
+    ### Works with any Singular
+    syzextra_if = env.SharedLibrary(MODNAME,
+        SRCS,
+        SHLIBPREFIX="",
+        LDMODULESUFFIX=".so",
+        SHLIBSUFFIX = ".so",
+        CPPPATH = SING_INCLUDES,
+        CPPDEFINES = ["NDEBUG", "OM_NDEBUG"],
+        CXXFLAGS = "-O3 -fomit-frame-pointer --no-rtti " + CXXTEMPLFLAGS,
+        CCFLAGS="-O3 -fomit-frame-pointer ",
+        LIBS=[])
+    Default(syzextra_if)
+
+
+
+### clean with "scons -c ."

dyn_modules/bigintm/bigintm.tst

@@ -1 +1 @@
 echo = 2;
 
-LIB("./bigintm.so");
+"ndebug?: ", system("with", "ndebug");
+"om_ndebug?: ", system("with", "om_ndebug");
 
-bigintm_print_load_counter();
-printBlackboxTypes();
-
-
-LIB("./bigintm.so");
-
-bigintm_print_load_counter();
-printBlackboxTypes();
-
-LIB("./bigintm.so");
-
-bigintm_print_load_counter();
-printBlackboxTypes();
-
+if( system("with", "ndebug") )
+{
+  "Loading the Release version!";
+  LIB("./bigintm.so");
+}
+else
+{
+  "Loading the Debug version!";
+  LIB("./bigintm_g.sog");
+}
 
 printBlackboxTypes();
-
 bigintm_setup();
-
 printBlackboxTypes();
-
 bigintm_setup();
-
 printBlackboxTypes();
 

dyn_modules/bigintm/mod_main.cc

@@ -26 +26 @@
 
 /// listing all blackbox types (debug stuff)
-static BOOLEAN printBlackboxTypes0(leftv __res, leftv __v)
+static BOOLEAN printBlackboxTypes0(leftv __res, leftv /*__v*/)
 {
   NoReturn(__res);
@@ -34 +34 @@
 
 /// init the bigintm (a sample blackbox) type
-static BOOLEAN bigintm_setup0(leftv __res, leftv __v)
+static BOOLEAN bigintm_setup0(leftv __res, leftv /*__v*/)
 {
   NoReturn(__res);
@@ -40 +40 @@
 }
 
-static long int load_counter = -1;
-
-/// init the bigintm (a sample blackbox) type
-static BOOLEAN print_load_counter(leftv __res, leftv __v)
-{
-  Print("print_load_counter: load counter: %ld", load_counter);
-  Print(", printBlackboxTypes: %p", (void*)(printBlackboxTypes0));
-  Print(", bigintm_setup: %p", (void*)(bigintm_setup0));
-  PrintLn();
-
-  NoReturn(__res);
-  return FALSE;
 }
-
-};
 
 
@@ -61 +47 @@
   int mod_init(SModulFunctions* psModulFunctions) 
   {
-    load_counter++;
-    
-    if( !load_counter)
-    {
-      
-      psModulFunctions->iiAddCproc(currPack->libname,(char*)"printBlackboxTypes",FALSE, printBlackboxTypes0);
-      psModulFunctions->iiAddCproc(currPack->libname,(char*)"bigintm_setup",FALSE, bigintm_setup0);
-      psModulFunctions->iiAddCproc(currPack->libname,(char*)"bigintm_print_load_counter",FALSE, print_load_counter);
+    psModulFunctions->iiAddCproc(currPack->libname,(char*)"printBlackboxTypes",FALSE, printBlackboxTypes0);
+    psModulFunctions->iiAddCproc(currPack->libname,(char*)"bigintm_setup",FALSE, bigintm_setup0);
 
-      // Q: should we call 'bigintm_setup' here??!?!?
-      return 0;
-    }
-    else
-    {
-      PrintS("ERROR: Sorry this dynamic module was already loaded...!!!");
-      PrintLn();
-      // Q: what about loading this module multipple times...?
-      return 0; // -1? - No difference!!!
-
-    }
-      
+    // Q: should we call 'bigintm_setup' here??!?!?
+    return 0;
   }
 }

dyn_modules/syzextra/SConstruct

@@ -1 +1 @@
 # Emacs edit mode for this file is -*- python -*-
+
+MODNAME = 'syzextra'
+SRCS = ["mod_main.cc", "DebugPrint.cc", "myNF.cc"]
+
 env = Environment()
 
@@ -11 +15 @@
 #env.SharedObject(target = 'mod_main.o', source = 'mod_main.cc')
 
+CXXTEMPLFLAGS = "-fno-implicit-templates --no-exceptions"
 
-### Works with any Singular
-#syzextra_if = env.SharedLibrary('syzextra',
-#                               ["mod_main.cc", "DebugPrint.cc", "myNF.cc"],
-#                               SHLIBPREFIX="", LDMODULESUFFIX=".so", CPPDEFINES = 'NDEBUG', SHLIBSUFFIX = ".so",
-#                               CPPPATH = SING_INCLUDES,
-#                               LIBS=[])
 
-### Works with Singularg only!
-syzextra_debug_if = env.LoadableModule('syzextra_g',
-                               ["mod_main.cc", "DebugPrint.cc", "myNF.cc"],
-                               SHLIBPREFIX="", LDMODULESUFFIX=".sog", SHLIBSUFFIX = ".sog",
-                               CPPPATH = SING_INCLUDES,
-                               LIBS=[])
 
-# Default(syzextra_if)
-# Default(syzextra_debug_if)
 
+### for the use with "scons debug=1"
+if ARGUMENTS.get('debug', 0):
+    ### Works with Singularg only!
+    syzextra_debug_if = env.LoadableModule( MODNAME + '_g',
+        SRCS,
+        SHLIBPREFIX="",
+        LDMODULESUFFIX=".sog",
+        SHLIBSUFFIX = ".sog",
+        CPPPATH = SING_INCLUDES,
+        CXXFLAGS = "-g -Wextra -Wall -pedantic -Wno-long-long " + CXXTEMPLFLAGS,
+        LIBS=[])
+    Default(syzextra_debug_if)
+else:
+    ### Works with any Singular
+    syzextra_if = env.SharedLibrary(MODNAME,
+        SRCS,
+        SHLIBPREFIX="",
+        LDMODULESUFFIX=".so",
+        SHLIBSUFFIX = ".so",
+        CPPPATH = SING_INCLUDES,
+        CPPDEFINES = ["NDEBUG", "OM_NDEBUG"],
+        CXXFLAGS = "-O3 -fomit-frame-pointer --no-rtti " + CXXTEMPLFLAGS,
+        CCFLAGS="-O3 -fomit-frame-pointer ",
+        LIBS=[])
+    Default(syzextra_if)
+
+
+
+### clean with "scons -c ."

dyn_modules/syzextra/mod_main.cc

@@ -54 +54 @@
 }
 
-BOOLEAN noop(leftv __res, leftv __v)
+BOOLEAN noop(leftv __res, leftv /*__v*/)
 {
   NoReturn(__res);
@@ -149 +149 @@
   if( h->Typ() == RESOLUTION_CMD )
   {
-    const syStrategy syzstr = reinterpret_cast<syStrategy>(h->Data());
+    const syStrategy syzstr = reinterpret_cast<const syStrategy>(h->Data());
 
     h = h->Next();
@@ -156 +156 @@
 
 
-    Print("RESOLUTION_CMD(%p): ", reinterpret_cast<void*>(syzstr)); PrintLn();
+    Print("RESOLUTION_CMD(%p): ", reinterpret_cast<const void*>(syzstr)); PrintLn();
 
     const ring save = currRing;
@@ -171 +171 @@
 
 
-#define PRINT_pINTVECTOR(s, v) Print("intvec '%10s'(%p)", #v, (s)->v); \
+#define PRINT_pINTVECTOR(s, v) Print("intvec '%10s'(%p)", #v, reinterpret_cast<const void*>((s)->v)); \
 if( (s)->v != NULL ){ PrintS(": "); view((s)->v); }; \
 PrintLn();
@@ -199 +199 @@
 
     const SRes rP = syzstr->resPairs;
-    Print("SRes 'resPairs': %p", rP); PrintLn();
+    Print("SRes 'resPairs': %p", reinterpret_cast<const void*>(rP)); PrintLn();
 
     if (rP != NULL)
@@ -216 +216 @@
 
     //  const ring rrr = (iLevel > 0) ? rr : save; ?
-#define PRINT_RESOLUTION(s, v) Print("resolution '%12s': %p", #v, (s)->v); PrintLn(); \
+#define PRINT_RESOLUTION(s, v) Print("resolution '%12s': %p", #v, reinterpret_cast<const void*>((s)->v)); PrintLn(); \
 if ((s)->v != NULL) \
   for (int iLevel = 0; (iLevel < iLength) && ( ((s)->v)[iLevel] != NULL ); iLevel++) \
   { \
-    const ring rrr = (iLevel > 0) ? save : save; \
-    Print("id '%10s'[%d]: (%p) ncols = %d / size: %d; nrows = %d, rank = %ld / rk: %ld", #v, iLevel, ((s)->v)[iLevel], ((s)->v)[iLevel]->ncols, idSize(((s)->v)[iLevel]), ((s)->v)[iLevel]->nrows, ((s)->v)[iLevel]->rank, -1L/*idRankFreeModule(((s)->v)[iLevel], rrr)*/ ); \
+    /* const ring rrr = (iLevel > 0) ? save : save; */ \
+    Print("id '%10s'[%d]: (%p) ncols = %d / size: %d; nrows = %d, rank = %ld / rk: %ld", #v, iLevel, reinterpret_cast<const void*>(((s)->v)[iLevel]), ((s)->v)[iLevel]->ncols, idSize(((s)->v)[iLevel]), ((s)->v)[iLevel]->nrows, ((s)->v)[iLevel]->rank, -1L/*idRankFreeModule(((s)->v)[iLevel], rrr)*/ ); \
     PrintLn(); \
   } \
@@ -236 +236 @@
 #undef PRINT_RESOLUTION
 
-#define PRINT_POINTER(s, v) Print("pointer '%17s': %p", #v, (s)->v); PrintLn();
+#define PRINT_POINTER(s, v) Print("pointer '%17s': %p", #v, reinterpret_cast<const void*>((s)->v)); PrintLn();
     // 2d arrays:
     PRINT_POINTER(syzstr, truecomponents);
@@ -258 +258 @@
     } else
     {
-      Print("resolution 'fullres': (%p) => resolution seems to be computed already", syzstr->fullres);
+      Print("resolution 'fullres': (%p) => resolution seems to be computed already", reinterpret_cast<const void*>(syzstr->fullres));
       PrintLn();
       dPrint(*syzstr->fullres, save, save, nTerms);
@@ -272 +272 @@
     } else
     {
-      Print("resolution 'minres': (%p) => resolution seems to be minimized already", syzstr->minres);
+      Print("resolution 'minres': (%p) => resolution seems to be minimized already", reinterpret_cast<const void*>(syzstr->minres));
       PrintLn();
       dPrint(*syzstr->minres, save, save, nTerms);
@@ -396 +396 @@
     const int iExpSize = r->ExpL_Size;
 
-    intvec *iv = new intvec(iExpSize);
+//    intvec *iv = new intvec(iExpSize);
 
     lists l=(lists)omAllocBin(slists_bin);
@@ -418 +418 @@
 
 /// Endowe the current ring with additional (leading) Syz-component ordering
-static BOOLEAN MakeSyzCompOrdering(leftv res, leftv h)
+static BOOLEAN MakeSyzCompOrdering(leftv res, leftv /*h*/)
 {
 

dyn_modules/syzextra/singularxx_defs.h

@@ -27 +27 @@
 
 #define BEGIN_NAMESPACE(a) namespace a {
-#define END_NAMESPACE };
+#define END_NAMESPACE }
 #define USING_NAMESPACE(a) using namespace a;
 

dyn_modules/syzextra/syzextra.tst

@@ -12 +12 @@
 {
   "Loading the Debug version!";
-  LIB("./syzextra.sog");
+  LIB("./syzextra_g.sog");
 }