Changeset e6c3d1 in git

Timestamp:

Jan 18, 2013, 3:20:53 PM (11 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

271d25946dbb409d16650bb1ecdffccf0c03594e65eb96fdc6f956671461df48dd8f6bde869c96f8

Parents:

2aee667644f2d68561171e8c9ca4258221af3702ebdbfddc10fbb7eff4bf79217b5742f5f24d9a78

Message:

Merge pull request #252 from alexanderdreyer/spielwiese-pyobject

Ensuring ./configure picks python2 

Files:

• Singular/Makefile.am (modified) (1 diff)
• libpolys/coeffs/coeffs.h (modified) (4 diffs)
• libpolys/coeffs/rintegers.cc (modified) (1 diff)
• libpolys/coeffs/rmodulo2m.cc (modified) (1 diff)
• libpolys/coeffs/rmodulon.cc (modified) (2 diffs)
• libpolys/polys/ext_fields/algext.cc (modified) (2 diffs)
• m4/ax_python_with_version.m4 (modified) (5 diffs)

Singular/Makefile.am

@@ -413 +413 @@
 pyobject_la_SOURCES += pyobject.cc
 endif
-pyobject_la_SOURCES = pyobject.cc
 pyobject_la_CPPFLAGS   = ${AM_CPPFLAGS} ${NODEBUGDEFS}
 pyobject_g_la_CPPFLAGS = ${AM_CPPFLAGS}

libpolys/coeffs/coeffs.h

@@ -94 +94 @@
 {
    coeffs next;
-   unsigned int ringtype;  /* =0 => coefficient field,
+   /*unsigned int ringtype;   =0 => coefficient field,
                              !=0 => coeffs from one of the rings:
                               =1 => Z/2^mZ
@@ -609 +609 @@
 // Tests:
 static inline BOOLEAN nCoeff_is_Ring_2toM(const coeffs r)
-{ assume(r != NULL); return (r->ringtype == 1); }
+{ assume(r != NULL); return (getCoeffType(r)==n_Z2m); }
 
 static inline BOOLEAN nCoeff_is_Ring_ModN(const coeffs r)
-{ assume(r != NULL); return (r->ringtype == 2); }
+{ assume(r != NULL); return (getCoeffType(r)==n_Zn); }
 
 static inline BOOLEAN nCoeff_is_Ring_PtoM(const coeffs r)
-{ assume(r != NULL); return (r->ringtype == 3); }
+{ assume(r != NULL); return (getCoeffType(r)==n_Znm); }
 
 static inline BOOLEAN nCoeff_is_Ring_Z(const coeffs r)
-{ assume(r != NULL); return (r->ringtype == 4); }
+{ assume(r != NULL); return (getCoeffType(r)==n_Z); }
 
 static inline BOOLEAN nCoeff_is_Ring(const coeffs r)
-{ assume(r != NULL); return (r->ringtype != 0); }
+{ assume(r != NULL); return ((getCoeffType(r)==n_Z) || (getCoeffType(r)==n_Z2m) || (getCoeffType(r)==n_Zn) || (getCoeffType(r)==n_Znm)); }
 
 /// returns TRUE, if r is not a field and r has no zero divisors (i.e is a domain)
@@ -628 +628 @@
   assume(r != NULL); 
 #ifdef HAVE_RINGS
-  return (r->ringtype == 4 || r->ringtype == 0);
+  return (getCoeffType(r)==n_Z || ((getCoeffType(r)!=n_Z2m) && (getCoeffType(r)!=n_Zn) && (getCoeffType(r)!=n_Znm)));
 #else
   return TRUE;
@@ -707 +707 @@
 /// returns TRUE, if r is not a field and r has non-trivial units
 static inline BOOLEAN nCoeff_has_Units(const coeffs r)
-{ assume(r != NULL); return ((r->ringtype == 1) || (r->ringtype == 2) || (r->ringtype == 3)); }
+{ assume(r != NULL); return ((getCoeffType(r)==n_Zn) || (getCoeffType(r)==n_Z2m) || (getCoeffType(r)==n_Znm)); }
 
 static inline BOOLEAN nCoeff_is_Zp(const coeffs r)

libpolys/coeffs/rintegers.cc

@@ -430 +430 @@
   r->nNULL = 0;
   r->ch = 0;
-  r->ringtype = 4;
   r->has_simple_Alloc=FALSE;
   r->has_simple_Inverse=FALSE;

libpolys/coeffs/rmodulo2m.cc

@@ -54 +54 @@
   r->modBase = (int_number) omAllocBin (gmp_nrz_bin);
   mpz_init_set_si (r->modBase, 2L);
-  r->ringtype = 1;
   r->modNumber= (int_number) omAllocBin (gmp_nrz_bin);
   mpz_init (r->modNumber);

libpolys/coeffs/rmodulon.cc

@@ -55 +55 @@
   nrnInitExp (info->exp, r);
 
-  if (info->exp > 1)
-    r->ringtype= 3;
-  else
-    r->ringtype= 2;
   /* next computation may yield wrong characteristic as r->modNumber
      is a GMP number */
@@ -508 +504 @@
       nCoeff_is_Ring_2toM(src) || nCoeff_is_Zp(src))
   {
-    if (   (src->ringtype > 0)
+    if (   (!nCoeff_is_Zp(src))
         && (mpz_cmp(src->modBase, dst->modBase) == 0)
         && (src->modExponent == dst->modExponent)) return nrnMapGMP;

libpolys/polys/ext_fields/algext.cc

@@ -1192 +1192 @@
 }
 
+void naKillChar(coeffs cf)
+{
+   if ((--cf->extRing->ref) == 0)
+     rDelete(cf->extRing);
+}
+
+
 
 BOOLEAN naInitChar(coeffs cf, void * infoStruct)
@@ -1257 +1264 @@
   cf->cfCoeffWrite   = naCoeffWrite;
   cf->cfNormalize    = naNormalize;
+  cf->cfKillChar     = naKillChar;
 #ifdef LDEBUG
   cf->cfDBTest       = naDBTest;

m4/ax_python_with_version.m4

@@ -33 +33 @@
             [],[withval="yes"]
         ) 
+        si_try_embed="no"
         py_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
         for elt in $withval; do
@@ -38 +39 @@
           case $elt in
             embed|embedding)
-              si_try_embed=true
+              si_try_embed="yes"
             ;;
             static|dynamic|shared|module)
@@ -64 +65 @@
                 # for the executable.
                 # So, let's search the PATH Environment Variable.
-                AC_PATH_PROG(
+                AC_PATH_PROGS(
                     [PYTHON],
-                    python,
+                    [python2 python],
                     [],
                     $2
@@ -79 +80 @@
             else 
                 AX_PYTHON_VERSION_CHECK([$1],
-                                        [ ax_python_use=true
-                                          si_embed_python=$si_try_embed
-                                          AC_MSG_RESULT(yes)
-                                          AX_PYTHON_PREFIX( )
-                                          AX_PYTHON_LSPEC( )
-                                          AX_PYTHON_CSPEC( )
-                                        ],
-                                        [ax_python_use=false
-                                         AC_MSG_RESULT([too old, skipping python interface!])]
+                  [ AC_MSG_RESULT(yes)
+                    AX_PYTHON_VERSION_CHECK([3],
+                    [ ax_python_use=false
+                      AC_MSG_RESULT([too recent, skipping python interface!])
+                    ],
+                    [ ax_python_use=true
+                      si_embed_python=$si_try_embed
+                      AC_MSG_RESULT([no (ok)])
+                      AC_MSG_CHECKING(embedding python interface module)
+                      AC_MSG_RESULT($si_try_embed)
+                      AX_PYTHON_PREFIX( )
+                      AX_PYTHON_LSPEC( )
+                      AX_PYTHON_CSPEC( )
+                    ])
+                  ],
+                  [ ax_python_use=false
+                    AC_MSG_RESULT([too old, skipping python interface!])]
                 )
             fi
         fi   
 
-        if  test x"$si_embed_python" = x"true"
+        if  test x"$si_embed_python" = x"yes"
         then 
           AC_DEFINE(EMBED_PYTHON,1,integrate python)
@@ -105 +114 @@
     
     AM_CONDITIONAL(PYTHON_USE, test x"$ax_python_use" = x"true")
-    AM_CONDITIONAL(SI_EMBED_PYTHON, test x"$ax_python_use$si_embed_python" = x"truetrue")
-    AM_CONDITIONAL(PYTHON_MODULE, test x"$ax_python_use" = x"true" -a x"$si_embed_python" != x"true" )
+    AM_CONDITIONAL(SI_EMBED_PYTHON, test x"$ax_python_use$si_embed_python" = x"trueyes")
+    AM_CONDITIONAL(PYTHON_MODULE, test x"$ax_python_use" = x"true" -a x"$si_embed_python" != x"yes" )
 
 ])