.buildInfo -> .hipInfo & .version -> .hipVersion
Change-Id: I8023f4349621fd81c58615737b7e897649e0f7ca
This commit is contained in:
+10
-10
@@ -143,7 +143,7 @@ add_to_config(_buildInfo COMPILE_HIP_ATP_MARKER)
|
||||
#############################
|
||||
# Build steps
|
||||
#############################
|
||||
# Rebuild cmake cache updates .buildInfo and .version
|
||||
# Rebuild cmake cache updates .hipInfo and .hipVersion
|
||||
add_custom_target(update_build_and_version_info ALL COMMAND make rebuild_cache)
|
||||
|
||||
# Build clang hipify if enabled
|
||||
@@ -198,12 +198,12 @@ if(HIP_PLATFORM STREQUAL "hcc")
|
||||
set_source_files_properties(${SOURCE_FILES} PROPERTIES OBJECT_DEPENDS ${PROJECT_BINARY_DIR}/hcc_version.txt)
|
||||
add_dependencies(hip_hcc check_hcc_version update_build_and_version_info)
|
||||
|
||||
# Generate .buildInfo
|
||||
file(WRITE "${PROJECT_BINARY_DIR}/.buildInfo" ${_buildInfo})
|
||||
# Generate .hipInfo
|
||||
file(WRITE "${PROJECT_BINARY_DIR}/.hipInfo" ${_buildInfo})
|
||||
endif()
|
||||
|
||||
# Generate .version
|
||||
file(WRITE "${PROJECT_BINARY_DIR}/.version" ${_versionInfo})
|
||||
# Generate .hipVersion
|
||||
file(WRITE "${PROJECT_BINARY_DIR}/.hipVersion" ${_versionInfo})
|
||||
|
||||
# Build doxygen documentation
|
||||
add_custom_target(doc COMMAND HIP_PATH=${CMAKE_CURRENT_SOURCE_DIR} doxygen ${CMAKE_CURRENT_SOURCE_DIR}/docs/doxygen-input/doxy.cfg
|
||||
@@ -219,14 +219,14 @@ if(HIP_PLATFORM STREQUAL "hcc")
|
||||
else()
|
||||
install(TARGETS hip_hcc DESTINATION lib)
|
||||
endif()
|
||||
|
||||
# Install .buildInfo
|
||||
install(FILES ${PROJECT_BINARY_DIR}/.buildInfo DESTINATION lib)
|
||||
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/hip_ir.ll DESTINATION lib)
|
||||
|
||||
# Install .hipInfo
|
||||
install(FILES ${PROJECT_BINARY_DIR}/.hipInfo DESTINATION lib)
|
||||
endif()
|
||||
|
||||
# Install .version
|
||||
install(FILES ${PROJECT_BINARY_DIR}/.version DESTINATION bin)
|
||||
# Install .hipVersion
|
||||
install(FILES ${PROJECT_BINARY_DIR}/.hipVersion DESTINATION bin)
|
||||
|
||||
# Install src, bin, include & cmake if necessary
|
||||
execute_process(COMMAND test ${CMAKE_INSTALL_PREFIX} -ef ${CMAKE_CURRENT_SOURCE_DIR}
|
||||
|
||||
+2
-2
@@ -52,9 +52,9 @@ $verbose = $ENV{'HIPCC_VERBOSE'} // 0;
|
||||
$HIP_PATH=$ENV{'HIP_PATH'} // dirname (dirname $0); # use parent directory of hipcc
|
||||
|
||||
#---
|
||||
# Read .buildInfo
|
||||
# Read .hipInfo
|
||||
my %hipConfig = ();
|
||||
parse_config_file("$HIP_PATH/lib/.buildInfo", \%hipConfig);
|
||||
parse_config_file("$HIP_PATH/lib/.hipInfo", \%hipConfig);
|
||||
|
||||
#---
|
||||
#HIP_PLATFORM controls whether to use NVCC or HCC for compilation:
|
||||
|
||||
+2
-2
@@ -86,9 +86,9 @@ if ($HIP_PLATFORM eq "nvcc") {
|
||||
};
|
||||
|
||||
#---
|
||||
# Read .version
|
||||
# Read .hipVersion
|
||||
my %hipVersion = ();
|
||||
parse_config_file("$HIP_PATH/bin/.version", \%hipVersion);
|
||||
parse_config_file("$HIP_PATH/bin/.hipVersion", \%hipVersion);
|
||||
$HIP_VERSION_MAJOR = $hipVersion{'HIP_VERSION_MAJOR'} // $HIP_BASE_VERSION_MAJOR;
|
||||
$HIP_VERSION_MINOR = $hipVersion{'HIP_VERSION_MINOR'} // $HIP_BASE_VERSION_MINOR;
|
||||
$HIP_VERSION_PATCH = $hipVersion{'HIP_VERSION_PATCH'} // "0";
|
||||
|
||||
@@ -6,7 +6,7 @@ if(@BUILD_HIPIFY_CLANG@)
|
||||
install(PROGRAMS @PROJECT_BINARY_DIR@/hipify-clang/hipify-clang DESTINATION bin)
|
||||
endif()
|
||||
install(DIRECTORY @hip_SOURCE_DIR@/include DESTINATION .)
|
||||
install(FILES @PROJECT_BINARY_DIR@/.version DESTINATION bin)
|
||||
install(FILES @PROJECT_BINARY_DIR@/.hipVersion DESTINATION bin)
|
||||
install(DIRECTORY @hip_SOURCE_DIR@/cmake DESTINATION .)
|
||||
|
||||
#############################
|
||||
|
||||
@@ -8,7 +8,7 @@ elseif(@HIP_LIB_TYPE@ EQUAL 1)
|
||||
else()
|
||||
install(FILES @PROJECT_BINARY_DIR@/libhip_hcc.so DESTINATION lib)
|
||||
endif()
|
||||
install(FILES @PROJECT_BINARY_DIR@/.buildInfo DESTINATION lib)
|
||||
install(FILES @PROJECT_BINARY_DIR@/.hipInfo DESTINATION lib)
|
||||
|
||||
#############################
|
||||
# Packaging steps
|
||||
|
||||
Reference in New Issue
Block a user