Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 22 additions & 17 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -88,14 +88,17 @@ def get_extensions():
sources = main_file + source_cpu
extension = CppExtension

test_dir = os.path.join(this_dir, 'test')
models_dir = os.path.join(this_dir, 'torchvision', 'csrc', 'models')
test_file = glob.glob(os.path.join(test_dir, '*.cpp'))
source_models = glob.glob(os.path.join(models_dir, '*.cpp'))

test_file = [os.path.join(test_dir, s) for s in test_file]
source_models = [os.path.join(models_dir, s) for s in source_models]
tests = test_file + source_models
compile_cpp_tests = os.getenv('WITH_CPP_MODELS_TEST', '0') == '1'
if compile_cpp_tests:
test_dir = os.path.join(this_dir, 'test')
models_dir = os.path.join(this_dir, 'torchvision', 'csrc', 'models')
test_file = glob.glob(os.path.join(test_dir, '*.cpp'))
source_models = glob.glob(os.path.join(models_dir, '*.cpp'))

test_file = [os.path.join(test_dir, s) for s in test_file]
source_models = [os.path.join(models_dir, s) for s in source_models]
tests = test_file + source_models
tests_include_dirs = [test_dir, models_dir]

define_macros = []

Expand Down Expand Up @@ -123,7 +126,6 @@ def get_extensions():
sources = [os.path.join(extensions_dir, s) for s in sources]

include_dirs = [extensions_dir]
tests_include_dirs = [test_dir, models_dir]

ffmpeg_exe = distutils.spawn.find_executable('ffmpeg')
has_ffmpeg = ffmpeg_exe is not None
Expand All @@ -143,15 +145,18 @@ def get_extensions():
include_dirs=include_dirs,
define_macros=define_macros,
extra_compile_args=extra_compile_args,
),
extension(
'torchvision._C_tests',
tests,
include_dirs=tests_include_dirs,
define_macros=define_macros,
extra_compile_args=extra_compile_args,
),
)
]
if compile_cpp_tests:
ext_modules.append(
extension(
'torchvision._C_tests',
tests,
include_dirs=tests_include_dirs,
define_macros=define_macros,
extra_compile_args=extra_compile_args,
)
)
if has_ffmpeg:
ext_modules.append(
CppExtension(
Expand Down
7 changes: 6 additions & 1 deletion test/test_cpp_models.py
Original file line number Diff line number Diff line change
@@ -1,12 +1,17 @@
import torch
import os
import unittest
from torchvision import models, transforms, _C_tests
from torchvision import models, transforms
import sys

from PIL import Image
import torchvision.transforms.functional as F

try:
from torchvision import _C_tests
except ImportError:
_C_tests = None


def process_model(model, tensor, func, name):
model.eval()
Expand Down