Skip to content

Commit e6b14b5

Browse files
yhmtsaiMarcelKoch
andcommitted
remove unused function and bring more rocm version test
Co-authored-by: Marcel Koch <marcel.koch@kit.edu>
1 parent c402d49 commit e6b14b5

3 files changed

Lines changed: 24 additions & 11 deletions

File tree

.gitlab-ci.yml

Lines changed: 24 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -230,12 +230,13 @@ build/amd/openmpi/gcc/rocm602/release/static:
230230
extends:
231231
- .build_and_test_tum_template
232232
- .default_variables
233-
- .full_test_condition
233+
- .quick_test_condition
234234
- .use_tum-amd
235235
variables:
236236
BUILD_HIP: "ON"
237237
BUILD_HWLOC: "OFF"
238238
BUILD_MPI: "ON"
239+
BUILD_OMP: "ON"
239240
BUILD_TYPE: "Release"
240241
BUILD_SHARED_LIBS: "OFF"
241242
MODULE_LOAD: "cmake/3.24.4 rocm/6.0.2 gcc/13.3.0 openmpi/5.0.7"
@@ -255,21 +256,22 @@ build/amd/nompi/gcc/rocm720/release/shared:
255256
ENABLE_HALF: "OFF"
256257
MODULE_LOAD: "cmake/3.25.3 rocm/7.2.0 gcc/12.4.0"
257258

258-
build/amd/nompi/gcc/rocm573/debug/shared:
259+
build/amd/openmpi/gcc/rocm610/debug/shared:
259260
extends:
260261
- .build_and_test_tum_template
261262
- .default_variables
262263
- .full_test_condition
263264
- .use_tum-amd
264265
variables:
265266
BUILD_HIP: "ON"
266-
BUILD_OMP: "OFF"
267267
BUILD_HWLOC: "OFF"
268+
BUILD_MPI: "ON"
269+
BUILD_OMP: "ON"
268270
BUILD_TYPE: "Debug"
269-
ENABLE_BFLOAT16: "ON"
270-
ENABLE_HALF: "OFF"
271-
MODULE_LOAD: "cmake/3.25.3 rocm/5.7.3 gcc/12.4.0"
271+
BUILD_SHARED_LIBS: "ON"
272+
MODULE_LOAD: "cmake/3.24.4 rocm/6.1.0 gcc/13.3.0 openmpi/5.0.7"
272273

274+
# rocm 6.3.x is the last version support MI50 officially
273275
build/amd/openmpi/gcc/rocm634_wo_omp/release/shared:
274276
extends:
275277
- .build_and_test_tum_template
@@ -283,7 +285,22 @@ build/amd/openmpi/gcc/rocm634_wo_omp/release/shared:
283285
BUILD_TYPE: "Release"
284286
MODULE_LOAD: "cmake/3.29.6 rocm/6.3.4 gcc/13.3.0 openmpi/5.0.7"
285287

286-
# mi50 is not officially supported by ROCm >= 7
288+
# mi50 is not officially supported by ROCm >= 6.4.0
289+
build/amd/nompi/gcc/rocm644/debug/static:
290+
extends:
291+
- .build_and_test_tum_template
292+
- .default_variables
293+
- .full_test_condition
294+
- .use_tum-amd-mi210
295+
variables:
296+
BUILD_HIP: "ON"
297+
BUILD_HWLOC: "OFF"
298+
BUILD_MPI: "OFF"
299+
BUILD_OMP: "OFF"
300+
BUILD_TYPE: "Debug"
301+
BUILD_SHARED_LIBS: "OFF"
302+
MODULE_LOAD: "cmake/3.29.6 rocm/6.4.4 gcc/14.3.0"
303+
287304
build/amd/nompi/gcc/rocm710/release/shared:
288305
extends:
289306
- .build_and_test_tum_template

cmake/autodetect_executors.cmake

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,6 @@ if(NOT DEFINED GINKGO_BUILD_HIP)
3535
if(CMAKE_HIP_COMPILER)
3636
message(STATUS "Enabling HIP executor")
3737
set(GINKGO_HAS_HIP ON)
38-
else()
39-
include(cmake/hip_helpers.cmake)
40-
ginkgo_check_hip_detection_issue()
4138
endif()
4239
endif()
4340

cmake/hip.cmake

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ cmake_minimum_required(VERSION 3.21 FATAL_ERROR)
33
include(cmake/hip_helpers.cmake)
44
include(CheckLanguage)
55
check_language(HIP)
6-
ginkgo_check_hip_detection_issue()
76

87
enable_language(HIP)
98

0 commit comments

Comments
 (0)