Skip to content

Commit 6409604

Browse files
committed
update oneAPI key
1 parent d58ddf6 commit 6409604

File tree

2 files changed

+1
-22
lines changed

2 files changed

+1
-22
lines changed

.github/workflows/meta.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ jobs:
112112
- name: (Ubuntu) Install Intel oneAPI
113113
if: contains(matrix.os,'ubuntu') && contains(matrix.mpi,'intel')
114114
timeout-minutes: 15
115-
run: sudo apt-get install intel-oneapi-compiler-dpcpp-cpp-2024.1.0 intel-oneapi-compiler-fortran-2024.1.0 intel-oneapi-mpi-devel ninja-build
115+
run: sudo apt-get install intel-oneapi-compiler-dpcpp-cpp-2024.1.0-963 intel-oneapi-compiler-fortran-2024.1.0-963 intel-oneapi-mpi-devel ninja-build
116116

117117
- name: (Ubuntu) Setup Intel oneAPI environment
118118
if: contains(matrix.os,'ubuntu') && contains(matrix.mpi,'intel')

src/fpm_meta.f90

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1879,27 +1879,6 @@ subroutine init_hdf5(this,compiler,error)
18791879
print *, '-l'//this%link_libs(i)%s
18801880
end do
18811881

1882-
!
1883-
! # additionally, some pkgconfig HDF5 HL files are malformed so let's be sure to find HL anyway
1884-
! if lpath.is_file():
1885-
! hl = []
1886-
! if language == 'cpp':
1887-
! hl += ['_hl_cpp', '_cpp']
1888-
! elif language == 'fortran':
1889-
! hl += ['_hl_fortran', 'hl_fortran', '_fortran']
1890-
! hl += ['_hl'] # C HL library, always needed
1891-
!
1892-
! suffix = '.' + lpath.name.split('.', 1)[1] # in case of .dll.a
1893-
! for h in hl:
1894-
! hlfn = lpath.parent / (lpath.name.split('.', 1)[0] + h + suffix)
1895-
! if hlfn.is_file():
1896-
! link_args.append(str(hlfn))
1897-
! # HDF5 C libs are required by other HDF5 languages
1898-
! link_args.append(larg)
1899-
! else:
1900-
! link_args.append(larg)
1901-
! link_args.append(larg)
1902-
19031882
!> Get compiler flags
19041883
flags = pkgcfg_get_build_flags(name,.true.,error)
19051884
if (allocated(error)) return

0 commit comments

Comments
 (0)