From ef7397ae35128a3ce8134207b0498b30d79c5e55 Mon Sep 17 00:00:00 2001 From: Rahul Garg Date: Mon, 6 Apr 2020 03:09:10 -0700 Subject: [PATCH] Bump version to 3.5 (#1993) * Switch CI testing from rocm-3.1.x to rocm-3.3.x * Update hcc workweek for cooperative view * bump version to 3.5 [ROCm/clr commit: c09c4cd239d7c428587a8b8912ad149cbd01a565] --- projects/clr/hipamd/Jenkinsfile | 8 ++++---- projects/clr/hipamd/bin/hipconfig | 2 +- projects/clr/hipamd/src/hip_module.cpp | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/projects/clr/hipamd/Jenkinsfile b/projects/clr/hipamd/Jenkinsfile index e38f7824d2..a7cec9fd1b 100644 --- a/projects/clr/hipamd/Jenkinsfile +++ b/projects/clr/hipamd/Jenkinsfile @@ -295,13 +295,13 @@ def docker_upload_dockerhub( String local_org, String image_name, String remote_ String build_config = 'Release' String job_name = env.JOB_NAME.toLowerCase( ) -// The following launches 3 builds in parallel: rocm-head, rocm-3.1.x and cuda-10.x -parallel rocm_3_1: +// The following launches 3 builds in parallel: rocm-head, rocm-3.3.x and cuda-10.x +parallel rocm_3_3: { node('hip-rocm') { - String hcc_ver = 'rocm-3.1.x' - String from_image = 'ci_test_nodes/rocm-3.1.x/ubuntu-16.04:latest' + String hcc_ver = 'rocm-3.3.x' + String from_image = 'ci_test_nodes/rocm-3.3.x/ubuntu-16.04:latest' String inside_args = '--device=/dev/kfd --device=/dev/dri --group-add=video' // Checkout source code, dependencies and version files diff --git a/projects/clr/hipamd/bin/hipconfig b/projects/clr/hipamd/bin/hipconfig index c56b56ecd8..033908d2d3 100755 --- a/projects/clr/hipamd/bin/hipconfig +++ b/projects/clr/hipamd/bin/hipconfig @@ -1,7 +1,7 @@ #!/usr/bin/perl -w $HIP_BASE_VERSION_MAJOR = "3"; -$HIP_BASE_VERSION_MINOR = "2"; +$HIP_BASE_VERSION_MINOR = "5"; # Need perl > 5.10 to use logic-defined or use 5.006; use v5.10.1; diff --git a/projects/clr/hipamd/src/hip_module.cpp b/projects/clr/hipamd/src/hip_module.cpp index 192aba5da6..d331d996da 100644 --- a/projects/clr/hipamd/src/hip_module.cpp +++ b/projects/clr/hipamd/src/hip_module.cpp @@ -493,7 +493,7 @@ hipError_t ihipLaunchCooperativeKernel(const void* f, dim3 gridDim, dim3 blockDim, void** kernelParams, unsigned int sharedMemBytes, hipStream_t stream, hip_impl::program_state& ps) { -#if (__hcc_workweek__ >= 20093) +#if (__hcc_workweek__ >= 20115) hipError_t result; @@ -641,7 +641,7 @@ hipError_t hipLaunchCooperativeKernel(const void* func, dim3 gridDim, hipError_t ihipLaunchCooperativeKernelMultiDevice(hipLaunchParams* launchParamsList, int numDevices, unsigned int flags, hip_impl::program_state& ps) { -#if (__hcc_workweek__ >= 20093) +#if (__hcc_workweek__ >= 20115) hipError_t result; if (numDevices > g_deviceCnt || launchParamsList == nullptr || numDevices > MAX_COOPERATIVE_GPUs) {