fix travis

pytorch · Feb 13, 2020 · ac40cf7 · ac40cf7
1 parent b44a56f
commit ac40cf7
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -67,8 +67,8 @@ install:
     cd -
 
 script:
-  - pytest --cov-config .coveragerc --cov torchvision --cov $TV_INSTALL_PATH -k 'not TestVideoReader and not TestVideoTransforms' test
-  - pytest test/test_hub.py
+  - travis_wait 30 pytest --cov-config .coveragerc --cov torchvision --cov $TV_INSTALL_PATH -k 'not TestVideoReader and not TestVideoTransforms' test
+  - travis_wait 30 pytest test/test_hub.py
 
 after_success:
   # Necessary to run coverage combine to rewrite paths from

diff --git a/torchvision/csrc/image.h b/torchvision/csrc/image.h
@@ -1,4 +1,3 @@
 #pragma once
 
 #include "cpu/image/readpng_cpu.h"
-
diff --git a/torchvision/csrc/vision.cpp b/torchvision/csrc/vision.cpp
@@ -11,8 +11,8 @@
 #include "ROIAlign.h"
 #include "ROIPool.h"
 #include "empty_tensor_op.h"
-#ifdef __linux__ 
-  #include "image.h"
+#ifdef __linux__
+#include "image.h"
 #endif
 #include "nms.h"
 
@@ -52,7 +52,7 @@ static auto registry =
         .op("torchvision::ps_roi_align", &ps_roi_align)
         .op("torchvision::ps_roi_pool", &ps_roi_pool)
         .op("torchvision::deform_conv2d", &deform_conv2d)
-#ifdef __linux__ 
+#ifdef __linux__
         .op("torchvision::decode_png", &decodePNG)
 #endif
         .op("torchvision::_cuda_version", &_cuda_version);
Original file line number	Diff line number	Diff line change
		@@ -1,4 +1,3 @@
		#pragma once

		#include "cpu/image/readpng_cpu.h"