Merge pull request #339 from daineAMD/master

ROCm 4.3 merge staging into master
ROCm · Apr 23, 2021 · 63afcb3 · 63afcb3
2 parents 727c8bc + c992361
commit 63afcb3
Show file tree

Hide file tree

Showing 34 changed files with 6,021 additions and 1,122 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,9 @@
 ### Added
 - Added hipblasStatusToString
 
+### Fixed
+- Added catch() blocks around API calls to prevent the leak of C++ exceptions
+
 ## [hipBLAS 0.44.0 for ROCm 4.2.0]
 ### Added
 - Made necessary changes to work with rocBLAS' gemm_ex changes. When using rocBLAS backend, hipBLAS will query the preferable

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -49,7 +49,7 @@ include( ROCMInstallTargets )
 include( ROCMPackageConfigHelpers )
 include( ROCMInstallSymlinks )
 
-set ( VERSION_STRING "0.45.0" )
+set ( VERSION_STRING "0.46.0" )
 rocm_setup_version( VERSION ${VERSION_STRING} )
 
 if( NOT DEFINED $ENV{HIP_PATH})

diff --git a/bump_develop_version.sh b/bump_develop_version.sh
@@ -5,14 +5,14 @@
 # - run this script in master branch
 # - after running this script merge master into develop
 
-OLD_HIPBLAS_VERSION="0.44.0"
-NEW_HIPBLAS_VERSION="0.45.0"
+OLD_HIPBLAS_VERSION="0.46.0"
+NEW_HIPBLAS_VERSION="0.47.0"
 
-OLD_MINIMUM_ROCBLAS_VERSION="2.38.0"
-NEW_MINIMUM_ROCBLAS_VERSION="2.39.0"
+OLD_MINIMUM_ROCBLAS_VERSION="2.39.0"
+NEW_MINIMUM_ROCBLAS_VERSION="2.40.0"
 
-OLD_MINIMUM_ROCSOLVER_VERSION="3.11.0"
-NEW_MINIMUM_ROCSOLVER_VERSION="3.12.0"
+OLD_MINIMUM_ROCSOLVER_VERSION="3.13.0"
+NEW_MINIMUM_ROCSOLVER_VERSION="3.14.0"
 
 sed -i "s/${OLD_HIPBLAS_VERSION}/${NEW_HIPBLAS_VERSION}/g" CMakeLists.txt
 sed -i "s/${OLD_MINIMUM_ROCBLAS_VERSION}/${NEW_MINIMUM_ROCBLAS_VERSION}/g" library/CMakeLists.txt

diff --git a/bump_master_version.sh b/bump_master_version.sh
@@ -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_HIPBLAS_VERSION="0.43.0"
-NEW_HIPBLAS_VERSION="0.44.0"
+OLD_HIPBLAS_VERSION="0.45.0"
+NEW_HIPBLAS_VERSION="0.46.0"
 
-OLD_MINIMUM_ROCBLAS_VERSION="2.37.0"
-NEW_MINIMUM_ROCBLAS_VERSION="2.38.0"
+OLD_MINIMUM_ROCBLAS_VERSION="2.38.0"
+NEW_MINIMUM_ROCBLAS_VERSION="2.39.0"
 
-OLD_MINIMUM_ROCSOLVER_VERSION="3.11.0"
-NEW_MINIMUM_ROCSOLVER_VERSION="3.12.0"
+OLD_MINIMUM_ROCSOLVER_VERSION="3.13.0"
+NEW_MINIMUM_ROCSOLVER_VERSION="3.13.0"
 
 sed -i "s/${OLD_HIPBLAS_VERSION}/${NEW_HIPBLAS_VERSION}/g" CMakeLists.txt
 sed -i "s/${OLD_MINIMUM_ROCBLAS_VERSION}/${NEW_MINIMUM_ROCBLAS_VERSION}/g" library/CMakeLists.txt

diff --git a/clients/benchmarks/client.cpp b/clients/benchmarks/client.cpp
@@ -163,6 +163,7 @@
 #include <algorithm>
 #undef I
 
+using namespace roc; // For emulated program_options
 using namespace std::literals; // For std::string literals of form "str"s
 
 typedef int hipblas_int;
@@ -340,6 +341,15 @@ struct perf_blas<T, U, std::enable_if_t<std::is_same<T, float>{} || std::is_same
             {"nrm2", testing_nrm2<T>},
             {"nrm2_batched", testing_nrm2_batched<T>},
             {"nrm2_strided_batched", testing_nrm2_strided_batched<T>},
+            {"rotg", testing_rotg<T>},
+            {"rotg_batched", testing_rotg_batched<T>},
+            {"rotg_strided_batched", testing_rotg_strided_batched<T>},
+            {"rotm", testing_rotm<T>},
+            {"rotm_batched", testing_rotm_batched<T>},
+            {"rotm_strided_batched", testing_rotm_strided_batched<T>},
+            {"rotmg", testing_rotmg<T>},
+            {"rotmg_batched", testing_rotmg_batched<T>},
+            {"rotmg_strided_batched", testing_rotmg_strided_batched<T>},
             {"swap", testing_swap<T>},
             {"swap_batched", testing_swap_batched<T>},
             {"swap_strided_batched", testing_swap_strided_batched<T>},
@@ -360,13 +370,6 @@ struct perf_blas<T, U, std::enable_if_t<std::is_same<T, float>{} || std::is_same
             /*{"set_get_vector", testing_set_get_vector<T>},
                 {"set_get_matrix", testing_set_get_matrix<T>},
                 {"set_get_matrix_async", testing_set_get_matrix_async<T>},
-                // L1
-                {"rotm", testing_rotm<T>},
-                {"rotm_batched", testing_rotm_batched<T>},
-                {"rotm_strided_batched", testing_rotm_strided_batched<T>},
-                {"rotmg", testing_rotmg<T>},
-                {"rotmg_batched", testing_rotmg_batched<T>},
-                {"rotmg_strided_batched", testing_rotmg_strided_batched<T>},
                 // L2
                 {"spr", testing_spr<T>},
                 {"spr_batched", testing_spr_batched<T>},
@@ -519,6 +522,9 @@ struct perf_blas<
             {"nrm2", testing_nrm2<T>},
             {"nrm2_batched", testing_nrm2_batched<T>},
             {"nrm2_strided_batched", testing_nrm2_strided_batched<T>},
+            {"rotg", testing_rotg<T>},
+            {"rotg_batched", testing_rotg_batched<T>},
+            {"rotg_strided_batched", testing_rotg_strided_batched<T>},
             {"swap", testing_swap<T>},
             {"swap_batched", testing_swap_batched<T>},
             {"swap_strided_batched", testing_swap_strided_batched<T>},
@@ -706,9 +712,9 @@ struct perf_blas_rot<
     void operator()(const Arguments& arg)
     {
         static const func_map map = {
-            // {"rot", testing_rot<Ti, To, Tc>},
-            // {"rot_batched", testing_rot_batched<Ti, To, Tc>},
-            // {"rot_strided_batched", testing_rot_strided_batched<Ti, To, Tc>},
+            {"rot", testing_rot<Ti, To, Tc>},
+            {"rot_batched", testing_rot_batched<Ti, To, Tc>},
+            {"rot_strided_batched", testing_rot_strided_batched<Ti, To, Tc>},
         };
         run_function(map, arg);
     }
@@ -777,32 +783,6 @@ struct perf_blas_scal_ex<
     }
 };
 
-template <typename Ta, typename Tb = Ta, typename = void>
-struct perf_blas_rotg : hipblas_test_invalid
-{
-};
-
-template <typename Ta, typename Tb>
-struct perf_blas_rotg<
-    Ta,
-    Tb,
-    std::enable_if_t<(std::is_same<Ta, hipblasDoubleComplex>{} && std::is_same<Tb, double>{})
-                     || (std::is_same<Ta, hipblasComplex>{} && std::is_same<Tb, float>{})
-                     || (std::is_same<Ta, Tb>{} && std::is_same<Ta, float>{})
-                     || (std::is_same<Ta, Tb>{} && std::is_same<Ta, double>{})>>
-    : hipblas_test_valid
-{
-    void operator()(const Arguments& arg)
-    {
-        static const func_map map = {
-            {"rotg", testing_rotg<Ta, Tb>},
-            {"rotg_batched", testing_rotg_batched<Ta, Tb>},
-            {"rotg_strided_batched", testing_rotg_strided_batched<Ta, Tb>},
-        };
-        run_function(map, arg, " --b_type "s + hipblas_datatype2string(arg.b_type));
-    }
-};
-
 int run_bench_test(Arguments& arg)
 {
     //hipblas_initialize(); // Initialize rocBLAS
@@ -972,16 +952,14 @@ int run_bench_test(Arguments& arg)
         if(!strcmp(function, "scal") || !strcmp(function, "scal_batched")
            || !strcmp(function, "scal_strided_batched"))
             hipblas_blas1_dispatch<perf_blas_scal>(arg);
-        else if(!strcmp(function, "rotg") || !strcmp(function, "rotg_batched")
-                || !strcmp(function, "rotg_strided_batched"))
-            hipblas_blas1_dispatch<perf_blas_rotg>(arg);
+        */
         else if(!strcmp(function, "rot") || !strcmp(function, "rot_batched")
                 || !strcmp(function, "rot_strided_batched"))
-            hipblas_blas1_dispatch<perf_blas_rot>(arg);
+            hipblas_rot_dispatch<perf_blas_rot>(arg);
+        /*
         else if(!strcmp(function, "axpy_ex") || !strcmp(function, "axpy_batched_ex")
                 || !strcmp(function, "axpy_strided_batched_ex"))
             hipblas_blas1_ex_dispatch<perf_blas_axpy_ex>(arg);*/
-
         else
             hipblas_simple_dispatch<perf_blas>(arg);
     }