File torchvision-fix-build.patch of Package python-torchvision

Overview Repositories Revisions Requests Users Attributes Meta

File torchvision-fix-build.patch of Package python-torchvision (Revision 2edcaaaf59d3ed44627ab75c4f3e4412)

Currently displaying revision 2edcaaaf59d3ed44627ab75c4f3e4412 , Show latest

diff --git a/setup.py b/setup.py
index 5bc87a5..7919ac7 100644
--- a/setup.py
+++ b/setup.py
@@ -144,7 +144,8 @@ def get_macros_and_flags():
             extra_compile_args["nvcc"].append("-O0")
             extra_compile_args["nvcc"].append("-g")
     else:
-        extra_compile_args["cxx"].append("-g0")
+        print("Compiling release with debug symbols")
+        extra_compile_args["cxx"].append("-g")
 
     return define_macros, extra_compile_args
 
@@ -168,13 +169,13 @@ def make_C_extension():
         hipify_python.hipify(
             project_directory=str(ROOT_DIR),
             output_directory=str(ROOT_DIR),
-            includes="torchvision/csrc/ops/cuda/*",
+            includes=["*/torchvision/csrc/ops/cuda/*",],
             show_detailed=True,
             is_pytorch_extension=True,
         )
         cuda_sources = list(CSRS_DIR.glob("ops/hip/*.hip"))
-        for header in CSRS_DIR.glob("ops/cuda/*.h"):
-            shutil.copy(str(header), str(CSRS_DIR / "ops/hip"))
+        # for header in CSRS_DIR.glob("ops/cuda/*.h"):
+        #     shutil.copy(str(header), str(CSRS_DIR / "ops/hip"))
     else:
         cuda_sources = list(CSRS_DIR.glob("ops/cuda/*.cu"))
 
@@ -284,9 +285,18 @@ def make_image_extension():
     sources = list(image_dir.glob("*.cpp")) + list(image_dir.glob("cpu/*.cpp")) + list(image_dir.glob("cpu/giflib/*.c"))
 
     if IS_ROCM:
+        from torch.utils.hipify import hipify_python
+
+        hipify_python.hipify(
+            project_directory=str(ROOT_DIR),
+            output_directory=str(ROOT_DIR),
+            includes=["*/torchvision/csrc/io/image/cuda/*",],
+            show_detailed=True,
+            is_pytorch_extension=True,
+        )
         sources += list(image_dir.glob("hip/*.cpp"))
         # we need to exclude this in favor of the hipified source
-        sources.remove(image_dir / "image.cpp")
+        # sources.remove(image_dir / "image.cpp")
     else:
         sources += list(image_dir.glob("cuda/*.cpp"))
 
@@ -412,20 +422,20 @@ def make_video_decoders_extensions():
 
         ffmpeg_bin = os.path.dirname(ffmpeg_exe)
         ffmpeg_root = os.path.dirname(ffmpeg_bin)
-        ffmpeg_include_dir = os.path.join(ffmpeg_root, "include")
-        ffmpeg_library_dir = os.path.join(ffmpeg_root, "lib")
-
-        gcc = os.environ.get("CC", shutil.which("gcc"))
-        platform_tag = subprocess.run([gcc, "-print-multiarch"], stdout=subprocess.PIPE)
-        platform_tag = platform_tag.stdout.strip().decode("utf-8")
-
-        if platform_tag:
-            # Most probably a Debian-based distribution
-            ffmpeg_include_dir = [ffmpeg_include_dir, os.path.join(ffmpeg_include_dir, platform_tag)]
-            ffmpeg_library_dir = [ffmpeg_library_dir, os.path.join(ffmpeg_library_dir, platform_tag)]
-        else:
-            ffmpeg_include_dir = [ffmpeg_include_dir]
-            ffmpeg_library_dir = [ffmpeg_library_dir]
+        ffmpeg_include_dir = os.path.join(ffmpeg_root, "include/ffmpeg")
+        ffmpeg_library_dir = os.path.join(ffmpeg_root, "lib64")
+
+        # gcc = os.environ.get("CC", shutil.which("gcc"))
+        # platform_tag = subprocess.run([gcc, "-print-multiarch"], stdout=subprocess.PIPE)
+        # platform_tag = platform_tag.stdout.strip().decode("utf-8")
+        #
+        # if platform_tag:
+        #     # Most probably a Debian-based distribution
+        #     ffmpeg_include_dir = [ffmpeg_include_dir, os.path.join(ffmpeg_include_dir, platform_tag)]
+        #     ffmpeg_library_dir = [ffmpeg_library_dir, os.path.join(ffmpeg_library_dir, platform_tag)]
+        # else:
+        ffmpeg_include_dir = [ffmpeg_include_dir]
+        ffmpeg_library_dir = [ffmpeg_library_dir]
 
         for library in ffmpeg_libraries:
             library_found = False

Places

File torchvision-fix-build.patch of Package python-torchvision (Revision 2edcaaaf59d3ed44627ab75c4f3e4412)

Places