Merge pull request #13 from stephenhky/removefortran

Remove Fortran components

Author: stephenhky

graphflow/pagerank/GooglePageRank.py

@@ -2,7 +2,6 @@
 
 import numpy as np
 
-from .f90pagerank import f90pagerank as fpr
 from .cpagerank import pagerank_cython
 from .. import L1norm, PageRankLanguage
 
@@ -15,12 +14,6 @@ def GoogleMatrix(digraph, beta):
     return A, nodedict
 
 
-def CalculatePageRankFromAdjacencyMatrix_Fortran(adjMatrix, nodes, eps=1e-4, maxstep=1000):
-    r = fpr.compute_pagerank(adjMatrix, eps, maxstep)
-    nodepr = {node: r[nodes[node]] for node in nodes}
-    return nodepr
-
-
 def CalculatePageRankFromAdjacencyMatrix_Cython(adjMatrix, nodes, eps=1e-4, maxstep=1000):
     return pagerank_cython(adjMatrix, nodes, eps, maxstep)
 
@@ -40,12 +33,12 @@ def CalculatePageRankFromAdjacencyMatrix_Python(adjMatrix, nodes, eps=1e-4, maxs
 
 
 def CalculatePageRankFromAdjacencyMatrix(adjMatrix, nodes, eps=1e-4, maxstep=1000,
-                                         language=PageRankLanguage.FORTRAN,
+                                         language=PageRankLanguage.CYTHON,
                                          fortran=True):
     if not fortran:
         warnings.warn('The boolean variable "fortran" is deprecated.')
     if language == PageRankLanguage.FORTRAN:
-        return CalculatePageRankFromAdjacencyMatrix_Fortran(adjMatrix, nodes, eps=eps, maxstep=maxstep)
+        raise ValueError('Fortran is no longer supported.')
     elif language == PageRankLanguage.CYTHON:
         return CalculatePageRankFromAdjacencyMatrix_Cython(adjMatrix, nodes, eps=eps, maxstep=maxstep)
     else:

graphflow/pagerank/f90pagerank.f90

@@ -5,6 +5,7 @@
 # https://stackoverflow.com/questions/7932028/setup-py-for-packages-that-depend-on-both-cython-and-f2py
 
 from setuptools import setup
+import numpy as np
 
 try:
     from Cython.Build import cythonize
@@ -14,14 +15,6 @@
     dynprog_ext_modules = [Extension('graphflow.pagerank.cpagerank',
                                      sources=['graphflow/pagerank/cpagerank.c'])]
 
-import numpy as np
-from numpy.distutils.core import setup
-from numpy.distutils.core import Extension as fortranExtension
-
-fortran_ext_modules = [fortranExtension('graphflow.pagerank.f90pagerank',
-                                         sources=['graphflow/pagerank/f90pagerank.f90',
-                                                  'graphflow/pagerank/f90pagerank.pyf'])]
-
 
 def readme():
     with open('README.md') as f:
@@ -33,7 +26,7 @@ def install_requirements():
 
 
 setup(name='graphflow',
-      version="0.4.2",
+      version="0.4.3a1",
       description="Algorithms for Graph Flow Analysis",
       long_description="Numerical routines for analyzing data represented by graphs",
       classifiers=[
@@ -67,7 +60,7 @@ def install_requirements():
           'pandas',
       ],
       include_dirs=[np.get_include()],
-      ext_modules=fortran_ext_modules+dynprog_ext_modules,
+      ext_modules=dynprog_ext_modules,
       include_package_data=True,
       test_suite="test",
       zip_safe=False)

graphflow/pagerank/f90pagerank.pyf

@@ -73,12 +73,13 @@ def setUp(self):
         self.googlematrix, self.nodedict = graphflow.pagerank.GooglePageRank.GoogleMatrix(graph, 0.15)
 
     def testNetwork_fortran(self):
-        pagerank = graphflow.pagerank.GooglePageRank.CalculatePageRankFromAdjacencyMatrix(self.googlematrix, self.nodedict, language=PageRankLanguage.FORTRAN)
-
-        self.assertEqual(len(pagerank), len(pagerank_answer))
-        self.assertEqual(len(set(pagerank.keys()).intersection(set(pagerank_answer.keys()))), len(pagerank))
-        for name in pagerank:
-            self.assertAlmostEqual(pagerank[name], pagerank_answer[name], places=5)
+        self.assertRaises(
+            ValueError,
+            graphflow.pagerank.GooglePageRank.CalculatePageRankFromAdjacencyMatrix,
+            adjMatrix=self.googlematrix,
+            nodes=self.nodedict,
+            language=PageRankLanguage.FORTRAN
+        )
 
     def testNetwork_python(self):
         pagerank = graphflow.pagerank.GooglePageRank.CalculatePageRankFromAdjacencyMatrix(self.googlematrix, self.nodedict, language=PageRankLanguage.PYTHON)