--

4 files changed, 32 insertions, 18 deletions

diff --git a/chill_run.cc b/chill_run.cc
index 45d2345..a3c9180 100644
--- a/chill_run.cc
+++ b/chill_run.cc
@@ -359,6 +359,7 @@ int main( int argc, char* argv[] )
     #endif
     #ifdef BUILD_ROSE
     ((IR_cudaroseCode *)(ir_code))->commit_loop(myloop, lnum);
+    ((IR_roseCode*)(ir_code))->finalizeRose();
     #elif BUILD_SUIF
     ((IR_cudasuifCode *)(ir_code))->commit_loop(myloop, lnum);
     #endif
@@ -374,14 +375,16 @@ int main( int argc, char* argv[] )
     lnum_end = get_loop_num_end(L);
     DEBUG_PRINT("calling ROSE code gen?    loop num %d - %d\n", lnum_start, lnum_end);
     #endif
-#endif
+    
     #ifdef BUILD_ROSE
     finalize_loop(lnum_start, lnum_end);
     //((IR_roseCode*)(ir_cide))->commit_loop(myloop, lnum);
     ((IR_roseCode*)(ir_code))->finalizeRose();
-    //#elif BUILD_SUIF
-    //((IR_suifCode*)(ir_code))->commit_loop(myloop, lnum);
+    #elif BUILD_SUIF
+    ((IR_suifCode*)(ir_code))->commit_loop(myloop, lnum);
     #endif
+    
+#endif
     delete ir_code;
   }
 #ifdef PYTHON
diff --git a/configure.ac b/configure.ac
index 6f79d1b..dd89225 100644
--- a/configure.ac
+++ b/configure.ac
@@ -19,35 +19,46 @@ AM_PATH_PYTHON([2.7],[
         [`${PYTHON} -c "from distutils import sysconfig; print(sysconfig.get_python_inc())"`])
     AC_SUBST([PYTHON_LIBDIR],
         [`${PYTHON} -c "from distutils import sysconfig; print(sysconfig.get_config_var('LIBDIR'))"`])
-    AC_SUBST([with_python],["yes"])],[
-    AC_SUBST([with_python],["no"])])
+    AC_SUBST([python_builds],[yes])],[
+    AC_SUBST([python_builds],[no])])
 
 
+#AC_ARG_ENABLE([cuda],[
+#    AS_HELP_STRING([--enable-cuda],[builds cudachill])],[
+#    AS_IF([test "x$enableval" != xno],[
+#        AC_SUBST([enable_cuda],[yes])])])
+
 AC_ARG_ENABLE([cuda],[
-    AS_HELP_STRING([--enable-cuda],[builds cudachill])],[
+    AS_HELP_STRING([--enable-cuda],[builds cudachill])
+    ],[
     AS_IF([test "x$enableval" != xno],[
-        AC_SUBST([enable_cuda],[yes])],[])])
+        AC_SUBST([enable_cuda],[yes])])])
+
 AM_CONDITIONAL([CUDACHILL_OPT],[test "x$enable_cuda" == xyes])
 
 
 AC_ARG_ENABLE([coverage],[
-    AS_HELP_STRING([--enable-coverage],[enables coverage testing])],[
-    
+    AS_HELP_STRING([--enable-coverage],[enables coverage testing])
+    ],[
     AS_IF(["x$enableval" != xno],[
         AC_SUBST([enable_coverage],[yes])
         AC_SUBST([CFLAGS],["-g -fprofile-arcs -ftest-coverage"])
         AC_SUBST([CPPFLAGS],["-g -fprofile-arcs -ftest-coverage"])],[])])
 
 AC_ARG_WITH([rose],[
-    AS_HELP_STRING([--with-rose],[set rose home])],[
+    AS_HELP_STRING([--with-rose],[set rose home])
+    ],[
     AC_SUBST([ROSEHOME], [$withval])
-    AC_DEFINE([BUILD_ROSE],[],[Use ROSE])],[
+    AC_DEFINE([BUILD_ROSE],[],[Use ROSE])
+    ],[
     AC_SUBST([ROSEHOME], ["${ROSEHOME}"])
     AC_DEFINE([BUILD_ROSE],[],[Use ROSE])])
 
 AC_ARG_WITH([boost],[
-    AS_HELP_STRING([--with-boost],[set boost home])],[
-    AC_SUBST([BOOSTHOME], [$withval])],[
+    AS_HELP_STRING([--with-boost],[set boost home])
+    ],[
+    AC_SUBST([BOOSTHOME], [$withval])
+    ],[
     AC_SUBST([BOOSTHOME], ["${BOOSTHOME}"])])
 
 AC_ARG_WITH([omega],[
@@ -56,7 +67,8 @@ AC_ARG_WITH([omega],[
     AC_SUBST([OMEGAHOME], ["$(pwd)/omega"])])
 
 AC_ARG_WITH([python],[
-    AS_HELP_STRING([--with-python],[set python as the interface languge])],[
+    AS_HELP_STRING([--with-python],[set python as the interface languge])
+    ],[
     AC_SUBST([interface_lang],[python])
     ],[
     AC_SUBST([interface_lang],[default])])
@@ -74,7 +86,7 @@ AC_ARG_WITH([lua],[
 #    AC_SUBST([interface_lang],[default])])
 
 AS_IF([test "x$interface_lang" == xdefault],[
-    AS_IF([test "x$enable_cuda" != xno],[
+    AS_IF([test "x$enable_cuda" == xyes],[
         AC_SUBST([use_python],[no])
         AC_SUBST([use_lua],[yes])
         ],[
diff --git a/graph.hh b/graph.hh
index 504c147..5d0ff66 100644
--- a/graph.hh
+++ b/graph.hh
@@ -76,7 +76,7 @@ template<typename VertexType, typename EdgeType>
 std::ostream& operator<<(std::ostream &os, const Graph<VertexType, EdgeType> &g) {
   for (int i = 0; i < g.vertex.size(); i++)
     for (typename Graph<VertexType,EdgeType>::EdgeList::const_iterator j = g.vertex[i].second.begin(); j != g.vertex[i].second.end(); j++) {
-      os << i+1 << "->" << j->first+1 << ":";
+      os << "s" << i << "->" << "s" << j->first << ":";
       for (typename std::vector<EdgeType>::const_iterator k = j->second.begin(); k != j->second.end(); k++)
         os << " " << *k;
       os << std::endl;
diff --git a/test-chill/testchill/chill.py b/test-chill/testchill/chill.py
index 0e30149..833d524 100644
--- a/test-chill/testchill/chill.py
+++ b/test-chill/testchill/chill.py
@@ -146,13 +146,12 @@ class BuildChillTestCase(test.TestCase):
         util.shell('rm', ['-f', '*.gcda'], wd=self.config.chill_dir)
         
         util.shell('make clean', wd=self.config.chill_dir)
-        util.shell('make veryclean', wd=self.config.chill_dir)
     
     def run(self):
         """
         Build chill
         """
-        util.shell('make', ['clean'], wd=self.config.chill_dir)
+        util.shell('make', ['distclean'], wd=self.config.chill_dir)
         util.shell('./configure', self.config.config_args, wd=self.config.chill_dir)
         util.shell('make', [], wd=self.config.chill_dir)