Skip to content

Commit a377c17

Browse files
authored
HIP CI: Switch to 7.0 in two tests (#4662)
* Fix warning about the deprecation of `__AMDGCN_WAVEFRONT_SIZE`. * No need to support gfortran <= 4. This also avoids a flang warning on finalizer. * Work around -Werror for the deprecation of rocsparse_spmv
1 parent f4295e3 commit a377c17

16 files changed

+14
-39
lines changed

.github/workflows/hip.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
- uses: actions/checkout@v5
2020
- name: Dependencies
2121
run: |
22-
.github/workflows/dependencies/dependencies_hip.sh 6.3.2
22+
.github/workflows/dependencies/dependencies_hip.sh 7.0
2323
.github/workflows/dependencies/dependencies_ccache.sh
2424
- name: Set Up Cache
2525
uses: actions/cache@v4
@@ -165,7 +165,7 @@ jobs:
165165
- uses: actions/checkout@v5
166166
- name: Dependencies
167167
run: |
168-
.github/workflows/dependencies/dependencies_hip.sh
168+
.github/workflows/dependencies/dependencies_hip.sh 7.0
169169
.github/workflows/dependencies/dependencies_ccache.sh
170170
- name: Set Up Cache
171171
uses: actions/cache@v4

Src/Base/AMReX_GpuDevice.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ namespace {
5959
}
6060
#endif
6161

62-
#ifdef AMREX_USE_HIP
62+
#if defined(AMREX_USE_HIP) && defined(HIP_VERSION_MAJOR) && (HIP_VERSION_MAJOR <= 6)
6363
namespace {
6464
__host__ __device__ void amrex_check_wavefront_size () {
6565
#ifdef __HIP_DEVICE_COMPILE__
@@ -363,7 +363,7 @@ Device::Initialize (bool minimal)
363363
nvtxRangePop();
364364
#endif
365365

366-
#if defined(AMREX_USE_HIP)
366+
#if defined(AMREX_USE_HIP) && defined(HIP_VERSION_MAJOR) && (HIP_VERSION_MAJOR <= 6)
367367
if (num_devices_used < 0) {
368368
// This test is always false, but it makes the compiler no longer
369369
// complain about unused function, amrex_check_wavefront_size.

Src/Base/AMReX_parmparse_mod.F90

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,8 @@ module amrex_parmparse_module
2020
generic :: assignment(=) => amrex_parmparse_assign ! shallow copy
2121
generic :: get => get_int, get_real, get_logical, get_string
2222
generic :: query => query_int, query_real, query_logical, query_string
23-
#if defined(__GFORTRAN__) && (__GNUC__ <= 4)
24-
generic :: getarr => get_intarr, get_realarr
25-
generic :: queryarr => query_intarr, query_realarr
26-
#else
2723
generic :: getarr => get_intarr, get_realarr, get_stringarr
2824
generic :: queryarr => query_intarr, query_realarr, query_stringarr
29-
#endif
3025
generic :: add => add_int, add_real, add_logical, add_string
3126
generic :: addarr => add_intarr, add_realarr, add_stringarr
3227
procedure, private :: amrex_parmparse_assign
@@ -51,9 +46,7 @@ module amrex_parmparse_module
5146
procedure, private :: add_intarr
5247
procedure, private :: add_realarr
5348
procedure, private :: add_stringarr
54-
#if (!defined(__GFORTRAN__) || (__GNUC__ > 4)) && (!defined(__ibmxl__))
5549
final :: amrex_parmparse_destroy
56-
#endif
5750
end type amrex_parmparse
5851

5952
! interfaces to cpp functions

Src/F_Interfaces/AmrCore/AMReX_flash_fluxregister_mod.F90

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,7 @@ module amrex_flash_fluxregister_module
3535
procedure, private :: amrex_flash_fluxregister_store
3636
procedure, private :: amrex_flash_fluxregister_store_area
3737
procedure, private :: amrex_flash_fluxregister_store_area_ifd
38-
#if !defined(__GFORTRAN__) || (__GNUC__ > 4)
3938
final :: amrex_flash_fluxregister_destroy
40-
#endif
4139
end type amrex_flash_fluxregister
4240

4341
interface

Src/F_Interfaces/AmrCore/AMReX_fluxregister_mod.F90

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,7 @@ module amrex_fluxregister_module
2626
procedure, private :: amrex_fluxregister_assign
2727
procedure, private :: amrex_fluxregister_fineadd
2828
procedure, private :: amrex_fluxregister_fineadd_1fab
29-
#if !defined(__GFORTRAN__) || (__GNUC__ > 4)
3029
final :: amrex_fluxregister_destroy
31-
#endif
3230
end type amrex_fluxregister
3331

3432
interface

Src/F_Interfaces/Base/AMReX_boxarray_mod.F90

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,7 @@ module amrex_boxarray_module
3232
procedure, private :: amrex_boxarray_maxsize_int3
3333
procedure, private :: amrex_boxarray_maxsize_iv
3434
procedure, private :: amrex_boxarray_intersects_box
35-
#if !defined(__GFORTRAN__) || (__GNUC__ > 4)
3635
final :: amrex_boxarray_destroy
37-
#endif
3836
end type amrex_boxarray
3937

4038
interface operator(==)

Src/F_Interfaces/Base/AMReX_distromap_mod.F90

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,7 @@ module amrex_distromap_module
2121
procedure :: get_pmap => amrex_distromap_get_pmap ! fill caller-owned array of PEs
2222
procedure, private :: amrex_distromap_assign
2323
procedure, private :: amrex_distromap_install
24-
#if !defined(__GFORTRAN__) || (__GNUC__ > 4)
2524
final :: amrex_distromap_destroy
26-
#endif
2725
end type amrex_distromap
2826

2927
interface operator(==)

Src/F_Interfaces/Base/AMReX_fab_mod.F90

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,7 @@ module amrex_fab_module
3232
procedure, private :: amrex_fab_resize
3333
procedure, private :: amrex_fab_norminf
3434
procedure, private :: amrex_fab_reset_omp_private
35-
#if !defined(__GFORTRAN__) || (__GNUC__ > 4)
3635
final :: amrex_fab_destroy
37-
#endif
3836
end type amrex_fab
3937

4038
interface amrex_fab_build

Src/F_Interfaces/Base/AMReX_geometry_mod.F90

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,7 @@ module amrex_geometry_module
3535
procedure :: get_physical_location => amrex_geometry_get_ploc
3636
procedure, private :: amrex_geometry_assign
3737
procedure, private :: amrex_geometry_install
38-
#if !defined(__GFORTRAN__) || (__GNUC__ > 4)
3938
final :: amrex_geometry_destroy
40-
#endif
4139
end type amrex_geometry
4240

4341
! interfaces to c++ functions

Src/F_Interfaces/Base/AMReX_multifab_mod.F90

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -91,9 +91,7 @@ module amrex_multifab_module
9191
procedure, private :: amrex_multifab_sum_boundary
9292
procedure, private :: amrex_multifab_sum_boundary_c
9393
procedure, private :: amrex_multifab_average_sync
94-
#if !defined(__GFORTRAN__) || (__GNUC__ > 4)
9594
final :: amrex_multifab_destroy
96-
#endif
9795
end type amrex_multifab
9896

9997
interface amrex_multifab_build
@@ -123,9 +121,7 @@ module amrex_multifab_module
123121
procedure, private :: amrex_imultifab_assign
124122
procedure, private :: amrex_imultifab_setval_gv
125123
procedure, private :: amrex_imultifab_setval
126-
#if !defined(__GFORTRAN__) || (__GNUC__ > 4)
127124
final :: amrex_imultifab_destroy
128-
#endif
129125
end type amrex_imultifab
130126

131127
interface amrex_imultifab_build
@@ -153,9 +149,7 @@ module amrex_multifab_module
153149
procedure :: validbox => amrex_mfiter_validbox
154150
procedure :: fabbox => amrex_mfiter_fabbox
155151
procedure, private :: amrex_mfiter_assign
156-
#if !defined(__GFORTRAN__) || (__GNUC__ > 4)
157152
final :: amrex_mfiter_destroy
158-
#endif
159153
end type amrex_mfiter
160154

161155
interface amrex_mfiter_build

0 commit comments

Comments
 (0)