Skip to content

Commit

Permalink
correct Tensile version, add v
Browse files Browse the repository at this point in the history
  • Loading branch information
amcamd committed Apr 30, 2018
2 parents a873d88 + a8a22f4 commit fdac87d
Show file tree
Hide file tree
Showing 93 changed files with 6,953 additions and 4,207 deletions.
4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ include( ROCMInstallTargets )
include( ROCMPackageConfigHelpers )
include( ROCMInstallSymlinks )

rocm_setup_version( VERSION 0.12.3.0 NO_GIT_TAG_VERSION )
rocm_setup_version( VERSION 0.12.3.1 NO_GIT_TAG_VERSION )

# Append our library helper cmake path and the cmake path for hip (for convenience)
# Users may override HIP path by specifying their own in CMAKE_MODULE_PATH
Expand Down Expand Up @@ -149,7 +149,7 @@ if( BUILD_WITH_TENSILE )
else()
# Use the virtual-env setup and download package from specified repot:
set( tensile_fork "ROCmSoftwarePlatform" CACHE STRING "Tensile fork to use" )
set( tensile_tag v4.1.0 CACHE STRING "Tensile tag to download" )
set( tensile_tag v4.1.1 CACHE STRING "Tensile tag to download" )
virtualenv_install("git+https://github.com/ROCmSoftwarePlatform/Tensile.git@${tensile_tag}")
message (STATUS "using GIT Tensile fork=${tensile_fork} from branch=${tensile_tag}")
endif()
Expand Down
78 changes: 39 additions & 39 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -484,45 +484,45 @@ def build_pipeline( compiler_data compiler_args, docker_data docker_args, projec
}

// The following launches 3 builds in parallel: hcc-ctu, hcc-1.6 and cuda
//parallel hcc_ctu:
//{
// try
// {
// node( 'docker && rocm && jenkins-rocm-0')
// {
// def docker_args = new docker_data(
// from_image:'compute-artifactory:5001/rocm-developer-tools/hip/master/hip-hcc-ctu-ubuntu-16.04:latest',
// build_docker_file:'dockerfile-build-ubuntu',
// install_docker_file:'dockerfile-install-ubuntu',
// docker_run_args:'--device=/dev/kfd --device=/dev/dri --group-add=video',
// docker_build_args:' --pull' )
//
// def compiler_args = new compiler_data(
// compiler_name:'hcc-ctu',
// build_config:'Release',
// compiler_path:'/opt/rocm/bin/hcc' )
//
// def rocblas_paths = new project_paths(
// project_name:'rocblas-hcc-ctu',
// src_prefix:'src',
// build_prefix:'src',
// build_command: './install.sh -c' )
//
// def print_version_closure = {
// sh """
// set -x
// /opt/rocm/bin/hcc --version
// """
// }
//
// build_pipeline( compiler_args, docker_args, rocblas_paths, print_version_closure )
// }
// }
// catch( err )
// {
// currentBuild.result = 'UNSTABLE'
// }
//},
parallel hcc_ctu:
{
try
{
node( 'docker && rocm && jenkins-rocm-0')
{
def docker_args = new docker_data(
from_image:'compute-artifactory:5001/rocm-developer-tools/hip/master/hip-hcc-ctu-ubuntu-16.04:latest',
build_docker_file:'dockerfile-build-ubuntu',
install_docker_file:'dockerfile-install-ubuntu',
docker_run_args:'--device=/dev/kfd --device=/dev/dri --group-add=video',
docker_build_args:' --pull' )

def compiler_args = new compiler_data(
compiler_name:'hcc-ctu',
build_config:'Release',
compiler_path:'/opt/rocm/bin/hcc' )

def rocblas_paths = new project_paths(
project_name:'rocblas-hcc-ctu',
src_prefix:'src',
build_prefix:'src',
build_command: './install.sh -c' )

def print_version_closure = {
sh """
set -x
/opt/rocm/bin/hcc --version
"""
}

build_pipeline( compiler_args, docker_args, rocblas_paths, print_version_closure )
}
}
catch( err )
{
currentBuild.result = 'UNSTABLE'
}
},
rocm_ubuntu:
{
node( 'docker && rocm && gfx900')
Expand Down
6 changes: 3 additions & 3 deletions bump_develop_version.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
# - run this script in master branch
# - after running this script merge master into develop

OLD_ROCBLAS_VERSION="12.3.0"
NEW_ROCBLAS_VERSION="13.3.0"
OLD_ROCBLAS_VERSION="12.3.1"
NEW_ROCBLAS_VERSION="13.3.1"

OLD_TENSILE_VERSION="tensile_tag 4.1.0"
OLD_TENSILE_VERSION="tensile_tag 4.1.1"
NEW_TENSILE_VERSION="tensile_tag \"develop\""

sed -i "s/${OLD_ROCBLAS_VERSION}/${NEW_ROCBLAS_VERSION}/g" CMakeLists.txt
Expand Down
10 changes: 5 additions & 5 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="13.2.1"
NEW_ROCBLAS_VERSION="12.3.0"
OLD_ROCBLAS_VERSION="13.3.0"
NEW_ROCBLAS_VERSION="12.3.1"

OLD_TENSILE_VERSION="tensile_tag \"develop\""
NEW_TENSILE_VERSION="tensile_tag 4.1.0"
NEW_TENSILE_VERSION="tensile_tag 4.1.1"

OLD_MINIMUM_REQUIRED_VERSION="MinimumRequiredVersion: 4.0.2"
NEW_MINIMUM_REQUIRED_VERSION="MinimumRequiredVersion: 4.1.0"
OLD_MINIMUM_REQUIRED_VERSION="MinimumRequiredVersion: 4.1.0"
NEW_MINIMUM_REQUIRED_VERSION="MinimumRequiredVersion: 4.1.1"

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
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
- {MinimumRequiredVersion: 4.1.0}
- {MinimumRequiredVersion: 4.1.1}
- hip
- gfx000
- [fallback]
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
- {MinimumRequiredVersion: 4.1.0}
- {MinimumRequiredVersion: 4.1.1}
- hip
- gfx000
- [fallback]
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
- {MinimumRequiredVersion: 4.1.0}
- {MinimumRequiredVersion: 4.1.1}
- hip
- gfx000
- [fallback]
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
- {MinimumRequiredVersion: 4.1.0}
- {MinimumRequiredVersion: 4.1.1}
- hip
- gfx000
- [fallback]
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
- {MinimumRequiredVersion: 4.1.0}
- {MinimumRequiredVersion: 4.1.1}
- hip
- gfx000
- [fallback]
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
- {MinimumRequiredVersion: 4.1.0}
- {MinimumRequiredVersion: 4.1.1}
- hip
- gfx000
- [fallback]
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
- {MinimumRequiredVersion: 4.1.0}
- {MinimumRequiredVersion: 4.1.1}
- hip
- gfx000
- [fallback]
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
- {MinimumRequiredVersion: 4.1.0}
- {MinimumRequiredVersion: 4.1.1}
- hip
- gfx000
- [fallback]
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
- {MinimumRequiredVersion: 4.1.0}
- {MinimumRequiredVersion: 4.1.1}
- hip
- gfx000
- [fallback]
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
- {MinimumRequiredVersion: 4.1.0}
- {MinimumRequiredVersion: 4.1.1}
- hip
- gfx000
- [fallback]
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
- {MinimumRequiredVersion: 4.1.0}
- {MinimumRequiredVersion: 4.1.1}
- hip
- gfx000
- [fallback]
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
- {MinimumRequiredVersion: 4.1.0}
- {MinimumRequiredVersion: 4.1.1}
- hip
- gfx000
- [fallback]
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
- {MinimumRequiredVersion: 4.1.0}
- {MinimumRequiredVersion: 4.1.1}
- r9nano
- gfx803
- [Device 7300]
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
- {MinimumRequiredVersion: 4.1.0}
- {MinimumRequiredVersion: 4.1.1}
- r9nano
- gfx803
- [Device 7300]
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
- {MinimumRequiredVersion: 4.1.0}
- {MinimumRequiredVersion: 4.1.1}
- r9nano
- gfx803
- [Device 7300]
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
- {MinimumRequiredVersion: 4.1.0}
- {MinimumRequiredVersion: 4.1.1}
- r9nano
- gfx803
- [Device 7300]
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
- {MinimumRequiredVersion: 4.1.0}
- {MinimumRequiredVersion: 4.1.1}
- r9nano
- gfx803
- [Device 7300]
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
- {MinimumRequiredVersion: 4.1.0}
- {MinimumRequiredVersion: 4.1.1}
- r9nano
- gfx803
- [Device 7300]
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
- {MinimumRequiredVersion: 4.1.0}
- {MinimumRequiredVersion: 4.1.1}
- r9nano
- gfx803
- [Device 7300]
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
- {MinimumRequiredVersion: 4.1.0}
- {MinimumRequiredVersion: 4.1.1}
- r9nano
- gfx803
- [Device 7300]
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
- {MinimumRequiredVersion: 4.1.0}
- {MinimumRequiredVersion: 4.1.1}
- vega10
- gfx900
- [Device 6863, Device 6862, Device 687f, Device 6860]
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
- {MinimumRequiredVersion: 4.1.0}
- {MinimumRequiredVersion: 4.1.1}
- vega10
- gfx900
- [Device 6863, Device 6862, Device 687f, Device 6860]
Expand Down
Loading

0 comments on commit fdac87d

Please sign in to comment.