From 6c385bf0990e4141f48fd4ce1428cfac642f820e Mon Sep 17 00:00:00 2001 From: Troy Alderson <58866654+tfalders@users.noreply.github.com> Date: Mon, 25 Sep 2023 13:44:38 -0600 Subject: [PATCH 1/2] Revert "bump versions and prepare changelog for new dev cycle (#191)" This reverts commit 96e4dd220f91b50699eaadf78c6612370fc2d92b. --- CHANGELOG.md | 11 ----------- CMakeLists.txt | 4 ++-- bump_hipsolver_version.sh | 12 ++++++------ 3 files changed, 8 insertions(+), 19 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index bd81daab..796bf3f8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,17 +3,6 @@ Full documentation for hipSOLVER is available at [hipsolver.readthedocs.io](https://hipsolver.readthedocs.io/en/latest/). -## (Unreleased) hipSOLVER -### Added -### Optimized -### Changed -### Deprecated -### Removed -### Fixed -### Known Issues -### Security - - ## hipSOLVER 2.0.0 for ROCm 6.0.0 ### Added - Added hipBLAS as an optional dependency to hipsolver-test. Use the `BUILD_HIPBLAS_TESTS` CMake option to test compatibility between hipSOLVER and hipBLAS. diff --git a/CMakeLists.txt b/CMakeLists.txt index 690f5af4..c1e9f021 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -89,7 +89,7 @@ include( ROCMInstallSymlinks ) include( ROCMClients ) include( ROCMHeaderWrapper ) -set ( VERSION_STRING "2.1.0" ) +set ( VERSION_STRING "2.0.0" ) rocm_setup_version( VERSION ${VERSION_STRING} ) if( NOT DEFINED ENV{HIP_PATH}) @@ -214,7 +214,7 @@ endif( ) # Package specific CPACK vars if( NOT USE_CUDA ) - rocm_package_add_dependencies(DEPENDS "rocblas >= 4.1.0" "rocsolver >= 3.25.0") + rocm_package_add_dependencies(DEPENDS "rocblas >= 4.0.0" "rocsolver >= 3.24.0") endif( ) set( CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE.md" ) diff --git a/bump_hipsolver_version.sh b/bump_hipsolver_version.sh index e1fe2d46..3d5ac5cb 100755 --- a/bump_hipsolver_version.sh +++ b/bump_hipsolver_version.sh @@ -4,14 +4,14 @@ # Edit script to bump versions for new development cycle/release. # for hipSOLVER version string -OLD_HIPSOLVER_VERSION="2.1.0" -NEW_HIPSOLVER_VERSION="2.2.0" +OLD_HIPSOLVER_VERSION="2.0.0" +NEW_HIPSOLVER_VERSION="2.1.0" sed -i "s/${OLD_HIPSOLVER_VERSION}/${NEW_HIPSOLVER_VERSION}/g" CMakeLists.txt # for rocBLAS/rocSOLVER package requirements -OLD_MINIMUM_ROCBLAS_VERSION="4.1.0" -NEW_MINIMUM_ROCBLAS_VERSION="4.2.0" -OLD_MINIMUM_ROCSOLVER_VERSION="3.25.0" -NEW_MINIMUM_ROCSOLVER_VERSION="3.26.0" +OLD_MINIMUM_ROCBLAS_VERSION="4.0.0" +NEW_MINIMUM_ROCBLAS_VERSION="4.1.0" +OLD_MINIMUM_ROCSOLVER_VERSION="3.24.0" +NEW_MINIMUM_ROCSOLVER_VERSION="3.25.0" sed -i "s/${OLD_MINIMUM_ROCBLAS_VERSION}/${NEW_MINIMUM_ROCBLAS_VERSION}/g" CMakeLists.txt sed -i "s/${OLD_MINIMUM_ROCSOLVER_VERSION}/${NEW_MINIMUM_ROCSOLVER_VERSION}/g" CMakeLists.txt From d5efecd47f6a0a2200e29e33f1052d580b429232 Mon Sep 17 00:00:00 2001 From: Troy Alderson <58866654+tfalders@users.noreply.github.com> Date: Mon, 25 Sep 2023 13:45:06 -0600 Subject: [PATCH 2/2] Restored changelog --- CHANGELOG.md | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 796bf3f8..bd81daab 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,17 @@ Full documentation for hipSOLVER is available at [hipsolver.readthedocs.io](https://hipsolver.readthedocs.io/en/latest/). +## (Unreleased) hipSOLVER +### Added +### Optimized +### Changed +### Deprecated +### Removed +### Fixed +### Known Issues +### Security + + ## hipSOLVER 2.0.0 for ROCm 6.0.0 ### Added - Added hipBLAS as an optional dependency to hipsolver-test. Use the `BUILD_HIPBLAS_TESTS` CMake option to test compatibility between hipSOLVER and hipBLAS.