added Python 2 support, resolves daniilidis-group#3

ttaa9 · Jul 22, 2018 · c888067 · c888067
1 parent 3ece420
commit c888067
Show file tree

Hide file tree

Showing 12 changed files with 12 additions and 9 deletions.
diff --git a/neural_renderer/cuda/__init__.py b/neural_renderer/cuda/__init__.py
diff --git a/neural_renderer/get_points_from_angles.py b/neural_renderer/get_points_from_angles.py
@@ -1,3 +1,4 @@
+from __future__ import division
 import math
 
 import torch

diff --git a/neural_renderer/load_obj.py b/neural_renderer/load_obj.py
@@ -1,3 +1,4 @@
+from __future__ import division
 import os
 
 import torch

diff --git a/neural_renderer/mesh.py b/neural_renderer/mesh.py
@@ -3,7 +3,7 @@
 
 import neural_renderer as nr
 
-class Mesh:
+class Mesh(object):
     '''
     A simple class for creating and manipulating trimesh objects
     '''

diff --git a/neural_renderer/perspective.py b/neural_renderer/perspective.py
@@ -1,3 +1,4 @@
+from __future__ import division
 import math
 
 import torch

diff --git a/neural_renderer/projection.py b/neural_renderer/projection.py
@@ -1,3 +1,5 @@
+from __future__ import division
+
 import torch
 
 

diff --git a/neural_renderer/renderer.py b/neural_renderer/renderer.py
@@ -1,3 +1,4 @@
+from __future__ import division
 import math
 
 import torch

diff --git a/neural_renderer/save_obj.py b/neural_renderer/save_obj.py
@@ -1,3 +1,4 @@
+from __future__ import division
 import os
 
 import torch

diff --git a/setup.py b/setup.py
@@ -1,7 +1,6 @@
 from setuptools import setup, find_packages
 import unittest
 
-import torch
 from torch.utils.cpp_extension import BuildExtension, CUDAExtension
 
 CUDA_FLAGS = []
@@ -15,18 +14,15 @@ def test_all():
     CUDAExtension('neural_renderer.cuda.load_textures', [
         'neural_renderer/cuda/load_textures_cuda.cpp',
         'neural_renderer/cuda/load_textures_cuda_kernel.cu',
-        ],
-        extra_compile_args={'cxx': [], 'nvcc': CUDA_FLAGS}),
+        ]),
     CUDAExtension('neural_renderer.cuda.rasterize', [
         'neural_renderer/cuda/rasterize_cuda.cpp',
         'neural_renderer/cuda/rasterize_cuda_kernel.cu',
-        ],
-        extra_compile_args={'cxx': [], 'nvcc': CUDA_FLAGS}),
+        ]),
     CUDAExtension('neural_renderer.cuda.create_texture_image', [
         'neural_renderer/cuda/create_texture_image_cuda.cpp',
         'neural_renderer/cuda/create_texture_image_cuda_kernel.cu',
-        ],
-        extra_compile_args={'cxx': [], 'nvcc': CUDA_FLAGS}),
+        ]),
     ]
 
 INSTALL_REQUIREMENTS = ['numpy', 'torch', 'torchvision', 'scikit-image', 'tqdm', 'imageio']
@@ -39,7 +35,7 @@ def test_all():
     version='1.1.3',
     name='neural_renderer',
     test_suite='setup.test_all',
-    packages=find_packages(),
+    packages=['neural_renderer', 'neural_renderer.cuda'],
     install_requires=INSTALL_REQUIREMENTS,
     ext_modules=ext_modules,
     cmdclass = {'build_ext': BuildExtension}

diff --git a/tests/data/car.png b/tests/data/car.png
diff --git a/tests/data/test_rasterize1.png b/tests/data/test_rasterize1.png
diff --git a/tests/data/test_rasterize2.png b/tests/data/test_rasterize2.png
Original file line number	Diff line number	Diff line change
		@@ -1,3 +1,5 @@
		from __future__ import division

		import torch


Expand Down