Add islhelper.c library to handle isl constants

diff --git a/.gitignore b/.gitignore
index bbe9588a52f4dd93b27b0710a401ed0119ebb463..d93c13c4f9b0694d4cfaa8df5680da8d950537c8 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 /dist/
 /MANIFEST
 __pycache__
 /dist/
 /MANIFEST
 __pycache__

+/venv

diff --git a/Makefile b/Makefile
index 4ab5d2ac79c3e00926409a6e705d1d81aa0b1b1b..8b3f1c486bee03fff3d13dd3a91f87855fbe2ca2 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -15,4 +15,4 @@ test:
 
 .PHONY: clean
 clean:
 
 .PHONY: clean
 clean:

-       $(RM) build dist MANIFEST pypol/__pycache__ tests/__pycache__
+       $(RM) build dist MANIFEST pypol/__pycache__ tests/__pycache__ venv

diff --git a/pypol/islhelper.c b/pypol/islhelper.c
new file mode 100644 (file)
index 0000000..38f249d
--- /dev/null
+++ b/pypol/islhelper.c
@@ -0,0 +1,25 @@
+#include <Python.h>
+#include <isl/space.h>
+
+static PyMethodDef islhelper_methods[] = {
+    {NULL, NULL, 0, NULL}
+};
+
+static struct PyModuleDef islhelpermodule = {
+    PyModuleDef_HEAD_INIT,
+    "islhelper",
+    NULL,
+    -1,
+    islhelper_methods
+};
+
+PyMODINIT_FUNC PyInit_islhelper(void) {
+    PyObject *m;
+    m = PyModule_Create(&islhelpermodule);
+    if (m == NULL)
+        return NULL;
+
+    PyModule_AddObject(m, "isl_dim_set", PyLong_FromLong(isl_dim_set));
+
+    return m;
+}

diff --git a/pypol/linear.py b/pypol/linear.py
index 5dfddfe5ddbc47d884775a2d17e9db23a70379cf..be30fad7528b21b0b330f6f2b6a50e1fca49ed2b 100644 (file)
--- a/pypol/linear.py
+++ b/pypol/linear.py
@@ -2,7 +2,7 @@ import functools
 import numbers
 import json
 import ctypes, ctypes.util
 import numbers
 import json
 import ctypes, ctypes.util

-from pypol import isl
+from pypol import isl, islhelper

 
 from fractions import Fraction, gcd
 
 
 from fractions import Fraction, gcd
 


@@ -23,7 +23,7 @@ def symbolToInt(self):
      make dictionary of key:value (letter:integer)
         iterate through the dictionary to find matching symbol
         return the given integer value
      make dictionary of key:value (letter:integer)
         iterate through the dictionary to find matching symbol
         return the given integer value

-    d = {'a': 1, 'b': 2, 'c': 3, 'd': 4, 'e': 5, 'f': 6, 'g': 7, 'h': 8, 'i': 6, 'j': 10, 'k': 11, 'l': 12, 'm': 13, 'n': 14, 
+    d = {'a': 1, 'b': 2, 'c': 3, 'd': 4, 'e': 5, 'f': 6, 'g': 7, 'h': 8, 'i': 6, 'j': 10, 'k': 11, 'l': 12, 'm': 13, 'n': 14,

          'o': 15, 'p': 16, 'q': 17, 'r': 18, 's': 19, 't': 20, 'u': 21, 'v': 22, 'w': 23, 'x': 24, 'y': 25, 'z': 26}
     if self in d:
         num = d.get(self)
          'o': 15, 'p': 16, 'q': 17, 'r': 18, 's': 19, 't': 20, 'u': 21, 'v': 22, 'w': 23, 'x': 24, 'y': 25, 'z': 26}
     if self in d:
         num = d.get(self)


@@ -75,8 +75,8 @@ class Context:
     @property
     def _as_parameter_(self):
         return self._ic
     @property
     def _as_parameter_(self):
         return self._ic

-    
-    #comment out so does not delete itself after being created 
+
+    #comment out so does not delete itself after being created

     #def __del__(self):
     #   libisl.isl_ctx_free(self)
 
     #def __del__(self):
     #   libisl.isl_ctx_free(self)
 


@@ -203,7 +203,7 @@ class Expression:
 
     def __rsub__(self, other):
         return -(self - other)
 
     def __rsub__(self, other):
         return -(self - other)

-    
+

     @_polymorphic_method
     def __mul__(self, other):
         if other.isconstant():
     @_polymorphic_method
     def __mul__(self, other):
         if other.isconstant():


@@ -402,16 +402,16 @@ class Polyhedron:
                     if value.denominator != 1:
                         raise TypeError('non-integer constraint: '
                                 '{} <= 0'.format(constraint))
                     if value.denominator != 1:
                         raise TypeError('non-integer constraint: '
                                 '{} <= 0'.format(constraint))

-                self._inequalities.append(constraint)      
+                self._inequalities.append(constraint)

         self._bset = self.to_isl()
         #print(self._bset)
         #put this here just to test from isl method
         #from_isl = self.from_isl(self._bset)
         #print(from_isl)
         #rint(self)
         self._bset = self.to_isl()
         #print(self._bset)
         #put this here just to test from isl method
         #from_isl = self.from_isl(self._bset)
         #print(from_isl)
         #rint(self)

-        return self._bset 
-   
-  
+        return self._bset
+
+

     @property
     def equalities(self):
         yield from self._equalities
     @property
     def equalities(self):
         yield from self._equalities


@@ -419,15 +419,15 @@ class Polyhedron:
     @property
     def inequalities(self):
         yield from self._inequalities
     @property
     def inequalities(self):
         yield from self._inequalities

-        
+

     @property
     def constant(self):
         return self._constant
 
     def isconstant(self):
         return len(self._coefficients) == 0
     @property
     def constant(self):
         return self._constant
 
     def isconstant(self):
         return len(self._coefficients) == 0

-    
-        
+
+

     def isempty(self):
         return bool(libisl.isl_basic_set_is_empty(self._bset))
 
     def isempty(self):
         return bool(libisl.isl_basic_set_is_empty(self._bset))
 


@@ -441,7 +441,7 @@ class Polyhedron:
         for constraint in self.constraints():
             s.update(constraint.symbols)
             yield from sorted(s)
         for constraint in self.constraints():
             s.update(constraint.symbols)
             yield from sorted(s)

-                    
+

     @property
     def dimension(self):
         return len(self.symbols())
     @property
     def dimension(self):
         return len(self.symbols())


@@ -452,7 +452,7 @@ class Polyhedron:
             return False
         else:
             return True
             return False
         else:
             return True

-        
+

 
     def __contains__(self, value):
         # is the value in the polyhedron?
 
     def __contains__(self, value):
         # is the value in the polyhedron?


@@ -484,9 +484,9 @@ class Polyhedron:
         # test whether every element in other is in the polyhedron
         for value in other:
             if value == self.constraints():
         # test whether every element in other is in the polyhedron
         for value in other:
             if value == self.constraints():

-                return True 
+                return True

             else:
             else:

-                return False     
+                return False

         raise NotImplementedError
 
     def __ge__(self, other):
         raise NotImplementedError
 
     def __ge__(self, other):


@@ -543,10 +543,10 @@ class Polyhedron:
     @classmethod
     def fromstring(cls, string):
         raise NotImplementedError
     @classmethod
     def fromstring(cls, string):
         raise NotImplementedError

-    
+

     def to_isl(self):
         #d = Expression().__dict__  #write expression values to dictionary in form {'_constant': value, '_coefficients': value}
     def to_isl(self):
         #d = Expression().__dict__  #write expression values to dictionary in form {'_constant': value, '_coefficients': value}

-        d = {'_constant': 2, '_coefficients': {'b':1}}  
+        d = {'_constant': 2, '_coefficients': {'b':1}}

         coeff = d.get('_coefficients')
         num_coefficients = len(coeff)
         space = libisl.isl_space_set_alloc(Context(), 0, num_coefficients)
         coeff = d.get('_coefficients')
         num_coefficients = len(coeff)
         space = libisl.isl_space_set_alloc(Context(), 0, num_coefficients)


@@ -560,37 +560,37 @@ class Polyhedron:
             if '_constant' in d:
                 value = d.get('_constant')
                 ceq = libisl.isl_constraint_set_constant_si(ceq, value)
             if '_constant' in d:
                 value = d.get('_constant')
                 ceq = libisl.isl_constraint_set_constant_si(ceq, value)

-            if '_coefficients' in d: 
+            if '_coefficients' in d:

                 value_co = d.get('_coefficients')
                 for co in value_co:
                     num = value_co.get(co)
                 value_co = d.get('_coefficients')
                 for co in value_co:
                     num = value_co.get(co)

-                    ceq = libisl.isl_constraint_set_coefficient_si(ceq, 3, get_ids(co), num)  #use 3 for type isl_dim_set 
-            bset = libisl.isl_set_add_constraint(bset, ceq) 
-                       
-        if self._inequalities:     
+                    ceq = libisl.isl_constraint_set_coefficient_si(ceq, islhelper.isl_dim_set, get_ids(co), num)
+            bset = libisl.isl_set_add_constraint(bset, ceq)
+
+        if self._inequalities:

             if '_constant' in d:
                 value = d.get('_constant')
             if '_constant' in d:
                 value = d.get('_constant')

-                cin = libisl.isl_constraint_set_constant_si(cin, value)   
-            if '_coefficients' in d: 
-                value_co = d.get('_coefficients') 
+                cin = libisl.isl_constraint_set_constant_si(cin, value)
+            if '_coefficients' in d:
+                value_co = d.get('_coefficients')

                 for co in value_co:
                     num = value_co.get(co)
                     if value_co: #if dictionary not empty add coefficient as to constraint
                 for co in value_co:
                     num = value_co.get(co)
                     if value_co: #if dictionary not empty add coefficient as to constraint

-                        cin = libisl.isl_constraint_set_coefficient_si(cin, 3, get_ids(co), num) #use 3 for type isl_dim_set
-            bset = libisl.isl_set_add_constraint(bset, cin) 
+                        cin = libisl.isl_constraint_set_coefficient_si(cin, islhelper.isl_dim_set, get_ids(co), num)
+            bset = libisl.isl_set_add_constraint(bset, cin)

         ip = libisl.isl_printer_to_str(Context()) #create string printer
         ip = libisl.isl_printer_to_str(Context()) #create string printer

-        ip = libisl.isl_printer_print_set(ip, bset) #print set to printer 
+        ip = libisl.isl_printer_print_set(ip, bset) #print set to printer

         string = libisl.isl_printer_get_str(ip)   #get string from printer
         string = str(string)
         print(string)
         return string
         string = libisl.isl_printer_get_str(ip)   #get string from printer
         string = str(string)
         print(string)
         return string

-    
-    
+
+

     def from_isl(self, bset):
         '''takes basic set in isl form and puts back into python version of polyhedron
         isl example code gives idl form as:
             "{[i] : exists (a : i = 2a and i >= 10 and i <= 42)}");'''
     def from_isl(self, bset):
         '''takes basic set in isl form and puts back into python version of polyhedron
         isl example code gives idl form as:
             "{[i] : exists (a : i = 2a and i >= 10 and i <= 42)}");'''

-        
+

         poly = 0
         return poly
 
         poly = 0
         return poly
 

diff --git a/setup.py b/setup.py
index a0dfb8aaa608abf9ccbe7a5119f25e7a639a1b85..08587b761d39d515d0b517a697e30876ddf066a0 100755 (executable)
--- a/setup.py
+++ b/setup.py
@@ -1,10 +1,13 @@
 #!/usr/bin/env python3
 
 #!/usr/bin/env python3
 

-from distutils.core import setup
+from distutils.core import setup, Extension

 
 setup(
     name='pypol',
     description='A polyhedral library based on ISL',
     author='MINES ParisTech',
 
 setup(
     name='pypol',
     description='A polyhedral library based on ISL',
     author='MINES ParisTech',

-    packages=['pypol']
+    packages=['pypol'],
+    ext_modules = [
+        Extension('pypol/islhelper', sources=['pypol/islhelper.c'])
+    ]

 )
 )