[hipsolver] Refactor build system #2
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,88 @@ | ||
| { | ||
| "version": 6, | ||
| "cmakeMinimumRequired": { | ||
| "major": 3, | ||
| "minor": 21, | ||
| "patch": 0 | ||
| }, | ||
| "configurePresets": [ | ||
| { | ||
| "name": "base", | ||
| "hidden": true, | ||
| "binaryDir": "${sourceDir}/build/${presetName}", | ||
| "cacheVariables": { | ||
| "CMAKE_CXX_COMPILER": "/opt/rocm/bin/amdclang++", | ||
| "CMAKE_C_COMPILER": "/opt/rocm/bin/amdclang", | ||
| "CMAKE_PREFIX_PATH": "/opt/rocm", | ||
| "CMAKE_EXPORT_COMPILE_COMMANDS": "ON" | ||
| } | ||
| }, | ||
| { | ||
| "name": "dev-hip", | ||
| "displayName": "HIP Development", | ||
| "description": "HIP backend with tests, benchmarks, and samples enabled", | ||
| "inherits": "base", | ||
| "cacheVariables": { | ||
| "CMAKE_BUILD_TYPE": "Debug", | ||
| "HIPSOLVER_ENABLE_CUDA": "OFF", | ||
| "HIPSOLVER_BUILD_TESTING": "ON", | ||
| "HIPSOLVER_ENABLE_BENCHMARKS": "ON", | ||
| "HIPSOLVER_ENABLE_SAMPLES": "ON", | ||
| "HIPSOLVER_ENABLE_VERBOSE": "ON" | ||
| } | ||
| }, | ||
| { | ||
| "name": "dev-cuda", | ||
| "displayName": "CUDA Development", | ||
| "description": "CUDA backend with tests, benchmarks, and samples enabled", | ||
| "inherits": "base", | ||
| "cacheVariables": { | ||
| "CMAKE_BUILD_TYPE": "Debug", | ||
| "HIPSOLVER_ENABLE_CUDA": "ON", | ||
| "HIPSOLVER_BUILD_TESTING": "ON", | ||
| "HIPSOLVER_ENABLE_BENCHMARKS": "ON", | ||
| "HIPSOLVER_ENABLE_SAMPLES": "ON", | ||
| "HIPSOLVER_ENABLE_VERBOSE": "ON" | ||
| } | ||
| }, | ||
| { | ||
| "name": "release-hip", | ||
| "displayName": "HIP Release", | ||
| "description": "HIP backend release build with default options", | ||
| "inherits": "base", | ||
| "cacheVariables": { | ||
| "CMAKE_BUILD_TYPE": "Release", | ||
| "CMAKE_INSTALL_PREFIX": "/opt/rocm", | ||
| "HIPSOLVER_ENABLE_CUDA": "OFF" | ||
| } | ||
| }, | ||
| { | ||
| "name": "release-cuda", | ||
| "displayName": "CUDA Release", | ||
| "description": "CUDA backend release build with default options", | ||
| "inherits": "base", | ||
| "cacheVariables": { | ||
| "CMAKE_BUILD_TYPE": "Release", | ||
| "HIPSOLVER_ENABLE_CUDA": "ON" | ||
| } | ||
| } | ||
| ], | ||
| "buildPresets": [ | ||
| { | ||
| "name": "build-dev-hip", | ||
| "configurePreset": "dev-hip" | ||
| }, | ||
| { | ||
| "name": "build-dev-cuda", | ||
| "configurePreset": "dev-cuda" | ||
| }, | ||
| { | ||
| "name": "build-release-hip", | ||
| "configurePreset": "release-hip" | ||
| }, | ||
| { | ||
| "name": "build-release-cuda", | ||
| "configurePreset": "release-cuda" | ||
| } | ||
| ] | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,126 +1,96 @@ | ||
| # Copyright Advanced Micro Devices, Inc., or its affiliates. | ||
| # SPDX-License-Identifier: MIT | ||
|
|
||
| # --- Client dependencies --- | ||
|
|
||
| set(THREADS_PREFER_PTHREAD_FLAG ON) | ||
| find_package(Threads REQUIRED) | ||
|
|
||
| if(HIPSOLVER_FIND_PACKAGE_LAPACK_CONFIG) | ||
| find_package(LAPACK 3.7 REQUIRED CONFIG) | ||
| else() | ||
| find_package(LAPACK 3.7 REQUIRED) | ||
| endif() | ||
|
|
||
| if(NOT LAPACK_LIBRARIES) | ||
| set(LAPACK_LIBRARIES | ||
| ${LAPACK_blas_LIBRARIES} | ||
| ${LAPACK_lapack_LIBRARIES} | ||
| ) | ||
| endif() | ||
|
|
||
| # --- Fortran client bindings --- | ||
|
|
||
| if(HIPSOLVER_ENABLE_FORTRAN) | ||
| if(HIPSOLVER_BUILD_TESTING OR HIPSOLVER_ENABLE_BENCHMARKS) | ||
| add_library(hipsolver_fortran_client STATIC) | ||
| target_sources(hipsolver_fortran_client PRIVATE | ||
| "${CMAKE_CURRENT_SOURCE_DIR}/include/hipsolver_fortran.f90" | ||
| ) | ||
| target_link_libraries(hipsolver_fortran_client PUBLIC hipsolver_fortran) | ||
| target_include_directories(hipsolver_fortran_client PUBLIC | ||
| $<BUILD_INTERFACE:${CMAKE_BINARY_DIR}/include/hipsolver> | ||
| $<BUILD_INTERFACE:${CMAKE_BINARY_DIR}/include/hipsolver/internal> | ||
| ) | ||
| target_compile_definitions(hipsolver_fortran_client INTERFACE HAVE_HIPSOLVER_FORTRAN_CLIENT) | ||
| endif() | ||
| endif() | ||
|
|
||
| # --- Common client library --- | ||
|
|
||
| if(HIPSOLVER_BUILD_TESTING OR HIPSOLVER_ENABLE_BENCHMARKS) | ||
| add_library(hipsolver-clients-common OBJECT) | ||
|
|
||
| target_compile_features(hipsolver-clients-common PRIVATE cxx_std_17) | ||
|
|
||
| target_sources(hipsolver-clients-common PRIVATE | ||
| "${CMAKE_CURRENT_SOURCE_DIR}/common/clients_utility.cpp" | ||
| "${CMAKE_CURRENT_SOURCE_DIR}/common/hipsolver_datatype2string.cpp" | ||
| "${CMAKE_CURRENT_SOURCE_DIR}/common/lapack_host_reference.cpp" | ||
| "${CMAKE_CURRENT_SOURCE_DIR}/common/utility.cpp" | ||
| "${CMAKE_CURRENT_SOURCE_DIR}/rocsolvercommon/rocsolver_test.cpp" | ||
| ) | ||
|
|
||
| target_include_directories(hipsolver-clients-common | ||
| PUBLIC | ||
| $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}> | ||
| $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> | ||
| ) | ||
|
|
||
| target_link_libraries(hipsolver-clients-common | ||
| PUBLIC roc::hipsolver | ||
| PRIVATE Threads::Threads | ||
| ) | ||
|
Comment on lines
+60
to
+63
Owner
Author
There was a problem hiding this comment. Clarify linking strategy for roc::hipsolver on OBJECT library
Recommended action: Choose one of these approaches for consistency:
Option A is cleaner and reduces duplication noted in other comments. Generated by Claude Code |
||
|
|
||
| target_link_libraries(hipsolver-clients-common PUBLIC | ||
| $<$<PLATFORM_ID:Linux>:stdc++fs> | ||
| ) | ||
|
|
||
| # Ensure PIC for shared library builds | ||
| set_target_properties(hipsolver-clients-common PROPERTIES | ||
| POSITION_INDEPENDENT_CODE ON | ||
| ) | ||
|
|
||
| # Copy and point to sparse test data | ||
| file(COPY | ||
| "${CMAKE_CURRENT_SOURCE_DIR}/sparsedata/" | ||
| DESTINATION "${PROJECT_BINARY_DIR}/staging/sparsedata/" | ||
| ) | ||
| install(DIRECTORY | ||
| "${CMAKE_CURRENT_SOURCE_DIR}/sparsedata/" | ||
| DESTINATION "${CMAKE_INSTALL_DATADIR}/hipsolver/test" | ||
| COMPONENT tests | ||
| ) | ||
|
|
||
| if(HIPSOLVER_BUILD_TESTING) | ||
| add_subdirectory(gtest) | ||
| endif() | ||
|
|
||
| if(HIPSOLVER_ENABLE_BENCHMARKS) | ||
| add_subdirectory(benchmarks) | ||
| endif() | ||
| endif() | ||
|
|
||
| if(HIPSOLVER_ENABLE_SAMPLES) | ||
| add_subdirectory(samples) | ||
| endif() | ||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hard-coded compiler paths reduce preset portability
The
basepreset hard-codesCMAKE_CXX_COMPILERandCMAKE_C_COMPILERto/opt/rocm/bin/amdclang++and/opt/rocm/bin/amdclang. This makes the preset non-portable across environments where ROCm is installed at a different location or where developers want to use alternative compilers.Recommended action: Consider one of these approaches:
basepreset and letCMAKE_PREFIX_PATHguide compiler discoveryCMakeUserPresets.json(git-ignored) for developer-specific pathsThis will make the preset more flexible and portable across different development environments.
Generated by Claude Code