Skip to content

Commit

Permalink
Merge pull request #360 from amcamd/develop
Browse files Browse the repository at this point in the history
merge master into develop for ROCm 3.10 feature complete
  • Loading branch information
amcamd authored Oct 8, 2020
2 parents e28c19f + 3e19847 commit fbe56c5
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 15 deletions.
4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ get_os_id(OS_ID)
message (STATUS "OS detected is ${OS_ID}")

# Versioning via rocm-cmake
set ( VERSION_STRING "2.31.0" )
set ( VERSION_STRING "2.33.0" )
rocm_setup_version( VERSION ${VERSION_STRING} )

# Append our library helper cmake path and the cmake path for hip (for convenience)
Expand Down Expand Up @@ -225,7 +225,7 @@ if( BUILD_WITH_TENSILE )
if (TENSILE_VERSION)
find_package(Tensile ${TENSILE_VERSION} EXACT REQUIRED HIP LLVM OpenMP PATHS "${INSTALLED_TENSILE_PATH}")
else()
find_package(Tensile 4.23.0 EXACT REQUIRED HIP LLVM OpenMP PATHS "${INSTALLED_TENSILE_PATH}")
find_package(Tensile 4.24.0 EXACT REQUIRED HIP LLVM OpenMP PATHS "${INSTALLED_TENSILE_PATH}")
endif()
endif()

Expand Down
12 changes: 6 additions & 6 deletions bump_develop_version.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@
# - run this script in master branch
# - after running this script merge master into develop

OLD_ROCBLAS_VERSION="2.30.0"
NEW_ROCBLAS_VERSION="2.31.0"
OLD_ROCBLAS_VERSION="2.32.0"
NEW_ROCBLAS_VERSION="2.33.0"

OLD_TENSILE_VERSION="Tensile 4.23.0"
NEW_TENSILE_VERSION="Tensile 4.23.0"
OLD_TENSILE_VERSION="Tensile 4.24.0"
NEW_TENSILE_VERSION="Tensile 4.24.0"

OLD_TENSILE_HASH="b68edc65aaeed08c71b2b8622f69f83498b57d7a"
NEW_TENSILE_HASH="f8a03abb87ab897d3e9a005c2b88c5a50d3c5718"
OLD_TENSILE_HASH="3ddca8e109c4633613f5c8289fb399a19d058826"
NEW_TENSILE_HASH="31e10427e1612ea7d1b015980aa7e6ef7f1bc8ad"

sed -i "s/${OLD_ROCBLAS_VERSION}/${NEW_ROCBLAS_VERSION}/g" CMakeLists.txt
sed -i "s/${OLD_TENSILE_VERSION}/${NEW_TENSILE_VERSION}/g" CMakeLists.txt
Expand Down
12 changes: 6 additions & 6 deletions bump_master_version.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@
# - after running this script and merging develop into master, run bump_develop_version.sh in master and
# merge master into develop

OLD_ROCBLAS_VERSION="2.29.0"
NEW_ROCBLAS_VERSION="2.30.0"
OLD_ROCBLAS_VERSION="2.31.0"
NEW_ROCBLAS_VERSION="2.32.0"

OLD_TENSILE_VERSION="Tensile 4.22.0"
NEW_TENSILE_VERSION="Tensile 4.23.0"
OLD_TENSILE_VERSION="Tensile 4.23.0"
NEW_TENSILE_VERSION="Tensile 4.24.0"

OLD_TENSILE_HASH="ff7dc8cffadb0700a729e5e0327a7aee5d523b91"
NEW_TENSILE_HASH="b68edc65aaeed08c71b2b8622f69f83498b57d7a"
OLD_TENSILE_HASH="f3343183f62d52f0de1d07ad39020b59b86dc84f"
NEW_TENSILE_HASH="3ddca8e109c4633613f5c8289fb399a19d058826"

OLD_MINIMUM_REQUIRED_VERSION="MinimumRequiredVersion: 4.6.0"
NEW_MINIMUM_REQUIRED_VERSION="MinimumRequiredVersion: 4.7.1"
Expand Down
2 changes: 1 addition & 1 deletion tensile_tag.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
f3343183f62d52f0de1d07ad39020b59b86dc84f
31e10427e1612ea7d1b015980aa7e6ef7f1bc8ad

0 comments on commit fbe56c5

Please # to comment.