Skip to content

Commit e90bcf3

Browse files
author
David Salinas
committed
HIPCC Perl Clean up
This change: - removes high level perl scripts "hipcc" and "hipconfig". - renames the C++ executables to just "hipcc" and "hipconfig" - makes Perl a RECOMMENDS/SUGGESTS dependency in RPM/DEB packages - clean up Windows BAT files SWDEV-467478 - HIPCC Clean up Perl SWDEV-440307 - Rename hipcc.bin.exe to hipcc.exe on Windows Change-Id: I1c566fcb543d91d9923cad04280ecf279af36951
1 parent f11f49a commit e90bcf3

File tree

5 files changed

+16
-150
lines changed

5 files changed

+16
-150
lines changed

amd/hipcc/CMakeLists.txt

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,12 @@ set(ADDITIONAL_SHARED_LIBRARIES_TO_LINK
2222
libstdc++fs.so)
2323

2424
set(HIPCC_BIN
25-
hipcc.bin)
25+
hipcc)
2626
set(HIPCC_SOURCES
2727
src/hipBin.cpp)
2828

2929
set(HIPCONFIG_BIN
30-
hipconfig.bin)
30+
hipconfig)
3131
set(HIPCONFIG_SOURCES
3232
src/hipBin.cpp)
3333

@@ -64,7 +64,8 @@ set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE.txt")
6464
set(CPACK_DEBIAN_ENABLE_COMPONENT_DEPENDS ON)
6565
set(CPACK_DEB_COMPONENT_INSTALL ON)
6666
set(CPACK_DEBIAN_FILE_NAME "DEB-DEFAULT")
67-
set(CPACK_DEBIAN_PACKAGE_DEPENDS "perl (>= 5.0), hip-dev, rocm-core")
67+
set(CPACK_DEBIAN_PACKAGE_DEPENDS "hip-dev, rocm-core")
68+
set(CPACK_DEBIAN_PACKAGE_RECOMMENDS "perl (>= 5.0)")
6869
set(CPACK_DEBIAN_PACKAGE_HOMEPAGE "https://github.com/ROCm-Developer-Tools/HIPCC")
6970
if(DEFINED ENV{CPACK_DEBIAN_PACKAGE_RELEASE})
7071
set(CPACK_DEBIAN_PACKAGE_RELEASE $ENV{CPACK_DEBIAN_PACKAGE_RELEASE})
@@ -74,17 +75,20 @@ endif()
7475

7576
# AMD specific Debian packaging varibles.
7677
set(CPACK_DEBIAN_AMD_PACKAGE_NAME "hipcc")
77-
set(CPACK_DEBIAN_AMD_PACKAGE_DEPENDS "perl (>= 5.0), hip-dev, rocm-core, rocm-llvm")
78+
set(CPACK_DEBIAN_AMD_PACKAGE_DEPENDS "hip-dev, rocm-core, rocm-llvm")
79+
set(CPACK_DEBIAN_AMD_PACKAGE_RECOMMENDS "perl (>= 5.0)")
7880

7981
# NVIDIA specific Debian packaging variables.
8082
set(CPACK_DEBIAN_NVIDIA_PACKAGE_NAME "hipcc-nvidia")
81-
set(CPACK_DEBIAN_NVIDIA_PACKAGE_DEPENDS "perl (>= 5.0), hip-dev, rocm-core") # for NVIDIA we don't need to add rocm-llvm as a dependency
83+
set(CPACK_DEBIAN_NVIDIA_PACKAGE_DEPENDS "hip-dev, rocm-core") # for NVIDIA we don't need to add rocm-llvm as a dependency
84+
set(CPACK_DEBIAN_NVIDIA_PACKAGE_RECOMMENDS "perl (>= 5.0)")
8285

8386

8487
# RPM specific packaging variables.
8588
set(CPACK_RPM_FILE_NAME "RPM-DEFAULT")
8689
set(CPACK_RPM_PACKAGE_LICENSE "MIT")
87-
set(CPACK_RPM_PACKAGE_REQUIRES "perl >= 5.0, hip-devel, rocm-core")
90+
set(CPACK_RPM_PACKAGE_REQUIRES "hip-devel, rocm-core")
91+
set(CPACK_RPM_PACKAGE_SUGGESTS "perl >= 5.0")
8892
set(CPACK_RPM_PACKAGE_AUTOREQPROV 0)
8993
if(DEFINED ENV{CPACK_RPM_PACKAGE_RELEASE})
9094
set(CPACK_RPM_PACKAGE_RELEASE $ENV{CPACK_RPM_PACKAGE_RELEASE})
@@ -97,11 +101,13 @@ endif()
97101

98102
# AMD specific RPM packaging varibables.
99103
set(CPACK_RPM_AMD_PACKAGE_NAME "hipcc")
100-
set(CPACK_RPM_AMD_PACKAGE_REQUIRES "perl >= 5.0, hip-devel, rocm-core, rocm-llvm")
104+
set(CPACK_RPM_AMD_PACKAGE_REQUIRES "hip-devel, rocm-core, rocm-llvm")
105+
set(CPACK_RPM_AMD_PACKAGE_SUGGESTS "perl >= 5.0")
101106

102107
# NVIDIA specific RPM packaging variables.
103108
set(CPACK_RPM_NVIDIA_PACKAGE_NAME "hipcc-nvidia")
104-
set(CPACK_RPM_NVIDIA_PACKAGE_REQUIRES "perl >= 5.0, hip-devel, rocm-core") # for NVIDIA we don't need to add rocm-llvm as a dependency
109+
set(CPACK_RPM_NVIDIA_PACKAGE_REQUIRES "hip-devel, rocm-core") # for NVIDIA we don't need to add rocm-llvm as a dependency
110+
set(CPACK_RPM_NVIDIA_PACKAGE_SUGGESTS "perl >= 5.0")
105111

106112
# ROCM versioning.
107113
set(ROCM_VERSION_FOR_PACKAGE "")

amd/hipcc/bin/hipcc

Lines changed: 0 additions & 74 deletions
This file was deleted.

amd/hipcc/bin/hipcc.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
@set HIPCC="%~dp0hipcc"
2-
@perl %HIPCC% %*
2+
%HIPCC% %*

amd/hipcc/bin/hipconfig

Lines changed: 0 additions & 66 deletions
This file was deleted.

amd/hipcc/bin/hipconfig.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
@set HIPCONFIG="%~dp0hipconfig"
2-
@perl %HIPCONFIG% %*
2+
%HIPCONFIG% %*

0 commit comments

Comments
 (0)