Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
159 changes: 111 additions & 48 deletions projects/hipblaslt/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,9 @@ else()
set(HIPBLASLT_IS_SUBPROJECT TRUE)
endif()

list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
list(APPEND CMAKE_MODULE_PATH
"${CMAKE_CURRENT_SOURCE_DIR}/cmake"
"${CMAKE_CURRENT_SOURCE_DIR}/tensilelite/cmake")

# ROCm libraries root (for shared/ctest and other shared resources)
# Only set default when not already defined (e.g. by superproject / rocm-libraries).
Expand Down Expand Up @@ -270,38 +272,59 @@ if(HIPBLASLT_ENABLE_ROCROLLER)
endif()

if(NOT HIPBLASLT_ENABLE_YAML)
# See: https://github.com/msgpack/msgpack-c/wiki/Q%26A#how-to-support-both-msgpack-c-c-version-5x-and-6x-
# Prefer 6.x (msgpack-cxx)
find_package(msgpack-cxx CONFIG)
if(msgpack-cxx_FOUND)
message(STATUS "Found msgpack-cxx (>=6.x)")
set(hipblaslt_msgpack_target "msgpack-cxx")
else()
# TODO: set minimum version required for *-cxx library
find_package(msgpackc-cxx CONFIG REQUIRED NAMES msgpackc-cxx msgpack)
set(hipblaslt_msgpack_target "msgpackc-cxx")
message(STATUS "Found msgpack (<=5.x)")
endif()
endif()

set(TENSILELITE_BUNDLED_ORIGAMI OFF)
if(ROCM_LIBS_SUPERBUILD)
if(NOT TARGET roc::origami)
message(FATAL_ERROR "The ROCm libraries superbuild must provide the roc::origami target before configuring hipBLASLt.")
endif()
elseif(HIPBLASLT_ENABLE_THEROCK)
find_package(origami CONFIG REQUIRED)
else()
set(TENSILELITE_BUNDLED_ORIGAMI ON)
set(TENSILELITE_BUNDLED_ORIGAMI_BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}/origami")
block(SCOPE_FOR VARIABLES)
set(ORIGAMI_INSTALL_COMPONENT origami-devel)
set(ORIGAMI_BUILD_SHARED_LIBS OFF)
set(ORIGAMI_ENABLE_FETCH ON)
set(ORIGAMI_BUILD_TESTING OFF)
set(ORIGAMI_ENABLE_PYTHON OFF)
set(BUILD_TESTING OFF)
set(CMAKE_VISIBILITY_INLINES_HIDDEN ON)
add_subdirectory("${CMAKE_CURRENT_SOURCE_DIR}/../../shared/origami" "${CMAKE_CURRENT_BINARY_DIR}/origami")
add_subdirectory("${CMAKE_CURRENT_SOURCE_DIR}/../../shared/origami" "${TENSILELITE_BUNDLED_ORIGAMI_BINARY_DIR}")
endblock()
endif()

if(HIPBLASLT_ENABLE_MXDATAGENERATOR)
if(ROCM_LIBS_SUPERBUILD)
if(NOT TARGET roc::mxDataGeneratorPreSwizzle)
message(FATAL_ERROR "The ROCm libraries superbuild must provide the roc::mxDataGeneratorPreSwizzle target before configuring hipBLASLt.")
endif()
elseif(HIPBLASLT_ENABLE_THEROCK)
find_package(mxDataGenerator CONFIG REQUIRED)
elseif(EXISTS "${ROCM_LIBRARIES_ROOT}/shared/mxdatagenerator/CMakeLists.txt")
block()
set(CMAKE_SKIP_INSTALL_RULES ON)
add_subdirectory(
"${ROCM_LIBRARIES_ROOT}/shared/mxdatagenerator"
"${CMAKE_CURRENT_BINARY_DIR}/mxdatagenerator"
EXCLUDE_FROM_ALL)
endblock()
else()
find_package(mxDataGenerator CONFIG REQUIRED)
endif()
endif()

add_library(hipblaslt-headers INTERFACE)
add_library(hipblaslt::headers ALIAS hipblaslt-headers)
target_include_directories(hipblaslt-headers
Expand Down Expand Up @@ -374,7 +397,28 @@ if(_hipblaslt_mxdatagen_enabled)
add_subdirectory(clients/common)
endif()

if(HIPBLASLT_ENABLE_HOST)
if(LEGACY_HIPBLAS_DIRECT)
rocm_package_add_dependencies(DEPENDS "hipblas >= 0.50.0")
else()
set(hipblas_common_minimum 1.0.0)
if(HIPBLASLT_BUILD_SHARED_LIBS)
rocm_package_add_deb_dependencies(COMPONENT devel DEPENDS "hipblas-common-dev >= ${hipblas_common_minimum}")
rocm_package_add_rpm_dependencies(COMPONENT devel DEPENDS "hipblas-common-devel >= ${hipblas_common_minimum}")
else()
rocm_package_add_deb_dependencies(COMPONENT devel DEPENDS "hipblas-common-static-dev >= ${hipblas_common_minimum}")
rocm_package_add_rpm_dependencies(COMPONENT devel DEPENDS "hipblas-common-static-devel >= ${hipblas_common_minimum}")
endif()
endif()
endif()

block(SCOPE_FOR VARIABLES)
unset(CPACK_DEBIAN_PACKAGE_DEPENDS)
unset(CPACK_RPM_PACKAGE_REQUIRES)
unset(CPACK_DEBIAN_DEVEL_PACKAGE_DEPENDS)
unset(CPACK_RPM_DEVEL_PACKAGE_REQUIRES)
set(TENSILELITE_ENABLE_YAML "${HIPBLASLT_ENABLE_YAML}")
set(TENSILELITE_ENABLE_MXDATAGENERATOR "${HIPBLASLT_ENABLE_MXDATAGENERATOR}")
set(BUILD_SHARED_LIBS "${TENSILELITE_BUILD_SHARED_LIBS}")
add_subdirectory(tensilelite)
endblock()
Expand Down Expand Up @@ -525,26 +569,6 @@ if(HIPBLASLT_ENABLE_HOST)
COMPONENT devel
)

if( LEGACY_HIPBLAS_DIRECT )
rocm_package_add_dependencies(DEPENDS "hipblas >= 0.50.0")
else()
set(hipblas_common_minimum 1.0.0)
if(BUILD_SHARED_LIBS)
rocm_package_add_deb_dependencies(COMPONENT devel DEPENDS "hipblas-common-dev >= ${hipblas_common_minimum}")
rocm_package_add_rpm_dependencies(COMPONENT devel DEPENDS "hipblas-common-devel >= ${hipblas_common_minimum}")
else()
rocm_package_add_deb_dependencies(COMPONENT devel DEPENDS "hipblas-common-static-dev >= ${hipblas_common_minimum}")
rocm_package_add_rpm_dependencies(COMPONENT devel DEPENDS "hipblas-common-static-devel >= ${hipblas_common_minimum}")
endif()
endif()
endif()

if(TENSILELITE_ENABLE_HOST)
install(
FILES "${CMAKE_CURRENT_SOURCE_DIR}/cmake/hipblaslt_codegen.cmake"
DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/hipblaslt"
COMPONENT devel
)
endif()

set(_hipblaslt_export_targets)
Expand All @@ -554,31 +578,17 @@ if(HIPBLASLT_ENABLE_HOST)
list(APPEND _hipblaslt_export_targets roc::hipblaslt)
list(APPEND _hipblaslt_export_depends PACKAGE ${hipblas_target})
endif()
if(TENSILELITE_ENABLE_HOST)
list(APPEND _hipblaslt_export_targets roc::tensilelite-host)
endif()

if(_hipblaslt_export_targets)
block(SCOPE_FOR VARIABLES)
set(_hipblaslt_static_depends)

if(TARGET tensilelite-host)
get_target_property(_tensilelite_host_type tensilelite-host TYPE)
endif()
if(TARGET hipblaslt)
get_target_property(_hipblaslt_target_type hipblaslt TYPE)
endif()

if(_tensilelite_host_type STREQUAL "STATIC_LIBRARY")
list(APPEND _hipblaslt_static_depends PACKAGE ZLIB)
endif()

if(HIPBLASLT_ENABLE_YAML)
if(_tensilelite_host_type STREQUAL "STATIC_LIBRARY")
list(APPEND _hipblaslt_static_depends PACKAGE LLVM)
endif()
elseif(_tensilelite_host_type STREQUAL "STATIC_LIBRARY"
OR _hipblaslt_target_type STREQUAL "STATIC_LIBRARY")
if(NOT HIPBLASLT_ENABLE_YAML
AND _hipblaslt_target_type STREQUAL "STATIC_LIBRARY")
if(hipblaslt_msgpack_target STREQUAL "msgpack-cxx")
list(APPEND _hipblaslt_static_depends PACKAGE msgpack-cxx CONFIG)
else()
Expand All @@ -587,13 +597,6 @@ if(_hipblaslt_export_targets)
endif()
endif()

# rocm_export_targets emits STATIC_DEPENDS only when the canonical
# variable is OFF. Scope that choice to config generation so a mixed
# shared hipBLASLt/static TensileLite export remains discoverable.
if(_hipblaslt_static_depends)
set(BUILD_SHARED_LIBS OFF)
endif()

rocm_export_targets(
TARGETS ${_hipblaslt_export_targets}
DEPENDS ${_hipblaslt_export_depends}
Expand Down Expand Up @@ -950,7 +953,67 @@ if(HIPBLASLT_ENABLE_CLIENT AND HIPBLASLT_ENABLE_SAMPLES)
rocm_package_setup_client_component(samples)
endif()

if(TENSILELITE_BUILD_SHARED_LIBS)
set(_tensilelite_devel_package tensilelite-host)
else()
set(_tensilelite_devel_package tensilelite-host-static)
endif()
set(tensilelite_minimum 1.5.0)
if(ENABLE_ASAN_PACKAGING)
set(_tensilelite_runtime_package tensilelite-host-asan)
else()
set(_tensilelite_runtime_package tensilelite-host)
endif()
if(TENSILELITE_ENABLE_HOST)
rocm_package_add_deb_dependencies(COMPONENT devel
DEPENDS "${_tensilelite_devel_package}-dev >= ${tensilelite_minimum}")
rocm_package_add_rpm_dependencies(COMPONENT devel
DEPENDS "${_tensilelite_devel_package}-devel >= ${tensilelite_minimum}")

if(TENSILELITE_BUILD_SHARED_LIBS)
if(CPACK_RPM_PACKAGE_REQUIRES)
rocm_package_add_rpm_dependencies(COMPONENT runtime
DEPENDS "${CPACK_RPM_PACKAGE_REQUIRES}")
endif()
if(ROCM_DEP_ROCMCORE)
if(ENABLE_ASAN_PACKAGING)
rocm_package_add_rpm_dependencies(COMPONENT runtime DEPENDS "rocm-core-asan")
else()
rocm_package_add_rpm_dependencies(COMPONENT runtime DEPENDS "rocm-core")
endif()
endif()

if(CPACK_DEBIAN_PACKAGE_DEPENDS)
rocm_package_add_deb_dependencies(COMPONENT runtime
DEPENDS "${CPACK_DEBIAN_PACKAGE_DEPENDS}")
endif()
if(ROCM_DEP_ROCMCORE)
if(ENABLE_ASAN_PACKAGING)
rocm_package_add_deb_dependencies(COMPONENT runtime DEPENDS "rocm-core-asan")
else()
rocm_package_add_deb_dependencies(COMPONENT runtime DEPENDS "rocm-core")
endif()
endif()

rocm_package_add_dependencies(COMPONENT runtime
DEPENDS "${_tensilelite_runtime_package} >= ${tensilelite_minimum}")
endif()
endif()
unset(_tensilelite_devel_package)
unset(_tensilelite_runtime_package)
unset(tensilelite_minimum)

if(ROCM_LIBS_SUPERBUILD OR NOT HIPBLASLT_IS_SUBPROJECT)
if(TENSILELITE_ENABLE_HOST)
file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/tensilelite-cpack.cmake"
"set(_tensilelite_package_dir \"\${CPACK_PACKAGE_DIRECTORY}/_CPack_Packages/tensilelite/\${CPACK_GENERATOR}\")\n"
"file(REMOVE_RECURSE \"\${_tensilelite_package_dir}\")\n"
"execute_process(COMMAND \"${CMAKE_CPACK_COMMAND}\" --config \"${CMAKE_CURRENT_BINARY_DIR}/tensilelite/CPackConfig.cmake\" -G \"\${CPACK_GENERATOR}\" -B \"\${_tensilelite_package_dir}\" COMMAND_ERROR_IS_FATAL ANY)\n"
"file(GLOB _tensilelite_package_files LIST_DIRECTORIES false \"\${_tensilelite_package_dir}/*\")\n"
"file(COPY \${_tensilelite_package_files} DESTINATION \"\${CPACK_PACKAGE_DIRECTORY}\")\n"
)
list(APPEND CPACK_POST_BUILD_SCRIPTS "${CMAKE_CURRENT_BINARY_DIR}/tensilelite-cpack.cmake")
endif()
set(HIPBLASLT_CONFIG_DIR "\${CPACK_PACKAGING_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}" CACHE PATH "Path placed into ldconfig file")
rocm_create_package(
NAME hipblaslt
Expand Down
15 changes: 0 additions & 15 deletions projects/hipblaslt/clients/common/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -20,21 +20,6 @@
# headers (the source pulls in `<hipblaslt/hipblaslt-export.h>` and
# `<hipblaslt/hipblaslt-types.h>`).

if(NOT ROCM_LIBS_SUPERBUILD)
if(HIPBLASLT_ENABLE_THEROCK)
find_package(mxDataGenerator REQUIRED)
else()
# `${PROJECT_SOURCE_DIR}/../../shared/mxdatagenerator` resolves to the
# sibling `shared/mxdatagenerator` subtree of the project. The binary
# dir is anchored under the hipblaslt project's build tree to match
# the upstream subdirectory's existing layout assumptions.
add_subdirectory(
"${PROJECT_SOURCE_DIR}/../../shared/mxdatagenerator"
"${PROJECT_BINARY_DIR}/mxdatagenerator"
)
endif()
endif()

add_library(hipblaslt-mxdatagen STATIC
"${CMAKE_CURRENT_SOURCE_DIR}/src/mxDataGen.cpp"
)
Expand Down
4 changes: 4 additions & 0 deletions projects/hipblaslt/cmake/hipblaslt-package-config.cmake
Comment thread
davidd-amd marked this conversation as resolved.
Resolved
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,8 @@ find_dependency(origami CONFIG
"${CMAKE_CURRENT_LIST_DIR}/origami"
NO_DEFAULT_PATH)

find_dependency(tensilelite CONFIG
PATHS "${CMAKE_CURRENT_LIST_DIR}/../tensilelite"
NO_DEFAULT_PATH)

list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}")
8 changes: 4 additions & 4 deletions projects/hipblaslt/tasks.py
Original file line number Diff line number Diff line change
Expand Up @@ -796,13 +796,13 @@ def _normalized(p: str) -> str:
with c.cd(str(build_subdir)):
c.run("make package")
if distro == "ubuntu":
_elevate(c, f"dpkg -i {build_subdir}/hipblaslt[-_]*.deb")
_elevate(c, f"dpkg -i {build_subdir}/hipblaslt[-_]*.deb {build_subdir}/tensilelite-host[-_]*.deb {build_subdir}/origami-static[-_]*.deb")
elif distro in ("centos", "rhel", "almalinux"):
_elevate(c, f"rpm --nodeps -U {build_subdir}/hipblaslt-*.rpm")
_elevate(c, f"rpm --nodeps -U {build_subdir}/hipblaslt-*.rpm {build_subdir}/tensilelite-host-*.rpm {build_subdir}/origami-static-*.rpm")
elif distro == "fedora":
_elevate(c, f"dnf install {build_subdir}/hipblaslt-*.rpm")
_elevate(c, f"dnf install {build_subdir}/hipblaslt-*.rpm {build_subdir}/tensilelite-host-*.rpm {build_subdir}/origami-static-*.rpm")
elif distro in ("sles", "opensuse-leap"):
_elevate(c, f"zypper -n --no-gpg-checks install {build_subdir}/hipblaslt-*.rpm")
_elevate(c, f"zypper -n --no-gpg-checks install {build_subdir}/hipblaslt-*.rpm {build_subdir}/tensilelite-host-*.rpm {build_subdir}/origami-static-*.rpm")


# ---------------------------------------------------------------------------
Expand Down
Loading
Loading