Changeset f85d3e in git

Timestamp:

Sep 29, 2010, 6:12:45 PM (13 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'spielwiese', 'd1ba061a762c62d3a25159d8da8b6e17332291fa')

Children:

49a64cf3866667ef2b1dca559f7d269fbccd0965

Parents:

f9201ca20a18d3dedfea7a9b2a551f034a6ef251

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2010-09-29 18:12:45+02:00

git-committer:

Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2011-11-09 11:55:31+01:00

Message:

1. Better makefile (debug test-g/no debug: test)
2. Zn Z2m seems to interfere with GMP folating point global init.

Location:

coeffs

Files:

• Makefile.in (modified) (4 diffs)
• test.cc (modified) (6 diffs)

coeffs/Makefile.in

@@ -36 +36 @@
 CXXTEMPLFLAGS   = -fno-implicit-templates --no-exceptions
 CPPFLAGS        = -I${srcdir} -I${includedir} -I${prefix}/include
-LDFLAGS         = -L${libdir} -L${prefix}/lib
+LDFLAGS         = -L${libdir} -L${prefix}/lib -L${srcdir}
 DEFS            = -DNDEBUG -DOM_NDEBUG @DEFS@
 
-LIBSG           =  @LIBPREFIX@ -lcoeffs_g -lreporter -lresource -lomalloc -lgmp
+LIBS            =  @LIBPREFIX@ -lcoeffs -lreporter -lresource -lgmp -lomalloc_ndebug
+LIBSG           =  @LIBPREFIX@ -lcoeffs_g -lreporter -lresource -lgmp -lomalloc
 
 #-DHAVE_RINGS 
@@ -69 +70 @@
 
 OBJS := $(CXXSOURCES:.cc=.o) $(CSOURCES:.c=.o)
+
+
+all: libcoeffs.a libcoeffs_g.a
+
 
 .cc.o:  
@@ -103 +108 @@
 
 cleantest: 
+        -rm -f test test-g
         -rm -Rf test test.dSYM/
 
 clean: mostlyclean cleantest
-        -rm -f *.bak *.d *.dd depend *.a *.so*
+        -rm -f *.bak *.d *.dd depend *.a *.so* 
 
 tags:   
         ctags *.c *.h *.cc *.inc
-
-all: libcoeffs.a libcoeffs_g.a
 
 install: all
@@ -120 +124 @@
         $(INSTALL_DATA) coeffs.h $(includedir)/coeffs.h
 
-test: test.cc libcoeffs_g.a
-        ${CXXG} ${CXXFLAGSG} ${CXXTEMPLFLAGS} ${CPPFLAGS} ${DEFSG} test.cc ${LDFLAGS} ${LIBSG} -o test
+test: test.cc libcoeffs.a
+        ${CXX} ${CXXFLAGS} ${CXXTEMPLFLAGS} ${CPPFLAGS} ${DEFS} test.cc ${LDFLAGS} ${LIBS} -o test
+
+
+test-g: test.cc libcoeffs_g.a
+        ${CXXG} ${CXXFLAGSG} ${CXXTEMPLFLAGS} ${CPPFLAGS} ${DEFSG} test.cc ${LDFLAGS} ${LIBSG} -o test-g

coeffs/test.cc

@@ -251 +251 @@
 
   // rings needed for: n_Zp_a, n_Q_a ?
+#ifdef HAVE_RINGS
+  TODO(Frank, Segmentation fault! (if used wihout omalloc???). Please_ investigate!);
+/*
+  type = nRegister( n_Z2m, nr2mInitChar); assume( type == n_Z2m ); 
+  if( Test(type, (void*) 2) )
+    c ++;
+*/
+#endif
 
   type = nRegister( n_Zp, npInitChar); assume( type == n_Zp );
@@ -256 +264 @@
     c ++;
 
+#ifdef HAVE_RINGS
+  TODO(Frank, memmory corruption_ if used wihout omalloc??? Please_ investigate!);
+/*
+  type = nRegister( n_Z2m, nr2mInitChar); assume( type == n_Z2m ); 
+  if( Test(type, (void*) 2) )
+    c ++;
+*/    
+#endif
+
   
   type = nRegister( n_Q, nlInitChar); assume( type == n_Q );
@@ -265 +282 @@
     c ++;
 
-
-#ifdef HAVE_RINGS
-  type = nRegister( n_Z, nrzInitChar); assume( type == n_Z );
-  if( Test(type) )
-    c ++;
-
-  type = nRegister( n_Z2m, nr2mInitChar); assume( type == n_Z2m );
-  if( Test(type, (void*) 2) )
-    c ++;
-#endif
-
+#ifdef HAVE_RINGS
+  type = nRegister( n_Z, nrzInitChar); assume( type == n_Z ); // No need in GMP?
+  if( Test(type) )
+    c ++;
+#endif
 
    type = nRegister( n_GF, nfInitChar); assume( type == n_GF );
@@ -283 +294 @@
    param.GFChar= 5;
    param.GFDegree= 12;
-
    param.GFPar_name= (const char*)"q";
 
@@ -289 +299 @@
      c ++;
   
- 
-  TODO(Somebody, floating arithmetics via GMP rely on two global variables (see setGMPFloatDigits). Fix it!);
-  
-  setGMPFloatDigits( 10, 5 ); // Init global variables in mpr_complex.cc for gmp_float's...
-      
+   param.GFChar= 5;
+   param.GFDegree= 2;
+   param.GFPar_name= (const char*)"Q";
+
+   if( Test(type, (void*) &param) )
+     c ++;
+
+  TODO(Somebody, floating arithmetics via GMP rely on two global variables (see setGMPFloatDigits). Please fix it!);
+
+
+
+#ifdef HAVE_RINGS
+  TODO(Somebody, This will result in memory corruption at Z_2^m later on (due to the succs. setGMPFloatDigits?)...!?);
+/*
+  type = nRegister( n_Zn, nrnInitChar); assume( type == n_Zn );
+
+  if( Test(type, (void*) 3) )
+    c ++;
+*/
+#endif
+
+  setGMPFloatDigits( 10, 5 ); // Init global variables in mpr_complex.cc for gmp_float's... // Note that this seems also to be required for Z_2^m (and Zn?)!????
+
+
   type = nRegister( n_long_C, ngcInitChar); assume( type == n_long_C );
   if( Test(type) )
@@ -301 +330 @@
   if( Test(type) )
     c ++;
-  
-  
+
+#ifdef HAVE_RINGS
+  type = nRegister( n_Z2m, nr2mInitChar); assume( type == n_Z2m ); 
+  if( Test(type, (void*) 2) )
+    c ++;
+#endif
+
+
 #ifdef HAVE_RINGS
   type = nRegister( n_Zn, nrnInitChar); assume( type == n_Zn );
 
-  TODO(Frank, this seems to be a trivial BUG: the parameter 'm' is ignored now in nrnSetExp. Please fix someday!!!)
   if( Test(type, (void*) 3) )
     c ++;
 #endif
-