Skip to content

Commit 06d797d

Browse files
authored
Merge pull request #1198 from zaliu/swdev-298366
resolves SWDEV-298366
2 parents 8328dcc + 7f1d27b commit 06d797d

File tree

4 files changed

+14
-7
lines changed

4 files changed

+14
-7
lines changed

.jenkins/common.groovy

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ def runCompileCommand(platform, project, jobName)
77

88
String compiler = jobName.contains('hipclang') ? 'hipcc' : 'hcc'
99
String hipClang = jobName.contains('hipclang') ? '--hip-clang' : '--no-hip-clang'
10-
String sles = platform.jenkinsLabel.contains('sles') ? '/usr/bin/sudo --preserve-env' : ''
1110
String centos7 = platform.jenkinsLabel.contains('centos7') ? 'source scl_source enable devtoolset-7' : ':'
1211
String hipccCompileFlags = ""
1312
if (jobName.contains('hipclang'))
@@ -32,14 +31,13 @@ def runCompileCommand(platform, project, jobName)
3231
${centos7}
3332
echo Original HIPCC_COMPILE_FLAGS_APPEND: \$HIPCC_COMPILE_FLAGS_APPEND
3433
${hipccCompileFlags}
35-
${sles} CXX=/opt/rocm/bin/${compiler} ${project.paths.build_command} ${hipClang}
34+
CXX=/opt/rocm/bin/${compiler} ${project.paths.build_command} ${hipClang}
3635
"""
3736
platform.runCommand(this, command)
3837
}
3938

4039
def runTestCommand (platform, project, gfilter)
4140
{
42-
String sudo = auxiliary.sudo(platform.jenkinsLabel)
4341
String installPackage = ""
4442
if (platform.jenkinsLabel.contains('centos') || platform.jenkinsLabel.contains('sles'))
4543
{
@@ -54,7 +52,7 @@ def runTestCommand (platform, project, gfilter)
5452
${installPackage}
5553
popd
5654
cd ${project.paths.project_build_prefix}/build/release/clients/staging
57-
${sudo} GTEST_LISTENER=NO_PASS_LINE_IN_LOG ./rocblas-test --gtest_output=xml --gtest_color=yes --gtest_filter=${gfilter}-*known_bug*
55+
GTEST_LISTENER=NO_PASS_LINE_IN_LOG ./rocblas-test --gtest_output=xml --gtest_color=yes --gtest_filter=${gfilter}-*known_bug*
5856
"""
5957

6058
platform.runCommand(this, command)

.jenkins/precheckin.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ def runCI =
1515

1616
def prj = new rocProject('rocBLAS', 'PreCheckin')
1717
// customize for project
18-
prj.paths.build_command = './install.sh -c --cleanup'
18+
prj.paths.build_command = './install.sh -c'
1919

2020
prj.timeout.compile = 480
2121
prj.timeout.test = 360

library/src/handle.cpp

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,12 @@
1515
extern "C" void rocblas_initialize() {}
1616
#endif
1717

18+
// forcing early cleanup
19+
extern "C" void rocblas_shutdown()
20+
{
21+
// rocblas_internal_ostream::clear_workers();
22+
}
23+
1824
// This variable can be set in hipBLAS or other libraries to change the default
1925
// device memory size
2026
static thread_local size_t t_rocblas_device_malloc_default_memory_size;

library/src/tensile_host.cpp

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66

77
#include "rocblas.h"
88

9+
extern "C" void rocblas_shutdown();
10+
911
#ifndef USE_TENSILE_HOST
1012

1113
// In the old Tensile client, rocblas_initialize() is a no-op
@@ -494,11 +496,12 @@ namespace
494496

495497
// Find the location of librocblas.so
496498
// Fall back on hard-coded path if static library or not found
497-
// [Use a C API (rocblas_sccal) *not* defined in this file to
499+
// [Use a void C API (rocblas_shutdown) *not* defined in this file to
498500
// avoid compile-time resolution of the function pointer; cf.
499501
// https://man7.org/linux/man-pages/man3/dladdr.3.html "BUGS"]
502+
// rocblas_sscal stopped working even though is not defined in this unit
500503

501-
if(dladdr((void*)rocblas_sscal, &info))
504+
if(dladdr((void*)rocblas_shutdown, &info))
502505
{
503506
path = info.dli_fname;
504507
path = std::string{dirname(&path[0])};

0 commit comments

Comments
 (0)