Changeset 7601:9546de5282e1

Timestamp:

12/10/07 15:40:24 (5 years ago)

Author:

mabshoff@…

Branch:

default

Message:

Revert #1366, #1453 due to problems with "sage -ba"

Files:

• .hgignore (modified) (1 diff)
• setup.py (modified) (8 diffs)

.hgignore

@@ -114 +114 @@
 ^c_lib/.sconsign.dblite$
 ^c_lib/libcsage.so$
-^.cython_dependencies$

setup.py

@@ -9 +9 @@
 from distutils.extension import Extension
 from Cython.Distutils import build_ext
+
+
 
 ## Choose cblas library -- note -- make sure to update sage/misc/cython.py
@@ -919 +921 @@
 ######################################################################
 
-def get_dependencies(filename):
+def check_dependencies( filename, outfile ):
     """
-    computes everything that this file depends on
+    INPUT:
+        filename -- The name of a .pyx, .pxd, or .pxi to check dependencies in the SAGE source.
+        outfile -- The output file for which we are determining out-of-date-ness
+
+    OUTPUT:
+        bool -- whether or not outfile must be regenerated.
     """
-    li = []
+    if is_older(filename, outfile):
+        print "\nBuilding %s because it depends on %s."%(outfile, filename)
+        return True
+
     # Now we look inside the file to see what it cimports or include.
     # If any of these files are newer than outfile, we rebuild
@@ -961 +971 @@
         # Check to see if a/b/c/d.pxd exists and is newer than filename.
         # If so, we have to regenerate outfile.  If not, we're safe.
-        A = os.path.normpath(A)
-        if os.path.exists(A):
-            li.extend(get_dependencies(A))
-            li.append(A)
+        if os.path.exists(A) and check_dependencies(A, outfile):
+            return True # yep we must rebuild
 
     # OK, next we move on to include pxi files.
@@ -992 +1000 @@
             A = R # restore
         # Finally, check to see if filename is older than A
-        A = os.path.normpath(A)
-        if os.path.exists(A):
-            li.extend(get_dependencies(A))
-            li.append(A)
-            
-    # if we get here, this file depends on nothing
-    return li
-
-def check_dependencies(filename, outfile, deps_of):
-    """
-    INPUT:
-        filename -- The name of a .pyx, .pxd, or .pxi to check dependencies in the SAGE source.
-        outfile -- The output file for which we are determining out-of-date-ness
-
-    OUTPUT:
-        bool -- whether or not outfile must be regenerated.
-    """
-    # add filename to depend on filename
-    try:
-        deps = deps_of[filename]
-    except KeyError:
-        return True
-
-    for dep in deps:
-        if is_older(dep, outfile):
-            print "\nBuilding %s because it depends on %s."%(outfile, dep)
+        if os.path.exists(A) and check_dependencies(A, outfile):
             return True
 
-def need_to_cython(filename, outfile, deps):
+
+def need_to_cython(filename, outfile):
     """
     INPUT:
         filename -- The name of a cython file in the SAGE source tree.
         outfile -- The name of the corresponding c or cpp file in the build directory.
-        deps -- a structure containing dependency information
 
     OUTPUT:
@@ -1034 +1017 @@
     pxd = base+'.pxd'
 
-    if check_dependencies(filename, outfile, deps):
+    if check_dependencies(filename, outfile):
         return True
-    if os.path.exists(pxd) and check_dependencies(pxd, outfile, deps):
+    elif os.path.exists(pxd) and check_dependencies(pxd, outfile):
         return True
-    return False
-
-def process_cython_file(f, m, deps_of):
+    else:
+        return False
+
+def process_cython_file(f, m):
     """
     INPUT:
@@ -1048 +1032 @@
     # This is a cython file, so process accordingly.
     pyx_inst_file = '%s/%s'%(SITE_PACKAGES, f)
-    # if f is *more recent* than the pyx_install_file
     if is_older(f, pyx_inst_file):
         print "%s --> %s"%(f, pyx_inst_file)
         os.system('cp %s %s 2>/dev/null'%(f, pyx_inst_file))
-        # we need to recompute the dependencies, here
-        deps_list = get_dependencies(f)
-        try:
-            deps_of[f].extend(deps_list)
-        except KeyError:
-            deps_of[f] = deps_list
     outfile = f[:-4] + ".c"
     if m.language == 'c++':
         outfile += 'pp'
 
-    if need_to_cython(f, outfile, deps_of):
+    if need_to_cython(f, outfile):
         # Insert the -o parameter to specify the output file (particularly for c++)
-        cmd = "cython --embed-positions --incref-local-binop -I%s -o %s %s"%(os.getcwd(), outfile, f )
+        cmd = "cython --embed-positions --incref-local-binop -I%s -o %s %s"%(os.getcwd(), outfile, f)
         print cmd
         ret = os.system(cmd)
@@ -1070 +1047 @@
             print "sage: Error running cython."
             sys.exit(1)
-
     return [outfile]
     
 
 def cython(ext_modules):
-    import pickle
-    deps_filename = SAGE_DEVEL + 'sage/.cython_dependencies'
-    # check if the cached dependency information is there
-    if os.path.exists(deps_filename):
-        deps_file = open(deps_filename, 'r')
-        deps_of = pickle.load(deps_file)
-        deps_file.close()
-        deps_file = None
-        compute_all_deps = False
-    else:
-        compute_all_deps = True
-        deps_of = {}
-
-    tot = 0
     for m in ext_modules:
         m.extra_compile_args += extra_compile_args
@@ -1095 +1057 @@
         for i in range(len(m.sources)):
             f = m.sources[i]
-            if compute_all_deps:
-                deps_list = get_dependencies(f)
-                try:
-                    deps_of[f].extend(deps_list)
-                except KeyError:
-                    deps_of[f] = deps_list
-                pxd_file = f[:-4] + '.pxd'
-                if os.path.exists(pxd_file):
-                    deps_list = get_dependencies(pxd_file)
-                    try:
-                        deps_of[pxd_file].extend(deps_list)
-                    except KeyError:
-                        deps_of[pxd_file] = deps_list
-
+#            s = open(f).read()
             if f[-4:] == ".pyx":
-                # run cython, to output the corresponding c/cpp file,
-                # if needed
-                new_sources += process_cython_file(f, m, deps_of)
+                new_sources += process_cython_file(f, m)
             else:
                 new_sources.append(f)
-
         m.sources = new_sources
-        tot +=  len(m.sources)
-
-    # now cache the dependencies if we just computed them
-    deps_file = open(deps_filename, 'w')
-    pickle.dump(deps_of, deps_file)
-    deps_file.close()
+
+        
 
 if not sdist: