Add hipdnn and miopen-plugin to python packaging

build_tools/build_python_packages.py

@@ -70,6 +70,11 @@ def run(args: argparse.Namespace):
             # included in runtime packages, but we still want them in the devel package.
             "prim",
             "rocwmma",
+            # Third party dependencies needed by hipDNN consumers.
+            "flatbuffers",
+            "fmt",
+            "nlohmann-json",
+            "spdlog",
         ],
         tarball_compression=args.devel_tarball_compression,
     )
@@ -113,15 +118,17 @@ def libraries_artifact_filter(target_family: str, an: ArtifactName) -> bool:
         in [
             "blas",
             "fft",
+            "hipdnn",
             "miopen",
+            "miopen-plugin",
             "rand",
             "rccl",
         ]
         and an.component
         in [
             "lib",
         ]
-        and an.target_family == target_family
+        and (an.target_family == target_family or an.target_family == "generic")
     )
     return libraries
 

build_tools/packaging/python/templates/rocm/src/rocm_sdk/_dist_info.py

@@ -238,6 +238,7 @@ def determine_target_family() -> str:
 LibraryEntry("hipsolver", "libraries", "libhipsolver.so*", "hipsolver*.dll")
 LibraryEntry("rccl", "libraries", "librccl.so*", "")
 LibraryEntry("miopen", "libraries", "libMIOpen.so*", "MIOpen*.dll")
+LibraryEntry("hipdnn", "libraries", "libhipdnn_backend.so*", "hipdnn_backend*.dll")
 
 # Others we may want:
 # hiprtc-builtins

build_tools/packaging/python/templates/rocm/src/rocm_sdk/tests/devel_test.py

@@ -3,6 +3,7 @@
 """Installation package tests for the core package."""
 
 import importlib
+import os
 from pathlib import Path
 import platform
 import subprocess
@@ -152,11 +153,30 @@ def testSharedLibrariesLoad(self):
             if "libtest_linking_lib" in str(so_path):
                 # rocprim unit tests, not actual library files
                 continue
+
+            extra_setup = ""
+            if "hipdnn_plugins" in str(so_path) and sys.platform == "win32":
+                # hipdnn plugins have dependencies on other libraries (e.g. miopen).
+                # In a real-world scenario, hipdnn_backend loads these plugins, and
+                # the dependencies are found because they reside in the same directory
+                # (or are otherwise resolvable).
+                # To simulate this loading behavior in the test:
+                # - On Linux, RPATH ($ORIGIN/../../) handles dependency resolution.
+                # - On Windows, we must manually add the library directory (calculated
+                #   relative to the plugin) via add_dll_directory, as there is no RPATH equivalent.
+                # We assume the plugin is at .../{lib|bin}/hipdnn_plugins/engines/plugin.so
+                # and the dependencies are at .../{lib|bin}.
+                lib_dir = str(so_path.parents[2]).replace("\\", "\\\\")
+                extra_setup = f"import os; os.add_dll_directory('{lib_dir}') if hasattr(os, 'add_dll_directory') else None; "
+
             with self.subTest(msg="Check shared library loads", so_path=so_path):
                 # Load each in an isolated process because not all libraries in the tree
                 # are designed to load into the same process (i.e. LLVM runtime libs,
                 # etc).
-                command = "import ctypes; import sys; ctypes.CDLL(sys.argv[1])"
+                command = (
+                    extra_setup + "import ctypes; import sys; ctypes.CDLL(sys.argv[1])"
+                )
+
                 subprocess.check_call(
                     [sys.executable, "-P", "-c", command, str(so_path)]
                 )

build_tools/packaging/python/templates/rocm/src/rocm_sdk/tests/libraries_test.py

@@ -3,6 +3,7 @@
 """Installation package tests for the core package."""
 
 import importlib
+import os
 from pathlib import Path
 import subprocess
 import sys
@@ -61,6 +62,21 @@ def testSharedLibrariesLoad(self):
                     # Though this is not needed for the amd-smi client.
                     continue
 
+                extra_setup = ""
+                if "hipdnn_plugins" in str(so_path) and sys.platform == "win32":
+                    # hipdnn plugins have dependencies on other libraries (e.g. miopen).
+                    # In a real-world scenario, hipdnn_backend loads these plugins, and
+                    # the dependencies are found because they reside in the same directory
+                    # (or are otherwise resolvable).
+                    # To simulate this loading behavior in the test:
+                    # - On Linux, RPATH ($ORIGIN/../../) handles dependency resolution.
+                    # - On Windows, we must manually add the library directory (calculated
+                    #   relative to the plugin) via add_dll_directory, as there is no RPATH equivalent.
+                    # We assume the plugin is at .../{lib|bin}/hipdnn_plugins/engines/plugin.so
+                    # and the dependencies are at .../{lib|bin}.
+                    lib_dir = str(so_path.parents[2]).replace("\\", "\\\\")
+                    extra_setup = f"import os; os.add_dll_directory('{lib_dir}') if hasattr(os, 'add_dll_directory') else None; "
+
                 # For Windows compatibility, we first preload libraries (DLLs)
                 # that are not co-located. Specifically this is for
                 # the "libraries" like hipfft, rocblas, etc. which are siblings
@@ -74,9 +90,11 @@ def testSharedLibrariesLoad(self):
                 # are designed to load into the same process (i.e. LLVM runtime libs,
                 # etc).
                 command = (
-                    preload_command
+                    extra_setup
+                    + preload_command
                     + " import ctypes; import sys; ctypes.CDLL(sys.argv[1])"
                 )
+
                 subprocess.check_call(
                     [sys.executable, "-P", "-c", command, str(so_path)]
                 )

docs/packaging/python_packaging.md

@@ -184,6 +184,7 @@ def initialize():
     'rccl',
     'hipblaslt',
     'miopen',
+    'hipdnn',
   ],
   check_version='$(rocm-sdk version)')
 " > torch/_rocm_init.py

external-builds/pytorch/build_prod_wheels.py

@@ -142,6 +142,7 @@
     "rccl",  # Linux only for the moment.
     "hipblaslt",
     "miopen",
+    "hipdnn",
     "rocm_sysdeps_liblzma",
     "rocm-openblas",
 ]
@@ -159,6 +160,7 @@
     "hipsolver",
     "hipblaslt",
     "miopen",
+    "hipdnn",
     "rocm-openblas",
 ]