From c9d95680e9e1ad44c06de84d31547727d3662b0d Mon Sep 17 00:00:00 2001 From: Weiqun Zhang Date: Sun, 16 Nov 2025 13:47:11 -0800 Subject: [PATCH 1/4] Re-enable some SYCL tests This will cause the gitlab CI tests to fail. --- Tests/Algebra/GMRES/CMakeLists.txt | 4 ---- Tests/FFT/C2C/CMakeLists.txt | 8 -------- 2 files changed, 12 deletions(-) diff --git a/Tests/Algebra/GMRES/CMakeLists.txt b/Tests/Algebra/GMRES/CMakeLists.txt index 98c194168e8..7e8d9a8080d 100644 --- a/Tests/Algebra/GMRES/CMakeLists.txt +++ b/Tests/Algebra/GMRES/CMakeLists.txt @@ -1,7 +1,3 @@ -if (AMReX_SYCL) - return() -endif() - foreach(D IN LISTS AMReX_SPACEDIM) set(_sources main.cpp) set(_input_files ) diff --git a/Tests/FFT/C2C/CMakeLists.txt b/Tests/FFT/C2C/CMakeLists.txt index fbf8403662e..21a9d3b2681 100644 --- a/Tests/FFT/C2C/CMakeLists.txt +++ b/Tests/FFT/C2C/CMakeLists.txt @@ -1,12 +1,4 @@ foreach(D IN LISTS AMReX_SPACEDIM) - if (D EQUAL 2) - return() - endif() - - if (D EQUAL 3) - return() - endif() - set(_sources main.cpp) set(_input_files) From a6c83a7859a5e23dd491b78107090c436eeda6ec Mon Sep 17 00:00:00 2001 From: Weiqun Zhang Date: Sun, 16 Nov 2025 14:20:06 -0800 Subject: [PATCH 2/4] Forgot to init matrix handle --- Src/LinearSolvers/AMReX_SpMV.H | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Src/LinearSolvers/AMReX_SpMV.H b/Src/LinearSolvers/AMReX_SpMV.H index a8809b6c3ed..7d60315f5fc 100644 --- a/Src/LinearSolvers/AMReX_SpMV.H +++ b/Src/LinearSolvers/AMReX_SpMV.H @@ -171,6 +171,7 @@ void SpMV (AlgVector& y, SpMatrix const& A, AlgVector const& x) amrex::ignore_unused(nnz); mkl::sparse::matrix_handle_t handle{}; + mkl::sparse::init_matrix_handle(&handle); #if defined(INTEL_MKL_VERSION) && (INTEL_MKL_VERSION < 20250300) mkl::sparse::set_csr_data(Gpu::Device::streamQueue(), handle, nrows, ncols, @@ -184,6 +185,9 @@ void SpMV (AlgVector& y, SpMatrix const& A, AlgVector const& x) #endif + auto ev = mkl::sparse::release_matrix_handle(Gpu::Device::streamQueue(), &handle); + ev.wait(); + AMREX_GPU_ERROR_CHECK(); #else From 3fb55066dea01ba07a46fb69abe708e99eac040e Mon Sep 17 00:00:00 2001 From: Weiqun Zhang Date: Sun, 16 Nov 2025 14:25:23 -0800 Subject: [PATCH 3/4] Fix --- .github/workflows/trigger-hpsf-gitlab-ci.yml | 3 ++- Src/LinearSolvers/AMReX_SpMV.H | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/trigger-hpsf-gitlab-ci.yml b/.github/workflows/trigger-hpsf-gitlab-ci.yml index 87fb6d658d5..a5fc843f83e 100644 --- a/.github/workflows/trigger-hpsf-gitlab-ci.yml +++ b/.github/workflows/trigger-hpsf-gitlab-ci.yml @@ -121,8 +121,9 @@ jobs: shell: bash run: | STATUS=${{ steps.wait.outputs.final_status }} + PIPELINE_ID=${{ steps.trigger.outputs.pipeline_id }} PIPELINE_URL=${{ steps.trigger.outputs.pipeline_url }} - COMMENT="GitLab CI finished with status: **$STATUS**. See details at ${PIPELINE_URL}." + COMMENT="GitLab CI ${PIPELINE_ID} finished with status: **$STATUS**. See details at ${PIPELINE_URL}." gh api \ repos/${{ github.repository }}/issues/${{ github.event.issue.number }}/comments \ diff --git a/Src/LinearSolvers/AMReX_SpMV.H b/Src/LinearSolvers/AMReX_SpMV.H index 7d60315f5fc..9e80a81cff7 100644 --- a/Src/LinearSolvers/AMReX_SpMV.H +++ b/Src/LinearSolvers/AMReX_SpMV.H @@ -183,11 +183,11 @@ void SpMV (AlgVector& y, SpMatrix const& A, AlgVector const& x) mkl::sparse::gemv(Gpu::Device::streamQueue(), mkl::transpose::nontrans, T(1), handle, px, T(0), py); -#endif - auto ev = mkl::sparse::release_matrix_handle(Gpu::Device::streamQueue(), &handle); ev.wait(); +#endif + AMREX_GPU_ERROR_CHECK(); #else From 9b5148238ddd91d24087edc87ca71c93f2f01aa9 Mon Sep 17 00:00:00 2001 From: Weiqun Zhang Date: Sun, 16 Nov 2025 16:00:09 -0800 Subject: [PATCH 4/4] Fix a bug in sycl fft c2c --- Src/FFT/AMReX_FFT_Helper.H | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Src/FFT/AMReX_FFT_Helper.H b/Src/FFT/AMReX_FFT_Helper.H index c9aea46448b..021466668c4 100644 --- a/Src/FFT/AMReX_FFT_Helper.H +++ b/Src/FFT/AMReX_FFT_Helper.H @@ -402,7 +402,7 @@ struct Plan strides[0] = 0; strides[ndims] = 1; for (int i = ndims-1; i >= 1; --i) { - strides[i] = strides[i+1] * len[ndims-1-i]; + strides[i] = strides[i+1] * len[i]; } #ifndef AMREX_USE_MKL_DFTI_2024 pp->set_value(oneapi::mkl::dft::config_param::FWD_STRIDES, strides);