Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .github/workflows/trigger-hpsf-gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion Src/FFT/AMReX_FFT_Helper.H
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
4 changes: 4 additions & 0 deletions Src/LinearSolvers/AMReX_SpMV.H
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,7 @@ void SpMV (AlgVector<T>& y, SpMatrix<T> const& A, AlgVector<T> 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,
Expand All @@ -182,6 +183,9 @@ void SpMV (AlgVector<T>& y, SpMatrix<T> const& A, AlgVector<T> const& x)
mkl::sparse::gemv(Gpu::Device::streamQueue(), mkl::transpose::nontrans,
T(1), handle, px, T(0), py);

auto ev = mkl::sparse::release_matrix_handle(Gpu::Device::streamQueue(), &handle);
ev.wait();

#endif

AMREX_GPU_ERROR_CHECK();
Expand Down
4 changes: 0 additions & 4 deletions Tests/Algebra/GMRES/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
if (AMReX_SYCL)
return()
endif()

foreach(D IN LISTS AMReX_SPACEDIM)
set(_sources main.cpp)
set(_input_files )
Expand Down
8 changes: 0 additions & 8 deletions Tests/FFT/C2C/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
Loading