diff --git a/BUILD_TOPOLOGY.toml b/BUILD_TOPOLOGY.toml index 6b5aa5ecb0a..c75283b3cc3 100644 --- a/BUILD_TOPOLOGY.toml +++ b/BUILD_TOPOLOGY.toml @@ -314,7 +314,7 @@ description = "Fusilli hipdnn provider" type = "generic" artifact_group_deps = ["hip-runtime", "iree-compiler"] # TODO: rocm-systems included for projects/hip/VERSION (see CMakeLists.txt) -source_sets = ["iree-libs", "rocm-systems"] +source_sets = ["iree-libs", "rocm-libraries", "rocm-systems"] [artifact_groups.media-libs] description = "Media Libraries" diff --git a/CMakeLists.txt b/CMakeLists.txt index d0f637cd6ba..a28c91e90ec 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -231,7 +231,7 @@ option(THEROCK_ENABLE_MEDIA_LIBS "Enable building of Media libraries" "${THEROCK option(THEROCK_ENABLE_HOST_MATH "Build all bundled host math libraries by default" OFF) option(THEROCK_RESET_FEATURES "One-shot flag which forces all feature flags to their default state for this configuration run" OFF) # TODO(iree-org/fusilli/issues/57): Enable fusilli build once multi-arch support lands. -option(THEROCK_ENABLE_IREE_LIBS "Enable building of IREE libraries" OFF) +option(THEROCK_ENABLE_IREE_LIBS "Enable building of IREE libraries" "${THEROCK_ENABLE_ALL}") ################################################################################ # Artifact-based features are auto-generated from BUILD_TOPOLOGY.toml diff --git a/build_tools/fetch_sources.py b/build_tools/fetch_sources.py index f062c334154..876fb1176de 100755 --- a/build_tools/fetch_sources.py +++ b/build_tools/fetch_sources.py @@ -483,7 +483,7 @@ def main(argv): ) parser.add_argument( "--include-iree-libs", - default=False, + default=True, action=argparse.BooleanOptionalAction, help="Include IREE and related libraries", ) diff --git a/build_tools/github_actions/fetch_test_configurations.py b/build_tools/github_actions/fetch_test_configurations.py index a62526fefa5..545bee3d7d2 100644 --- a/build_tools/github_actions/fetch_test_configurations.py +++ b/build_tools/github_actions/fetch_test_configurations.py @@ -366,14 +366,14 @@ def _get_script_path(script_name: str) -> str: }, # TODO(iree-org/fusilli/issues/57): Enable fusilli tests once build is # enabled by default. - # "fusilliprovider": { - # "job_name": "fusilliprovider", - # "fetch_artifact_args": "--hipdnn --fusilliprovider --iree-compiler --tests", - # "timeout_minutes": 15, - # "test_script": f"python {_get_script_path('test_fusilliprovider.py')}", - # "platform": ["linux"], - # "total_shards": 1, - # }, + "fusilliprovider": { + "job_name": "fusilliprovider", + "fetch_artifact_args": "--hipdnn --fusilliprovider --iree-compiler --tests", + "timeout_minutes": 15, + "test_script": f"python {_get_script_path('test_fusilliprovider.py')}", + "platform": ["linux"], + "total_shards": 1, + }, # hipBLASLt provider tests "hipblasltprovider": { "job_name": "hipblasltprovider", diff --git a/iree-libs/CMakeLists.txt b/iree-libs/CMakeLists.txt index e85acb04508..03672f408f0 100644 --- a/iree-libs/CMakeLists.txt +++ b/iree-libs/CMakeLists.txt @@ -88,7 +88,7 @@ if(THEROCK_ENABLE_FUSILLIPROVIDER) ############################################################################## therock_cmake_subproject_declare(fusilliprovider USE_DIST_AMDGPU_TARGETS - EXTERNAL_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/fusilli/plugins/hipdnn-plugin" + EXTERNAL_SOURCE_DIR "${THEROCK_ROCM_LIBRARIES_SOURCE_DIR}/dnn-providers/fusilli-provider" BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}/fusilliprovider" BACKGROUND_BUILD CMAKE_ARGS diff --git a/rocm-libraries b/rocm-libraries index 7567d83979e..43cceaa6885 160000 --- a/rocm-libraries +++ b/rocm-libraries @@ -1 +1 @@ -Subproject commit 7567d83979edcd7f5f0aad22de23ef71ed78f920 +Subproject commit 43cceaa688542d1c984f923fa49a3f6f534bd69b