Skip to content

Remove BUILD_HIPFILE/ROCFILE #92

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
derobins merged 1 commit into from
Nov 25, 2025
Merged

Remove BUILD_HIPFILE/ROCFILE #92

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 0 additions & 2 deletions .github/workflows/build-ais.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -325,8 +325,6 @@ jobs:
cmake \
-DCMAKE_CXX_COMPILER=${{ matrix.supported_compilers }} \
-DCMAKE_CXX_FLAGS="-Werror" \
-DBUILD_ROCFILE=OFF \
-DBUILD_HIPFILE=ON \
-DCMAKE_HIP_PLATFORM=nvidia \
-DBUILD_AIS_DOCS=ON \
..
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/hipfile-nvidia.yml.disabled
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,6 @@ jobs:
cmake \
-DCMAKE_CXX_COMPILER=g++ \
-DCMAKE_CXX_FLAGS="-Werror" \
-DBUILD_ROCFILE=OFF \
-DBUILD_HIPFILE=ON \
-DCMAKE_HIP_PLATFORM=nvidia \
-DBUILD_AIS_DOCS=ON \
-DAIS_CAPABLE_DIR=\"${ROCTMPDIR}\" \
Expand Down
26 changes: 11 additions & 15 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,21 +156,19 @@ include(AISIWYU)
#-------------------
include(AISSanitizers)

#----------------------------------
# rocfile (default OFF for NVIDIA)
#----------------------------------
#-------------------
# Platform defaults
#-------------------
if(CMAKE_HIP_PLATFORM STREQUAL "nvidia")
set(BUILD_ROCFILE_DEFAULT OFF)
set(BUILD_ROCFILE OFF)
else()
set(BUILD_ROCFILE_DEFAULT ON)
set(BUILD_ROCFILE ON)
endif()
option(BUILD_ROCFILE "Build rocfile library (AMD only)" ${BUILD_ROCFILE_DEFAULT})

#---------
# hipfile
#---------
option(BUILD_HIPFILE "Build hipfile library" ON)
cmake_dependent_option(BUILD_AISCP "Build aiscp example program" ON "BUILD_HIPFILE" OFF)
#-----------------------
# aiscp example program
#-----------------------
option(BUILD_AISCP "Build aiscp example program" ON)
Copy link
Copy Markdown
Collaborator Author

@derobins derobins Nov 25, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

When we have more examples, we should just change this to BUILD_EXAMPLES.


#------
# docs
Expand Down Expand Up @@ -221,12 +219,10 @@ endif()
#-----------------------------------------------------------------------------
# Subdirectories to configure/build
#-----------------------------------------------------------------------------
if(BUILD_ROCFILE AND CMAKE_HIP_PLATFORM STREQUAL "amd")
if(BUILD_ROCFILE)
add_subdirectory(rocfile)
endif()
if(BUILD_HIPFILE)
add_subdirectory(hipfile)
endif()
add_subdirectory(hipfile)
if(BUILD_AIS_DOCS)
add_subdirectory(docs)
endif()
Expand Down
4 changes: 1 addition & 3 deletions INSTALL.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,8 @@ Options
|AIS\_USE\_CLANG\_TIDY|OFF|Run the `clang-tidy` tool|
|AIS\_USE\_IWYU|OFF|Run the `include-what-you-use` tool|
|BUILD\_AIS\_DOCS|OFF|Build API documentation (requires Doxygen)|
|BUILD\_AISCP|ON|Build `aiscp` example program (OFF if no hipFile)|
|BUILD\_AISCP|ON|Build `aiscp` example program|
|BUILD\_CODE\_COVERAGE|OFF|Generate code coverage information when tests are run|
|BUILD\_HIPFILE|ON|Build the hipFile library|
|BUILD\_ROCFILE|ON|Build the rocFile library (AMD only, OFF for NVIDIA)|
|BUILD\_TESTING|ON|Build the test suite|

Sanitizer options
Expand Down
98 changes: 45 additions & 53 deletions cmake/AISInstall.cmake
View file
Open in desktop
Copy link
Copy Markdown
Collaborator Author

@derobins derobins Nov 25, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks like big changes, but it's the diff algorithm being confused by removing the if() and shifting everything over to the left + a few minor tweaks.

Original file line number Diff line number Diff line change
Expand Up @@ -8,62 +8,54 @@
include(ROCMInstallTargets)
include(ROCMCreatePackage)

if(BUILD_ROCFILE OR BUILD_HIPFILE)

# Install the package
if(BUILD_ROCFILE)
rocm_install(TARGETS rocfile_static)
rocm_install(TARGETS rocfile_shared)
endif()
if(BUILD_HIPFILE)
rocm_install(TARGETS hipfile_static)
rocm_install(TARGETS hipfile_shared)
endif()

# Install the headers
if(BUILD_ROCFILE)
rocm_install(
DIRECTORY ${CMAKE_SOURCE_DIR}/rocfile/include/
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
)
endif()
if(BUILD_HIPFILE)
rocm_install(
DIRECTORY ${CMAKE_SOURCE_DIR}/hipfile/include/
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
)
endif()
# Install the package
if(BUILD_ROCFILE)
rocm_install(TARGETS rocfile_static)
rocm_install(TARGETS rocfile_shared)
endif()
rocm_install(TARGETS hipfile_static)
rocm_install(TARGETS hipfile_shared)

# Always install the hipfile-types.h file
# Install the headers
if(BUILD_ROCFILE)
rocm_install(
FILES ${CMAKE_SOURCE_DIR}/shared/hipfile-types.h
DIRECTORY ${CMAKE_SOURCE_DIR}/rocfile/include/
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
)

# rocm_package_add_dependencies() line should go here
# when we have dependencies

# Export the targets
if(BUILD_ROCFILE)
set(target_list ${target_list} roc::rocfile_shared roc::rocfile_static)
endif()
if(BUILD_HIPFILE)
set(target_list ${target_list} roc::hipfile_shared roc::hipfile_static)
endif()

rocm_export_targets(
TARGETS ${target_list}
NAMESPACE roc::
)

# CPack license setup
set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/LICENSE.md")
set(CPACK_RPM_PACKAGE_LICENSE "MIT")

# Create the package
rocm_create_package(
NAME "hipFile"
DESCRIPTION "The hipFile (and rocFile w/ AMD) libraries"
MAINTAINER "ais-eap <ais-eap@amd.com>"
)
endif()
rocm_install(
DIRECTORY ${CMAKE_SOURCE_DIR}/hipfile/include/
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
)

# Always install the hipfile-types.h file
rocm_install(
FILES ${CMAKE_SOURCE_DIR}/shared/hipfile-types.h
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
)

# rocm_package_add_dependencies() line should go here
# when we have dependencies

# Export the targets
if(BUILD_ROCFILE)
set(target_list ${target_list} roc::rocfile_shared roc::rocfile_static)
endif()
set(target_list ${target_list} roc::hipfile_shared roc::hipfile_static)

rocm_export_targets(
TARGETS ${target_list}
NAMESPACE roc::
)

# CPack license setup
set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/LICENSE.md")
set(CPACK_RPM_PACKAGE_LICENSE "MIT")

# Create the package
rocm_create_package(
NAME "hipFile"
DESCRIPTION "The hipFile library"
MAINTAINER "ais-eap <ais-eap@amd.com>"
)
10 changes: 1 addition & 9 deletions docs/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,15 +51,7 @@ function(ais_add_docs_target AIS_DOC_PRETTY_NAME)
add_dependencies(doc ${AIS_DOC_TARGET_NAME})
endfunction()

if(BUILD_HIPFILE)
ais_add_docs_target("hipFile")
endif()
ais_add_docs_target("hipFile")
if(BUILD_ROCFILE)
ais_add_docs_target("rocFile")
endif()
Comment thread
derobins marked this conversation as resolved.
# Allow building the docs when no library is selected
# This builds ALL the API docs
if(NOT BUILD_ROCFILE AND NOT BUILD_HIPFILE)
ais_add_docs_target("hipFile")
ais_add_docs_target("rocFile")
endif()
Loading