Skip to content

refactor(hipsparse): retire 4.8 feature flags #14144

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
amontoison merged 1 commit into from
Oct 23, 2026
Merged

refactor(hipsparse): retire 4.8 feature flags #14144

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
1 change: 0 additions & 1 deletion projects/hipsparse/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,6 @@ if(HIPSPARSE_ENABLE_CLIENT)
endif()

option(HIPSPARSE_BUILD_TESTING "Build test client." OFF)
option(HIPSPARSE_ENABLE_SPGEAM "Build hipSPARSE with the generic SpGEAM (sparse matrix sparse matrix addition) API." ON)
option(HIPSPARSE_ENABLE_COVERAGE "Build with code coverage enabled." OFF)
option(HIPSPARSE_ENABLE_ASAN "Build with address sanitizer enabled." OFF)
option(HIPSPARSE_BUILD_DOCS "Build documentation." OFF)
Expand Down
2 changes: 1 addition & 1 deletion projects/hipsparse/clients/include/hipsparse_test_unique_ptr.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -345,7 +345,7 @@ namespace hipsparse_test
// clang-format 19 (math-ci) rewrites "#if(" to "#if (", which clang-format
// 18 (the repo pre-commit hook) reverts; disable so both formatters agree.
// clang-format off
#if(defined(HIPSPARSE_WITH_SPGEAM) && (!defined(CUDART_VERSION) || CUDART_VERSION >= 13030))
#if(!defined(CUDART_VERSION) || CUDART_VERSION >= 13030)
// clang-format on
struct spgeam_struct
{
Expand Down
4 changes: 2 additions & 2 deletions projects/hipsparse/clients/include/testing_spgeam_csr.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ void testing_spgeam_csr_bad_arg(const Arguments& argus)
// clang-format 19 (math-ci) rewrites "#if(" to "#if (", which clang-format
// 18 (the repo pre-commit hook) reverts; disable so both formatters agree.
// clang-format off
#if(defined(HIPSPARSE_WITH_SPGEAM) && (!defined(CUDART_VERSION) || CUDART_VERSION >= 13030))
#if(!defined(CUDART_VERSION) || CUDART_VERSION >= 13030)
// clang-format on
int64_t m = 100;
int64_t n = 100;
Expand Down Expand Up @@ -293,7 +293,7 @@ template <typename T>
void testing_spgeam_csr(Arguments argus)
{
// clang-format off
#if(defined(HIPSPARSE_WITH_SPGEAM) && (!defined(CUDART_VERSION) || CUDART_VERSION >= 13030))
#if(!defined(CUDART_VERSION) || CUDART_VERSION >= 13030)
// clang-format on
int m = argus.M;
int n = argus.N;
Expand Down
8 changes: 0 additions & 8 deletions ...hipsparse/clients/samples/documentation_examples/generic/example_hipsparse_spgeam_cpp.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@
} \
}

#ifdef HIPSPARSE_WITH_SPGEAM
//! [doc example start]
int main()
{
Expand Down Expand Up @@ -254,10 +253,3 @@ int main()
return 0;
}
//! [doc example end]
#else
int main()
{
// hipSPARSE was built with the generic SpGEAM API disabled (HIPSPARSE_WITH_SPGEAM off).
return 0;
}
#endif
2 changes: 1 addition & 1 deletion projects/hipsparse/clients/tests/test_spgeam_csr.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
// clang-format 19 (math-ci) rewrites "#if(" to "#if (", which clang-format
// 18 (the repo pre-commit hook) reverts; disable so both formatters agree.
// clang-format off
#if(defined(HIPSPARSE_WITH_SPGEAM) && (!defined(CUDART_VERSION) || CUDART_VERSION >= 13030))
#if(!defined(CUDART_VERSION) || CUDART_VERSION >= 13030)
// clang-format on
TEST_ROUTINE(spgeam_csr,
generic,
Expand Down
3 changes: 1 addition & 2 deletions projects/hipsparse/docs/doxygen/Doxyfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2168,8 +2168,7 @@ INCLUDE_FILE_PATTERNS =
PREDEFINED = __attribute__(x)= \
__inline= \
HIPSPARSE_EXPORT= \
HIPSPARSE_DEPRECATED_MSG(x)= \
HIPSPARSE_WITH_SPGEAM
HIPSPARSE_DEPRECATED_MSG(x)=

# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then this
# tag can be used to specify a list of macro names that should be expanded. The
Expand Down
2 changes: 0 additions & 2 deletions projects/hipsparse/library/include/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@ include(GenerateExportHeader)
# Configure the version header (version numbers only) and the config header
# (build-time feature flags). Variables consumed by #cmakedefine in the .h.in
# templates must be set (or unset) prior to the configure_file() calls.
set(HIPSPARSE_WITH_SPGEAM ${HIPSPARSE_ENABLE_SPGEAM})

configure_file(
"${CMAKE_CURRENT_SOURCE_DIR}/hipsparse-version.h.in"
"${PROJECT_BINARY_DIR}/include/hipsparse/hipsparse-version.h"
Expand Down
3 changes: 0 additions & 3 deletions projects/hipsparse/library/include/hipsparse-config.h.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,4 @@

/* Build-time feature flags baked in at compile time. */

/* hipSPARSE 5.1 */
#cmakedefine HIPSPARSE_WITH_SPGEAM

#endif /* HIPSPARSE_CONFIG_H */
4 changes: 2 additions & 2 deletions projects/hipsparse/library/include/hipsparse-generic-types.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ typedef struct hipsparseSpGEMMDescr* hipsparseSpGEMMDescr_t;
// clang-format 19 (math-ci) rewrites "#if(" to "#if (", which clang-format
// 18 (the repo pre-commit hook) reverts; disable so both formatters agree.
// clang-format off
#if(defined(HIPSPARSE_WITH_SPGEAM) && (!defined(CUDART_VERSION) || CUDART_VERSION >= 13030))
#if(!defined(CUDART_VERSION) || CUDART_VERSION >= 13030)
// clang-format on
typedef struct hipsparseSpGEAMDescr* hipsparseSpGEAMDescr_t;
#endif
Expand Down Expand Up @@ -617,7 +617,7 @@ typedef enum
* library to perform sparse matrix sparse matrix addition.
*/
// clang-format off
#if(defined(HIPSPARSE_WITH_SPGEAM) && (!defined(CUDART_VERSION) || CUDART_VERSION >= 13030))
#if(!defined(CUDART_VERSION) || CUDART_VERSION >= 13030)
// clang-format on
typedef enum
{
Expand Down
11 changes: 5 additions & 6 deletions projects/hipsparse/library/include/internal/generic/hipsparse_spgeam.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
#ifndef HIPSPARSE_SPGEAM_H
#define HIPSPARSE_SPGEAM_H

// The generic SpGEAM API is gated behind the HIPSPARSE_WITH_SPGEAM build-time feature flag.
// Use the include-root-relative path so it resolves both in the hipSPARSE build and for
// downstream consumers that only add the include root (e.g. -I <prefix>/include) to their path.
#include "hipsparse/hipsparse-config.h"
Expand All @@ -43,7 +42,7 @@ extern "C" {
// clang-format 19 (math-ci) rewrites "#if(" to "#if (", which clang-format
// 18 (the repo pre-commit hook) reverts; disable so both formatters agree.
// clang-format off
#if(defined(HIPSPARSE_WITH_SPGEAM) && (!defined(CUDART_VERSION) || CUDART_VERSION >= 13030))
#if(!defined(CUDART_VERSION) || CUDART_VERSION >= 13030)
// clang-format on
HIPSPARSE_EXPORT
hipsparseStatus_t hipsparseSpGEAM_createDescr(hipsparseSpGEAMDescr_t* descr);
Expand All @@ -57,7 +56,7 @@ hipsparseStatus_t hipsparseSpGEAM_createDescr(hipsparseSpGEAMDescr_t* descr);
* resources used by the descriptor.
*/
// clang-format off
#if(defined(HIPSPARSE_WITH_SPGEAM) && (!defined(CUDART_VERSION) || CUDART_VERSION >= 13030))
#if(!defined(CUDART_VERSION) || CUDART_VERSION >= 13030)
// clang-format on
HIPSPARSE_EXPORT
hipsparseStatus_t hipsparseSpGEAM_destroyDescr(hipsparseSpGEAMDescr_t descr);
Expand Down Expand Up @@ -108,7 +107,7 @@ hipsparseStatus_t hipsparseSpGEAM_destroyDescr(hipsparseSpGEAMDescr_t descr);
* \p opB != \ref HIPSPARSE_OPERATION_NON_TRANSPOSE.
*/
// clang-format off
#if(defined(HIPSPARSE_WITH_SPGEAM) && (!defined(CUDART_VERSION) || CUDART_VERSION >= 13030))
#if(!defined(CUDART_VERSION) || CUDART_VERSION >= 13030)
// clang-format on
HIPSPARSE_EXPORT
hipsparseStatus_t hipsparseSpGEAM_bufferSize(hipsparseHandle_t handle,
Expand Down Expand Up @@ -172,7 +171,7 @@ hipsparseStatus_t hipsparseSpGEAM_bufferSize(hipsparseHandle_t handle,
* \p opB != \ref HIPSPARSE_OPERATION_NON_TRANSPOSE.
*/
// clang-format off
#if(defined(HIPSPARSE_WITH_SPGEAM) && (!defined(CUDART_VERSION) || CUDART_VERSION >= 13030))
#if(!defined(CUDART_VERSION) || CUDART_VERSION >= 13030)
// clang-format on
HIPSPARSE_EXPORT
hipsparseStatus_t hipsparseSpGEAM_nnz(hipsparseHandle_t handle,
Expand Down Expand Up @@ -253,7 +252,7 @@ hipsparseStatus_t hipsparseSpGEAM_nnz(hipsparseHandle_t handle,
* \p opB != \ref HIPSPARSE_OPERATION_NON_TRANSPOSE.
*/
// clang-format off
#if(defined(HIPSPARSE_WITH_SPGEAM) && (!defined(CUDART_VERSION) || CUDART_VERSION >= 13030))
#if(!defined(CUDART_VERSION) || CUDART_VERSION >= 13030)
// clang-format on
HIPSPARSE_EXPORT
hipsparseStatus_t hipsparseSpGEAM(hipsparseHandle_t handle,
Expand Down
4 changes: 0 additions & 4 deletions projects/hipsparse/library/src/amd_detail/generic/hipsparse_spgeam.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,6 @@

#include <vector>

#ifdef HIPSPARSE_WITH_SPGEAM

// hipSPARSE SpGEAM descriptor. Wraps the staged rocSPARSE SpGEAM descriptor and
// caches the analysis buffer size so that it can be shared by the nnz and compute
// steps (matching the single-buffer cuSPARSE SpGEAM interface).
Expand Down Expand Up @@ -622,5 +620,3 @@ hipsparseStatus_t hipsparseSpGEAM(hipsparseHandle_t handle,

return HIPSPARSE_STATUS_SUCCESS;
}

#endif /* HIPSPARSE_WITH_SPGEAM */
2 changes: 1 addition & 1 deletion projects/hipsparse/library/src/nvidia_detail/generic/hipsparse_spgeam.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
// clang-format 19 (math-ci) rewrites "#if(" to "#if (", which clang-format
// 18 (the repo pre-commit hook) reverts; disable so both formatters agree.
// clang-format off
#if(defined(HIPSPARSE_WITH_SPGEAM) && CUDART_VERSION >= 13030)
#if(CUDART_VERSION >= 13030)
// clang-format on
namespace
{
Expand Down
2 changes: 1 addition & 1 deletion projects/hipsparse/library/src/nvidia_detail/utility.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1051,7 +1051,7 @@ namespace hipsparse
// clang-format 19 (math-ci) rewrites "#if(" to "#if (", which clang-format
// 18 (the repo pre-commit hook) reverts; disable so both formatters agree.
// clang-format off
#if(defined(HIPSPARSE_WITH_SPGEAM) && CUDART_VERSION >= 13030)
#if(CUDART_VERSION >= 13030)
// clang-format on
inline cusparseSpGEAMAlg_t hipSpGEAMAlgToCudaSpGEAMAlg(hipsparseSpGEAMAlg_t alg)
{
Expand Down
Loading