Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use bigint in HypreSolver test #4297

Merged
merged 2 commits into from
Jan 18, 2025
Merged

Use bigint in HypreSolver test #4297

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
481d370
Use bigint in HypreSolver test
WeiqunZhang Jan 17, 2025
76fe98a
Update Comments
WeiqunZhang Jan 18, 2025
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
10 changes: 5 additions & 5 deletions .github/workflows/hypre.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,10 +135,10 @@ jobs:
ccache-${{ github.workflow }}-${{ github.job }}-git-
- name: Build Hypre
run: |
wget -q https://github.com/hypre-space/hypre/archive/refs/tags/v2.28.0.tar.gz
tar xfz v2.28.0.tar.gz
cd hypre-2.28.0/src
./configure --with-cxxstandard=17
wget -q https://github.com/hypre-space/hypre/archive/refs/tags/v2.32.0.tar.gz
tar xfz v2.32.0.tar.gz
cd hypre-2.32.0/src
./configure --with-cxxstandard=17 --enable-bigint
make -j 4
make install
cd ../../
Expand All @@ -151,7 +151,7 @@ jobs:
export CCACHE_LOGFILE=${{ github.workspace }}/ccache.log.txt
ccache -z
export AMREX_HYPRE_HOME=${PWD}/hypre-2.28.0/src/hypre
export AMREX_HYPRE_HOME=${PWD}/hypre-2.32.0/src/hypre
cd Tests/LinearSolvers/Hypre
make -j4 USE_MPI=TRUE USE_HYPRE=TRUE DIM=2 CCACHE=ccache
mpiexec -n 2 ./main2d.gnu.MPI.ex inputs.2d
Expand Down
32 changes: 17 additions & 15 deletions Src/Extern/HYPRE/AMReX_HypreSolver.H
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,7 @@ public:
#endif
fill_local_id (Marker const& marker);

template <typename AI>
void fill_global_id ();

template <class Filler,
Expand Down Expand Up @@ -254,7 +255,13 @@ HypreSolver<MSS>::HypreSolver (Vector<IndexType> const& a_index_type,
}
AMREX_ASSERT(proc_end == proc_begin + m_nrows_proc);

fill_global_id();
// To generate global ids for Hypre, we need to remove duplicates on
// nodes shared by multiple Boxes with OverrideSync. So we need to use
// a type that supports atomicAdd. HYPRE_Int is either int or long
// long. The latter does not have native atomicAdd support in CUDA/HIP.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe a last sentence, that unsigned long long is supported on CUDA/HIP, would describe the new logic fully.

using AtomicInt = std::conditional_t<sizeof(HYPRE_Int) == 4,
HYPRE_Int, unsigned long long>;
fill_global_id<AtomicInt>();

// Create and initialize A, b & x
HYPRE_Int ilower = proc_begin;
Expand Down Expand Up @@ -366,27 +373,22 @@ HypreSolver<MSS>::fill_local_id (Marker const& marker)
}

template <int MSS>
template <typename AI>
void
HypreSolver<MSS>::fill_global_id ()
{
BL_PROFILE("HypreSolver::fill_global_id()");

// To generate global ids for Hypre, we need to remove duplicates on
// nodes shared by multiple Boxes with OverrideSync. So we need to use
// a type that supports atomicAdd. HYPRE_Int is either int or long
// long. The latter does not have native atomicAdd support in CUDA/HIP.
using AtomicInt = std::conditional_t<sizeof(HYPRE_Int) == 4,
HYPRE_Int, unsigned long long>;
Vector<FabArray<BaseFab<AI>>> global_id_raii;
Vector<FabArray<BaseFab<AI>>*> p_global_id;

Vector<FabArray<BaseFab<AtomicInt>>> global_id_raii;
Vector<FabArray<BaseFab<AtomicInt>>*> p_global_id;
if constexpr (std::is_same<HYPRE_Int, AtomicInt>()) {
if constexpr (std::is_same_v<HYPRE_Int,AI>) {
for (int ivar = 0; ivar < m_nvars; ++ivar) {
p_global_id.push_back(&(m_global_id[ivar]));
}
} else {
for (int ivar = 0; ivar < m_nvars; ++ivar) {
global_id_raii[ivar].define(m_global_id[ivar].boxArray(),
global_id_raii.emplace_back(m_global_id[ivar].boxArray(),
m_global_id[ivar].DistributionMap(),
1, m_global_id[ivar].nGrowVect());
p_global_id.push_back(&(global_id_raii[ivar]));
Expand All @@ -405,7 +407,7 @@ HypreSolver<MSS>::fill_global_id ()
HYPRE_Int const os = m_id_offset[ivar][mfi];
Box bx = mfi.validbox();
bx.convert(m_index_type[ivar]).grow(m_nghost);
Array4<AtomicInt> const& gid = p_global_id[ivar]->array(mfi);
Array4<AI> const& gid = p_global_id[ivar]->array(mfi);
auto const& lid = m_local_id[ivar].const_array(mfi);
HYPRE_Int* rows = rows_vec.data() + nrows;
nrows += m_nrows_grid[ivar][mfi];
Expand All @@ -414,9 +416,9 @@ HypreSolver<MSS>::fill_global_id ()
if (lid.contains(i,j,k) && lid(i,j,k) >= 0) {
const auto id = lid(i,j,k) + os;
rows[lid(i,j,k)] = id;
gid(i,j,k) = static_cast<AtomicInt>(id);
gid(i,j,k) = static_cast<AI>(id);
} else {
gid(i,j,k) = static_cast<AtomicInt>
gid(i,j,k) = static_cast<AI>
(std::numeric_limits<HYPRE_Int>::max());
}
});
Expand All @@ -428,7 +430,7 @@ HypreSolver<MSS>::fill_global_id ()
m_geom.periodicity());
p_global_id[ivar]->FillBoundary(m_geom.periodicity());

if constexpr (!std::is_same<HYPRE_Int, AtomicInt>()) {
if constexpr (!std::is_same<HYPRE_Int, AI>()) {
auto const& dst = m_global_id[ivar].arrays();
auto const& src = p_global_id[ivar]->const_arrays();
amrex::ParallelFor(m_global_id[ivar], m_global_id[ivar].nGrowVect(),
Expand Down
Loading