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

Release 25.01 #790

Merged
merged 4 commits into from
Jan 9, 2025
Merged

Release 25.01 #790

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
bcfc1cb
Release: 25.01
ax3l Jan 9, 2025
cee85ee
Update API Call: `computePhi`
ax3l Jan 9, 2025
101ba68
AMReX: Depends on cu/rocsparse
ax3l Jan 9, 2025
991fdce
CMake: `AMReX_FFT` Control
ax3l Jan 9, 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
1 change: 1 addition & 0 deletions .github/workflows/dependencies/hip-openmpi.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ sudo apt-get install -y --no-install-recommends \
rocfft-dev \
rocprim-dev \
rocrand-dev \
rocsparse-dev \
hiprand-dev

# activate
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/dependencies/nvcc11-openmpi.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,8 @@ sudo apt-get install -y \
cuda-nvml-dev-11-3 \
cuda-nvtx-11-3 \
libcufft-dev-11-3 \
libcurand-dev-11-3
libcurand-dev-11-3 \
libcusparse-dev-11-3
sudo ln -s cuda-11.3 /usr/local/cuda

# cmake-easyinstall
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Preamble ####################################################################
#
cmake_minimum_required(VERSION 3.24.0)
project(ImpactX VERSION 24.12)
project(ImpactX VERSION 25.01)

include(${ImpactX_SOURCE_DIR}/cmake/ImpactXFunctions.cmake)

Expand Down
6 changes: 3 additions & 3 deletions cmake/dependencies/ABLASTR.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ macro(find_ablastr)
set(COMPONENT_DIM 3D)
set(COMPONENT_PRECISION ${ImpactX_PRECISION} P${ImpactX_PRECISION})

find_package(ABLASTR 24.10 CONFIG REQUIRED COMPONENTS ${COMPONENT_DIM})
find_package(ABLASTR 25.01 CONFIG REQUIRED COMPONENTS ${COMPONENT_DIM})
message(STATUS "ABLASTR: Found version '${ABLASTR_VERSION}'")
endif()

Expand Down Expand Up @@ -161,15 +161,15 @@ set(ImpactX_openpmd_src ""
set(ImpactX_ablastr_repo "https://github.com/ECP-WarpX/WarpX.git"
CACHE STRING
"Repository URI to pull and build ABLASTR from if(ImpactX_ablastr_internal)")
set(ImpactX_ablastr_branch "24.10"
set(ImpactX_ablastr_branch "25.01"
CACHE STRING
"Repository branch for ImpactX_ablastr_repo if(ImpactX_ablastr_internal)")

# AMReX is transitively pulled through ABLASTR
set(ImpactX_amrex_repo "https://github.com/AMReX-Codes/amrex.git"
CACHE STRING
"Repository URI to pull and build AMReX from if(ImpactX_amrex_internal)")
set(ImpactX_amrex_branch "e64ffef57a7608d1d60f9abe738cc634e9c1272e"
set(ImpactX_amrex_branch ""
Copy link
Member

Choose a reason for hiding this comment

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

To clarify for my understanding: without a specification here, what version of AMReX will be used?

Copy link
Member Author

Choose a reason for hiding this comment

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

Without specifying it here, we pick the version set in ABLASTR (WarpX):
https://github.com/ECP-WarpX/WarpX/blob/development/cmake/dependencies/AMReX.cmake#L293-L301

I usually only overwrite it here if we temporarily need a newer version than what is set there.

CACHE STRING
"Repository branch for ImpactX_amrex_repo if(ImpactX_amrex_internal)")

Expand Down
4 changes: 2 additions & 2 deletions cmake/dependencies/pyAMReX.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ function(find_pyamrex)
endif()
elseif(NOT ImpactX_pyamrex_internal)
# TODO: MPI control
find_package(pyAMReX 24.10 CONFIG REQUIRED)
find_package(pyAMReX 25.01 CONFIG REQUIRED)
message(STATUS "pyAMReX: Found version '${pyAMReX_VERSION}'")
endif()
endfunction()
Expand All @@ -74,7 +74,7 @@ option(ImpactX_pyamrex_internal "Download & build pyAMReX" ON)
set(ImpactX_pyamrex_repo "https://github.com/AMReX-Codes/pyamrex.git"
CACHE STRING
"Repository URI to pull and build pyamrex from if(ImpactX_pyamrex_internal)")
set(ImpactX_pyamrex_branch "8742a79c29b7db30c7287c8e33109c0d8be1277a"
set(ImpactX_pyamrex_branch "25.01"
CACHE STRING
"Repository branch for ImpactX_pyamrex_repo if(ImpactX_pyamrex_internal)")

Expand Down
4 changes: 2 additions & 2 deletions docs/source/conf.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,9 +73,9 @@
# built documents.
#
# The short X.Y version.
version = "24.12"
version = "25.01"
# The full version, including alpha/beta/rc tags.
release = "24.12"
release = "25.01"

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
Expand Down
2 changes: 1 addition & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@ def build_extension(self, ext):
setup(
name="impactx",
# note PEP-440 syntax: x.y.zaN but x.y.z.devN
version="24.12",
version="25.01",
packages=["impactx"],
# Python sources:
package_dir={"": "src/python"},
Expand Down
2 changes: 2 additions & 0 deletions src/particles/spacecharge/PoissonSolve.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@ namespace impactx::spacecharge
sorted_phi.emplace_back(&phi[lev]);
}

const bool is_igf_2d = false;
const bool do_single_precision_comms = false;
const bool eb_enabled = false;
ablastr::fields::computePhi(
Expand All @@ -95,6 +96,7 @@ namespace impactx::spacecharge
pc.GetParGDB()->boxArray(),
ablastr::utils::enums::GridType::Collocated,
is_solver_igf_on_lev0,
is_igf_2d,
eb_enabled,
do_single_precision_comms,
rel_ref_ratio
Expand Down
Loading