Changeset 19764c6 in git

Timestamp:

Mar 16, 2011, 6:53:23 PM (13 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'spielwiese', '4a9821a93ffdc22a6696668bd4f6b8c9de3e6c5f')

Children:

950214e56df8e233d791b1abc2c8674661d285d0

Parents:

79fa8352d2e8a5cc848baaa1ce73f4345f8daa44

Message:

FIX: the issue of debug/release Singular needed for correspondingly built dynamic module

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

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

Location:

dyn_modules/syzextra

Files:

• SConstruct (modified) (1 diff)
• mod_main.cc (modified) (2 diffs)
• syzextra.tst (modified) (1 diff)

dyn_modules/syzextra/SConstruct

@@ -9 +9 @@
 
 
-sing_psico_int_if = env.SharedLibrary('syzextra',
+#env.SharedObject(target = 'mod_main.o', source = 'mod_main.cc')
+
+
+### 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=".so",
+                               SHLIBPREFIX="", LDMODULESUFFIX=".sog", SHLIBSUFFIX = ".sog",
                                CPPPATH = SING_INCLUDES,
                                LIBS=[])
 
-Default(sing_psico_int_if)
+# Default(syzextra_if)
+# Default(syzextra_debug_if)
 

dyn_modules/syzextra/mod_main.cc

@@ -86 +86 @@
 }
 
+static inline void view(const intvec* v)
+{
+#ifndef NDEBUG
+  v->view();
+#else
+  // This code duplication is only due to Hannes's #ifndef NDEBUG!
+  Print ("intvec: {rows: %d, cols: %d, length: %d, Values: \n", v->rows(), v->cols(), v->length());
+
+  for (int i = 0; i < v->rows(); i++)
+  {
+    Print ("Row[%3d]:", i);
+    for (int j = 0; j < v->cols(); j++)
+      Print (" %5d", (*v)[j + i * (v->cols())] );
+    PrintLn ();
+  }
+  PrintS ("}\n");
+#endif
+
+}
+
+                   
+
 static BOOLEAN DetailedPrint(leftv __res, leftv h)
 {
@@ -150 +172 @@
 
 #define PRINT_pINTVECTOR(s, v) Print("intvec '%10s'(%p)", #v, (s)->v); \
-if( (s)->v != NULL ){ PrintS(": "); (s)->v->view(); }; \
+if( (s)->v != NULL ){ PrintS(": "); view((s)->v); }; \
 PrintLn();
 

dyn_modules/syzextra/syzextra.tst

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