From b8d453daaf9b262c0784026a5bc653ef93563af5 Mon Sep 17 00:00:00 2001
From: Troy Alderson <58866654+tfalders@users.noreply.github.com>
Date: Tue, 3 Oct 2023 20:38:35 -0600
Subject: [PATCH] bump versions (#618)

Revert "Revert "bump versions and prepare changelog for next dev cycle (#606)" (#614)"

This reverts commit f67fca48d86a9959a16bcd4d295057faf53bcb58.
---
 CMakeLists.txt            |  4 ++--
 bump_rocsolver_version.sh | 13 +++++--------
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0fa6d32b7..d125f76be 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -87,7 +87,7 @@ get_os_id(OS_ID)
 message(STATUS "OS detected is ${OS_ID}")
 
 # Versioning via rocm-cmake
-set(VERSION_STRING "3.24.0")
+set(VERSION_STRING "3.25.0")
 rocm_setup_version(VERSION ${VERSION_STRING})
 
 # Workaround until llvm and hip CMake modules fix symlink logic in their config files
@@ -188,7 +188,7 @@ find_package(hip REQUIRED CONFIG PATHS ${ROCM_PATH} /opt/rocm)
 find_package(rocblas REQUIRED CONFIG PATHS ${ROCM_PATH})
 get_imported_target_location(location roc::rocblas)
 message(STATUS "Found rocBLAS: ${location}")
-set(rocsolver_pkgdeps "rocblas >= 4.0" "rocblas < 4.1")
+set(rocsolver_pkgdeps "rocblas >= 4.1")
 
 if(BUILD_WITH_SPARSE)
   find_package(rocsparse REQUIRED CONFIG PATHS ${ROCM_PATH})
diff --git a/bump_rocsolver_version.sh b/bump_rocsolver_version.sh
index a822f6de2..aa01a4b33 100755
--- a/bump_rocsolver_version.sh
+++ b/bump_rocsolver_version.sh
@@ -4,15 +4,12 @@
 # Edit script to bump versions for new development cycle/release.
 
 # for rocSOLVER version string
-OLD_ROCSOLVER_VERSION="3.24.0"
-NEW_ROCSOLVER_VERSION="3.25.0"
+OLD_ROCSOLVER_VERSION="3.25.0"
+NEW_ROCSOLVER_VERSION="3.26.0"
 sed -i "s/${OLD_ROCSOLVER_VERSION}/${NEW_ROCSOLVER_VERSION}/g" CMakeLists.txt
 
 # for rocBLAS package requirements
-OLD_ROCBLAS_VERSION_DOWN="4.0"
-NEW_ROCBLAS_VERSION_DOWN="4.1"
-OLD_ROCBLAS_VERSION_UP="4.1"
-NEW_ROCBLAS_VERSION_UP="4.2"
-sed -i "s/${OLD_ROCBLAS_VERSION_UP}/${NEW_ROCBLAS_VERSION_UP}/g" CMakeLists.txt
-sed -i "s/${OLD_ROCBLAS_VERSION_DOWN}/${NEW_ROCBLAS_VERSION_DOWN}/g" CMakeLists.txt
+OLD_ROCBLAS_VERSION="4.1"
+NEW_ROCBLAS_VERSION="4.2"
+sed -i "s/${OLD_ROCBLAS_VERSION}/${NEW_ROCBLAS_VERSION}/g" CMakeLists.txt