remove requirements on cython and jinja2 for build

Author: hughperkins

README.md

@@ -75,10 +75,7 @@ luarocks install nn
 * Have installed the following python libraries:
 ```
 pip install numpy
-pip install Cython
-pip install Jinja2
 pip install pytest
-pip install numpy
 pip install python-mnist  # used for unit tests
 ```
 - lua51 headers should be installed, ie something like `sudo apt-get install lua5.1 liblua5.1-dev`
@@ -128,6 +125,9 @@ from __future__ import print_function, division
 
 # Recent news
 
+2 March:
+* removed requirements on Cython, Jinja2 for installation
+
 28th Februrary:
 * builds ok on Mac OS X now :-)  See https://travis-ci.org/hughperkins/pytorch/builds/112292866
 

build.sh

@@ -11,7 +11,7 @@
 
 rm -Rf build PyBuild.so dist *.egg-info cbuild
 # python setup.py build_ext -i || exit 1
-python setup.py cython_only || exit 1
+if [[ -v CYTHON ]]; then { python setup.py cython_only || exit 1; } fi
 mkdir cbuild
 TORCH_INSTALL=$(dirname $(dirname $(which luajit)))
 (cd cbuild; cmake .. -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=${TORCH_INSTALL} && make -j 4 install) || exit 1

setup.py

@@ -17,46 +17,52 @@
 print('home_dir:', home_dir)
 
 cython_present = False
-from Cython.Build import cythonize
-cython_present = True
+#from Cython.Build import cythonize
+#cython_present = True
 
 jinja_present = False
-import jinja2
-jinja_present = True
-
-# first generate cython pyx from jinja template...
-from jinja2 import Environment, PackageLoader, Template
-env = Environment(loader=jinja2.FileSystemLoader('.'))
-templateNames = [
-    'src/PyTorch.jinja2.pyx', 'src/Storage.jinja2.pyx', 'src/PyTorch.jinja2.pxd', 'src/nnWrapper.jinja2.cpp', 'src/nnWrapper.jinja2.h',
-    'test/jinja2.test_pytorch.py', 'src/Storage.jinja2.pxd', 'src/nnWrapper.jinja2.pxd', 'src/lua.jinja2.pxd', 'src/lua.jinja2.pyx']
-for templateName in templateNames:
-    template = env.get_template(templateName)
-    pyx = template.render(
-        header='GENERATED FILE, do not edit by hand, ' +
-        'Source: ' + templateName,
-        header1='GENERATED FILE, do not edit by hand',
-        header2='Source: ' + templateName)
-    outFilename = templateName.replace('.jinja2', '').replace('jinja2.', '')
-    print('outfilename', outFilename)
-    isUpdate = True
-    if os.path.isfile(outFilename):
-        # read existing file, see if anything changed
-        f = open(outFilename, 'rb')  # binary, so get linux line endings, even on Windows
-        pyx_current = f.read()
-        f.close()
-        if pyx_current == pyx:
-            isUpdate = False
-    if isUpdate:
-        print(outFilename + ' (changed)')
-        f = open(outFilename, 'wb')
-        f.write(pyx.encode('utf-8'))
-        f.close()
+#jinja_present = True
 
+running_cython = False
 for arg in sys.argv:
     if arg in ('cython_only'):
-        print('cython finished, exiting')
-        sys.exit(0)
+        running_cython=True
+        break
+
+if running_cython:
+    print('Cythonizing...')
+    from Cython.Build import cythonize
+    import jinja2
+    # first generate cython pyx from jinja template...
+    from jinja2 import Environment, PackageLoader, Template
+    env = Environment(loader=jinja2.FileSystemLoader('.'))
+    templateNames = [
+        'src/PyTorch.jinja2.pyx', 'src/Storage.jinja2.pyx', 'src/PyTorch.jinja2.pxd', 'src/nnWrapper.jinja2.cpp', 'src/nnWrapper.jinja2.h',
+        'test/jinja2.test_pytorch.py', 'src/Storage.jinja2.pxd', 'src/nnWrapper.jinja2.pxd', 'src/lua.jinja2.pxd', 'src/lua.jinja2.pyx']
+    for templateName in templateNames:
+        template = env.get_template(templateName)
+        pyx = template.render(
+            header='GENERATED FILE, do not edit by hand, ' +
+            'Source: ' + templateName,
+            header1='GENERATED FILE, do not edit by hand',
+            header2='Source: ' + templateName)
+        outFilename = templateName.replace('.jinja2', '').replace('jinja2.', '')
+        print('outfilename', outFilename)
+        isUpdate = True
+        if os.path.isfile(outFilename):
+            # read existing file, see if anything changed
+            f = open(outFilename, 'rb')  # binary, so get linux line endings, even on Windows
+            pyx_current = f.read()
+            f.close()
+            if pyx_current == pyx:
+                isUpdate = False
+        if isUpdate:
+            print(outFilename + ' (changed)')
+            f = open(outFilename, 'wb')
+            f.write(pyx.encode('utf-8'))
+            f.close()
+    print('cython finished, exiting')
+    sys.exit(0)
 
 building_dist = False
 for arg in sys.argv:
@@ -121,11 +127,11 @@ def get_file_datetime(filepath):
                   language="c++")
     )
 
-ext_modules = cythonize(ext_modules)
+#ext_modules = cythonize(ext_modules)
 
 setup(
     name='PyTorch',
-    version='2.2.0-SNAPSHOT',
+    version='',
     author='Hugh Perkins',
     author_email='hughperkins@gmail.com',
     description=(
@@ -135,7 +141,7 @@ def get_file_datetime(filepath):
     long_description='Python wrappers for torch and nn',
     classifiers=[
     ],
-    install_requires=['Cython', 'numpy', 'Jinja2'],
+    install_requires=['numpy'],
     scripts=[],
     ext_modules=ext_modules,
     py_modules=['floattensor', 'PyTorchAug'],