Skip to content

Commit 292e9ab

Browse files
authored
Re-enable some SYCL tests (#4792)
Fix SYCL issues in complex to complex FFT and gemv.
1 parent 2e82f4d commit 292e9ab

File tree

5 files changed

+7
-14
lines changed

5 files changed

+7
-14
lines changed

.github/workflows/trigger-hpsf-gitlab-ci.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,8 +121,9 @@ jobs:
121121
shell: bash
122122
run: |
123123
STATUS=${{ steps.wait.outputs.final_status }}
124+
PIPELINE_ID=${{ steps.trigger.outputs.pipeline_id }}
124125
PIPELINE_URL=${{ steps.trigger.outputs.pipeline_url }}
125-
COMMENT="GitLab CI finished with status: **$STATUS**. See details at ${PIPELINE_URL}."
126+
COMMENT="GitLab CI ${PIPELINE_ID} finished with status: **$STATUS**. See details at ${PIPELINE_URL}."
126127
127128
gh api \
128129
repos/${{ github.repository }}/issues/${{ github.event.issue.number }}/comments \

Src/FFT/AMReX_FFT_Helper.H

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -402,7 +402,7 @@ struct Plan
402402
strides[0] = 0;
403403
strides[ndims] = 1;
404404
for (int i = ndims-1; i >= 1; --i) {
405-
strides[i] = strides[i+1] * len[ndims-1-i];
405+
strides[i] = strides[i+1] * len[i];
406406
}
407407
#ifndef AMREX_USE_MKL_DFTI_2024
408408
pp->set_value(oneapi::mkl::dft::config_param::FWD_STRIDES, strides);

Src/LinearSolvers/AMReX_SpMV.H

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -171,6 +171,7 @@ void SpMV (AlgVector<T>& y, SpMatrix<T> const& A, AlgVector<T> const& x)
171171

172172
amrex::ignore_unused(nnz);
173173
mkl::sparse::matrix_handle_t handle{};
174+
mkl::sparse::init_matrix_handle(&handle);
174175

175176
#if defined(INTEL_MKL_VERSION) && (INTEL_MKL_VERSION < 20250300)
176177
mkl::sparse::set_csr_data(Gpu::Device::streamQueue(), handle, nrows, ncols,
@@ -182,6 +183,9 @@ void SpMV (AlgVector<T>& y, SpMatrix<T> const& A, AlgVector<T> const& x)
182183
mkl::sparse::gemv(Gpu::Device::streamQueue(), mkl::transpose::nontrans,
183184
T(1), handle, px, T(0), py);
184185

186+
auto ev = mkl::sparse::release_matrix_handle(Gpu::Device::streamQueue(), &handle);
187+
ev.wait();
188+
185189
#endif
186190

187191
AMREX_GPU_ERROR_CHECK();

Tests/Algebra/GMRES/CMakeLists.txt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
1-
if (AMReX_SYCL)
2-
return()
3-
endif()
4-
51
foreach(D IN LISTS AMReX_SPACEDIM)
62
set(_sources main.cpp)
73
set(_input_files )

Tests/FFT/C2C/CMakeLists.txt

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,4 @@
11
foreach(D IN LISTS AMReX_SPACEDIM)
2-
if (D EQUAL 2)
3-
return()
4-
endif()
5-
6-
if (D EQUAL 3)
7-
return()
8-
endif()
9-
102
set(_sources main.cpp)
113

124
set(_input_files)

0 commit comments

Comments
 (0)