Skip to content

Fix python package build #12

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
sogartar merged 1 commit into from
May 13, 2024
Merged

Fix python package build #12

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
3 changes: 3 additions & 0 deletions build_tools/apply_patches.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,5 +42,8 @@ apply_patch ROCR-Runtime ROCR-Runtime-intree-build.patch
stash_changes HIPIFY
apply_patch HIPIFY hipify-install-headers-in-include-hipify.patch

stash_changes rocm_smi_lib
apply_patch rocm_smi_lib rocm_smi_lib-use-cmake-generator-expr-for-target-out-path-when-stripping.patch

stash_changes rccl
apply_patch rccl rccl-overwrite-generated-files.patch
26 changes: 26 additions & 0 deletions patches/rocm_smi_lib-use-cmake-generator-expr-for-target-out-path-when-stripping.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
diff --git a/oam/CMakeLists.txt b/oam/CMakeLists.txt
index 6927d24..3718a64 100644
--- a/oam/CMakeLists.txt
+++ b/oam/CMakeLists.txt
@@ -87,7 +87,7 @@ if ("${CMAKE_BUILD_TYPE}" STREQUAL Release)
if(${BUILD_SHARED_LIBS}) #striping only for .so
add_custom_command(
TARGET ${OAM_TARGET}
- POST_BUILD COMMAND ${CMAKE_STRIP} lib${OAM_TARGET}.so)
+ POST_BUILD COMMAND ${CMAKE_STRIP} "$<TARGET_FILE:${OAM_TARGET}>")
endif()
endif ()

diff --git a/rocm_smi/CMakeLists.txt b/rocm_smi/CMakeLists.txt
index 645e598..0b67549 100755
--- a/rocm_smi/CMakeLists.txt
+++ b/rocm_smi/CMakeLists.txt
@@ -109,7 +109,7 @@ if ("${CMAKE_BUILD_TYPE}" STREQUAL Release)
if(${BUILD_SHARED_LIBS}) #stripping only for .so
add_custom_command(
TARGET ${ROCM_SMI_TARGET}
- POST_BUILD COMMAND ${CMAKE_STRIP} lib${ROCM_SMI_TARGET}.so.${SO_VERSION_STRING})
+ POST_BUILD COMMAND ${CMAKE_STRIP} "$<TARGET_FILE:${ROCM_SMI_TARGET}>")
endif()
endif ()

9 changes: 4 additions & 5 deletions python_projects/runtime/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,12 +34,12 @@ def finalize_options(self):
# Note that setuptools always builds into a "build" directory that
# is a sibling of setup.py, so we just colonize a sub-directory of that
# by default.
CMAKE_BUILD_DIR = os.getenv(
CMAKE_BUILD_DIR = Path(os.getenv(
"THEROCK_CMAKE_BUILD_DIR", SETUPPY_DIR / "build" / "cmake-build"
)
CMAKE_INSTALL_DIR = os.getenv(
))
CMAKE_INSTALL_DIR = Path(os.getenv(
"THEROCK_CMAKE_INSTALL_DIR", SETUPPY_DIR / "build" / "dist-install"
)
))

with open(SETUPPY_DIR / "README.md", "rt") as f:
README = f.read()
Expand Down Expand Up @@ -100,7 +100,6 @@ def cmake_install(self):
CMAKE_INSTALL_DIR.mkdir(parents=True, exist_ok=True)
(CMAKE_INSTALL_DIR / "__init__.py").touch()
CMAKE_BUILD_DIR.mkdir(parents=True, exist_ok=True)

# In order to reliably package the built files, it is best to run the build
# prior to setup. All built artifacts go into the _therock top level
# package so that source and built trees are distinct.
Expand Down