Flatten test folder (pytorch#613)

NicolasHug · web-flow · commit f4f82bce17c9 · 2025-04-02T16:55:54.000+01:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -7,5 +7,5 @@ add_subdirectory(src/torchcodec/_core)
 option(BUILD_TESTS "Build tests" OFF)
 if(BUILD_TESTS)
     enable_testing()
-    add_subdirectory(test/decoders)
+    add_subdirectory(test)
 endif()
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
@@ -23,7 +23,7 @@ add_executable(
 
 target_include_directories(VideoDecoderTest SYSTEM PRIVATE ${TORCH_INCLUDE_DIRS})
 target_include_directories(VideoDecoderTest SYSTEM PRIVATE ${libav_include_dirs})
-target_include_directories(VideoDecoderTest PRIVATE ../../)
+target_include_directories(VideoDecoderTest PRIVATE ../)
 
 target_link_libraries(
   VideoDecoderTest
diff --git a/test/VideoDecoderTest.cpp b/test/VideoDecoderTest.cpp
@@ -34,7 +34,7 @@ std::string getResourcePath(const std::string& filename) {
 #else
   std::filesystem::path dirPath = std::filesystem::path(__FILE__);
   std::string filepath =
-      dirPath.parent_path().string() + "/../resources/" + filename;
+      dirPath.parent_path().string() + "/resources/" + filename;
 #endif
   return filepath;
 }
diff --git a/test/decoders/__init__.py b/test/decoders/__init__.py
diff --git a/test/samplers/__init__.py b/test/samplers/__init__.py
diff --git a/test/test_decoders.py b/test/test_decoders.py
@@ -18,7 +18,7 @@
     VideoStreamMetadata,
 )
 
-from ..utils import (
+from .utils import (
     assert_frames_equal,
     AV1_VIDEO,
     cpu_and_cuda,
diff --git a/test/test_metadata.py b/test/test_metadata.py
@@ -18,7 +18,7 @@
 )
 from torchcodec.decoders import AudioDecoder, VideoDecoder
 
-from ..utils import NASA_AUDIO_MP3, NASA_VIDEO
+from .utils import NASA_AUDIO_MP3, NASA_VIDEO
 
 
 # TODO: Expected values in these tests should be based on the assets's
diff --git a/test/test_ops.py b/test/test_ops.py
@@ -39,7 +39,7 @@
     seek_to_pts,
 )
 
-from ..utils import (
+from .utils import (
     assert_frames_equal,
     cpu_and_cuda,
     NASA_AUDIO,
diff --git a/test/test_policy.py b/test/test_policy.py
diff --git a/test/test_samplers.py b/test/test_samplers.py
@@ -19,7 +19,7 @@
 from torchcodec.samplers._index_based import _build_all_clips_indices
 from torchcodec.samplers._time_based import _build_all_clips_timestamps
 
-from ..utils import assert_frames_equal, NASA_VIDEO
+from .utils import assert_frames_equal, NASA_VIDEO
 
 
 def _assert_output_type_and_shapes(
diff --git a/test/test_video_clip_sampler.py b/test/test_video_clip_sampler.py
@@ -10,7 +10,7 @@
     VideoClipSampler,
 )
 
-from ..utils import NASA_VIDEO
+from .utils import NASA_VIDEO
 
 
 @pytest.mark.parametrize(

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ std::string getResourcePath(const std::string& filename) {`
`34`	`34`	`#else`
`35`	`35`	`std::filesystem::path dirPath = std::filesystem::path(__FILE__);`
`36`	`36`	`std::string filepath =`
`37`		`- dirPath.parent_path().string() + "/../resources/" + filename;`
	`37`	`+ dirPath.parent_path().string() + "/resources/" + filename;`
`38`	`38`	`#endif`
`39`	`39`	`return filepath;`
`40`	`40`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@`
`18`	`18`	`VideoStreamMetadata,`
`19`	`19`	`)`
`20`	`20`
`21`		`-from ..utils import (`
	`21`	`+from .utils import (`
`22`	`22`	`assert_frames_equal,`
`23`	`23`	`AV1_VIDEO,`
`24`	`24`	`cpu_and_cuda,`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@`
`39`	`39`	`seek_to_pts,`
`40`	`40`	`)`
`41`	`41`
`42`		`-from ..utils import (`
	`42`	`+from .utils import (`
`43`	`43`	`assert_frames_equal,`
`44`	`44`	`cpu_and_cuda,`
`45`	`45`	`NASA_AUDIO,`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`	`VideoClipSampler,`
`11`	`11`	`)`
`12`	`12`
`13`		`-from ..utils import NASA_VIDEO`
	`13`	`+from .utils import NASA_VIDEO`
`14`	`14`
`15`	`15`
`16`	`16`	`@pytest.mark.parametrize(`