Skip to content

Commit c1c1d88

Browse files
davidd-amddavidd-amd
committed
remove symlinks and reorganize private headers and build system accordingly
1 parent a25b79a commit c1c1d88

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+87
-90
lines changed

‎projects/hipblaslt/CMakeLists.txt‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -281,7 +281,7 @@ if(HIPBLASLT_ENABLE_HOST)
281281
"${CMAKE_CURRENT_SOURCE_DIR}/library/src/amd_detail/include"
282282
"${CMAKE_CURRENT_SOURCE_DIR}/library/src/amd_detail/rocblaslt/include"
283283
"${CMAKE_CURRENT_SOURCE_DIR}/library/src/amd_detail/rocblaslt/src/include"
284-
"${CMAKE_CURRENT_SOURCE_DIR}/library/src/amd_detail/rocblaslt/src/rocroller/include"
284+
"${CMAKE_CURRENT_SOURCE_DIR}/library/src/amd_detail/rocblaslt/src/rocroller_host/include"
285285
)
286286

287287
set_target_properties(hipblaslt
@@ -535,12 +535,6 @@ if(ROCM_LIBS_SUPERBUILD OR NOT HIPBLASLT_IS_SUBPROJECT)
535535
endif()
536536

537537
if(HIPBLASLT_ENABLE_COVERAGE)
538-
target_include_directories(hipblaslt-clients-common
539-
PUBLIC
540-
$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/library/src/amd_detail>
541-
$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/library/src/amd_detail/rocblaslt/include>
542-
$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/library/src/amd_detail/rocblaslt/src/include>
543-
)
544538
target_compile_definitions(hipblaslt-clients-common PUBLIC HIPBLASLT_ENABLE_COVERAGE)
545539
target_compile_definitions(tensilelite-host PRIVATE HIPBLASLT_ENABLE_COVERAGE)
546540
target_compile_definitions(hipblaslt PRIVATE HIPBLASLT_ENABLE_COVERAGE)

‎projects/hipblaslt/clients/CMakeLists.txt‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@ target_include_directories(hipblaslt-clients-common
1010
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../tensilelite/include>
1111
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../tensilelite>
1212
$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/library/src/amd_detail/include>
13+
$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/library/src/amd_detail/rocblaslt/include>
14+
$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/library/src/amd_detail/rocblaslt/src/include>
15+
$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/library/src/amd_detail/rocblaslt/src/rocroller_host/include>
1316
PRIVATE
1417
"${CMAKE_CURRENT_SOURCE_DIR}/../../tensilelite"
1518
)

‎projects/hipblaslt/clients/common/include/testing_auxiliary.hpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,16 +36,16 @@
3636
#ifdef HIPBLASLT_ENABLE_COVERAGE
3737
#include "hipblaslt_internal.hpp"
3838
#include "rocblaslt/rocblaslt_mat_utils.hpp"
39-
#include "rocblaslt/rocroller_host.hpp"
39+
#include "rocroller_host/rocroller_host.hpp"
4040
#include "rocblaslt/status.h"
4141
#include "rocblaslt/tensile_host.hpp"
4242
#include "rocblaslt/utility.hpp"
4343
#endif
4444
#include "unit.hpp"
4545
#include "utility.hpp"
46-
#include <hipblaslt/hipblaslt-ext-op.h>
47-
#include <hipblaslt/hipblaslt-ext.hpp> // Add check for hipblaslt-ext
48-
#include <hipblaslt/hipblaslt.h>
46+
#include "hipblaslt/hipblaslt-ext-op.h"
47+
#include "hipblaslt/hipblaslt-ext.hpp" // Add check for hipblaslt-ext
48+
#include "hipblaslt/hipblaslt.h"
4949

5050
void testing_aux_handle_init_bad_arg(const Arguments& arg)
5151
{

‎projects/hipblaslt/library/include/hipblaslt/hipblaslt-types.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
#include <hip/hip_fp8.h>
3838
#endif
3939

40-
#include "hipblaslt_float8.h"
40+
#include "hipblaslt/hipblaslt_float8.h"
4141
#include <float.h>
4242

4343
// Generic API

‎projects/hipblaslt/library/src/CMakeLists.txt‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -8,31 +8,31 @@ target_sources(hipblaslt
88
"${CMAKE_CURRENT_SOURCE_DIR}/amd_detail/include/auxiliary.hpp"
99
"${CMAKE_CURRENT_SOURCE_DIR}/amd_detail/include/exceptions.hpp"
1010
"${CMAKE_CURRENT_SOURCE_DIR}/amd_detail/include/hipblaslt_ostream.hpp"
11-
"${CMAKE_CURRENT_SOURCE_DIR}/amd_detail/hipblaslt_internal.hpp"
12-
"${CMAKE_CURRENT_SOURCE_DIR}/amd_detail/hipblaslt-ext-op-internal.hpp"
11+
"${CMAKE_CURRENT_SOURCE_DIR}/amd_detail/include/hipblaslt_internal.hpp"
12+
"${CMAKE_CURRENT_SOURCE_DIR}/amd_detail/include/hipblaslt-ext-op-internal.hpp"
1313

1414
"${CMAKE_CURRENT_SOURCE_DIR}/amd_detail/rocblaslt/include/Debug.hpp"
1515
"${CMAKE_CURRENT_SOURCE_DIR}/amd_detail/rocblaslt/include/rocblaslt-auxiliary.h"
1616
"${CMAKE_CURRENT_SOURCE_DIR}/amd_detail/rocblaslt/include/rocblaslt-functions.h"
1717
"${CMAKE_CURRENT_SOURCE_DIR}/amd_detail/rocblaslt/include/rocblaslt-types.h"
1818
"${CMAKE_CURRENT_SOURCE_DIR}/amd_detail/rocblaslt/include/rocblaslt.h"
1919

20-
"${CMAKE_CURRENT_SOURCE_DIR}/amd_detail/rocblaslt/src/include/debug.h"
21-
"${CMAKE_CURRENT_SOURCE_DIR}/amd_detail/rocblaslt/src/include/definitions.h"
22-
"${CMAKE_CURRENT_SOURCE_DIR}/amd_detail/rocblaslt/src/include/handle.h"
23-
"${CMAKE_CURRENT_SOURCE_DIR}/amd_detail/rocblaslt/src/include/logging.h"
24-
"${CMAKE_CURRENT_SOURCE_DIR}/amd_detail/rocblaslt/src/include/rocblaslt_mat_utils.hpp"
25-
"${CMAKE_CURRENT_SOURCE_DIR}/amd_detail/rocblaslt/src/include/status.h"
26-
"${CMAKE_CURRENT_SOURCE_DIR}/amd_detail/rocblaslt/src/include/tuple_helper.hpp"
27-
"${CMAKE_CURRENT_SOURCE_DIR}/amd_detail/rocblaslt/src/include/tensile_host.hpp"
28-
"${CMAKE_CURRENT_SOURCE_DIR}/amd_detail/rocblaslt/src/include/UserDrivenTuningParser.hpp"
29-
"${CMAKE_CURRENT_SOURCE_DIR}/amd_detail/rocblaslt/src/include/utility.hpp"
20+
"${CMAKE_CURRENT_SOURCE_DIR}/amd_detail/rocblaslt/src/include/rocblaslt/debug.h"
21+
"${CMAKE_CURRENT_SOURCE_DIR}/amd_detail/rocblaslt/src/include/rocblaslt/definitions.h"
22+
"${CMAKE_CURRENT_SOURCE_DIR}/amd_detail/rocblaslt/src/include/rocblaslt/handle.h"
23+
"${CMAKE_CURRENT_SOURCE_DIR}/amd_detail/rocblaslt/src/include/rocblaslt/logging.h"
24+
"${CMAKE_CURRENT_SOURCE_DIR}/amd_detail/rocblaslt/src/include/rocblaslt/rocblaslt_mat_utils.hpp"
25+
"${CMAKE_CURRENT_SOURCE_DIR}/amd_detail/rocblaslt/src/include/rocblaslt/status.h"
26+
"${CMAKE_CURRENT_SOURCE_DIR}/amd_detail/rocblaslt/src/include/rocblaslt/tuple_helper.hpp"
27+
"${CMAKE_CURRENT_SOURCE_DIR}/amd_detail/rocblaslt/src/include/rocblaslt/tensile_host.hpp"
28+
"${CMAKE_CURRENT_SOURCE_DIR}/amd_detail/rocblaslt/src/include/rocblaslt/UserDrivenTuningParser.hpp"
29+
"${CMAKE_CURRENT_SOURCE_DIR}/amd_detail/rocblaslt/src/include/rocblaslt/utility.hpp"
3030

31-
"${CMAKE_CURRENT_SOURCE_DIR}/amd_detail/rocblaslt/src/rocroller/include/analytical_utils.hpp"
32-
"${CMAKE_CURRENT_SOURCE_DIR}/amd_detail/rocblaslt/src/rocroller/include/gemm.hpp"
33-
"${CMAKE_CURRENT_SOURCE_DIR}/amd_detail/rocblaslt/src/rocroller/include/kernel_type.hpp"
34-
"${CMAKE_CURRENT_SOURCE_DIR}/amd_detail/rocblaslt/src/rocroller/include/parameter_selection.hpp"
35-
"${CMAKE_CURRENT_SOURCE_DIR}/amd_detail/rocblaslt/src/rocroller/include/rocroller_host.hpp"
36-
"${CMAKE_CURRENT_SOURCE_DIR}/amd_detail/rocblaslt/src/rocroller/include/runtime_args_selection.hpp"
37-
"${CMAKE_CURRENT_SOURCE_DIR}/amd_detail/rocblaslt/src/rocroller/include/solution_selection.hpp"
31+
"${CMAKE_CURRENT_SOURCE_DIR}/amd_detail/rocblaslt/src/rocroller_host/include/rocroller_host/analytical_utils.hpp"
32+
"${CMAKE_CURRENT_SOURCE_DIR}/amd_detail/rocblaslt/src/rocroller_host/include/rocroller_host/gemm.hpp"
33+
"${CMAKE_CURRENT_SOURCE_DIR}/amd_detail/rocblaslt/src/rocroller_host/include/rocroller_host/kernel_type.hpp"
34+
"${CMAKE_CURRENT_SOURCE_DIR}/amd_detail/rocblaslt/src/rocroller_host/include/rocroller_host/parameter_selection.hpp"
35+
"${CMAKE_CURRENT_SOURCE_DIR}/amd_detail/rocblaslt/src/rocroller_host/include/rocroller_host/rocroller_host.hpp"
36+
"${CMAKE_CURRENT_SOURCE_DIR}/amd_detail/rocblaslt/src/rocroller_host/include/rocroller_host/runtime_args_selection.hpp"
37+
"${CMAKE_CURRENT_SOURCE_DIR}/amd_detail/rocblaslt/src/rocroller_host/include/rocroller_host/solution_selection.hpp"
3838
)

‎projects/hipblaslt/library/src/amd_detail/hipblaslt-ext-op.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
#include <rocblaslt-auxiliary.h>
4242
#include <sstream>
4343
#include <string>
44-
#include <tensile_host.hpp>
44+
#include <rocblaslt/tensile_host.hpp>
4545
#include <unordered_map>
4646
#include <vector>
4747

‎projects/hipblaslt/library/src/amd_detail/hipblaslt.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
*******************************************************************************/
2626

2727
#include "hipblaslt/hipblaslt.h"
28-
#include "UserDrivenTuningParser.hpp"
28+
#include "rocblaslt/UserDrivenTuningParser.hpp"
2929
#include "exceptions.hpp"
3030
#include "hipblaslt/hipblaslt-ext-op.h"
3131
#include "hipblaslt_internal.hpp"

projects/hipblaslt/library/src/amd_detail/hipblaslt-ext-op-internal.hpp renamed to projects/hipblaslt/library/src/amd_detail/include/hipblaslt-ext-op-internal.hpp

File renamed without changes.

projects/hipblaslt/library/src/amd_detail/hipblaslt_internal.hpp renamed to projects/hipblaslt/library/src/amd_detail/include/hipblaslt_internal.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
*******************************************************************************/
2626

2727
#pragma once
28-
#include "handle.h"
28+
#include "rocblaslt/handle.h"
2929
#ifndef LEGACY_HIPBLAS_DIRECT
3030
#include <hipblas-common/hipblas-common.h>
3131
#else

‎projects/hipblaslt/library/src/amd_detail/rocblaslt/src/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,5 +20,5 @@ target_sources(hipblaslt
2020
target_include_directories(hipblaslt PRIVATE "${PROJECT_SOURCE_DIR}/device-library")
2121

2222
if(HIPBLASLT_ENABLE_ROCROLLER)
23-
add_subdirectory(rocroller)
23+
add_subdirectory(rocroller_host)
2424
endif()

0 commit comments

Comments
 (0)