Skip to content

Commit

Permalink
AMReX: Update to latest development (#404)
Browse files Browse the repository at this point in the history
Update to latest commit in `development`.
Pull in fixes
- [x] AMReX-Codes/amrex#4298
- [x] AMReX-Codes/amrex#4299
- [x] AMReX-Codes/amrex#4302
- [x] AMReX-Codes/amrex#4300

for #382.
  • Loading branch information
ax3l authored Jan 23, 2025
1 parent 2221811 commit 1a51c42
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 5 deletions.
16 changes: 12 additions & 4 deletions .github/workflows/ubuntu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,9 @@ jobs:
export CMAKE_BUILD_PARALLEL_LEVEL=4
python3 -m pip install -U pip setuptools wheel pytest
python3 -m pip install -U pip
python3 -m pip install -U build packaging setuptools wheel
python3 -m pip install -U cmake pytest
AMREX_MPI=ON python3 -m pip install -v .
python3 -c "import amrex.space1d as amr; print(amr.__version__)"
python3 -c "import amrex.space2d as amr; print(amr.__version__)"
Expand Down Expand Up @@ -80,7 +82,8 @@ jobs:
export CC=$(which gcc-10)
export CXX=$(which g++-10)
python3 -m pip install -U pip setuptools wheel
python3 -m pip install -U pip
python3 -m pip install -U build packaging setuptools wheel
python3 -m pip install -U cmake
python3 -m pip install -U pandas pytest mpi4py
Expand Down Expand Up @@ -133,7 +136,9 @@ jobs:
export CC=$(which clang-6.0)
export CXX=$(which clang++-6.0)
python3 -m pip install -U pip pytest
python3 -m pip install -U pip
python3 -m pip install -U build packaging setuptools wheel
python3 -m pip install -U cmake pytest
python3 -m pip install -v .
python3 -c "import amrex.space1d as amr; print(amr.__version__)"
python3 -c "import amrex.space2d as amr; print(amr.__version__)"
Expand Down Expand Up @@ -177,6 +182,8 @@ jobs:
export CMAKE_BUILD_PARALLEL_LEVEL=4
python3 -m pip install -U pip
python3 -m pip install -U build packaging setuptools wheel
python3 -m pip install -U cmake
python3 -m pip install -U pandas pytest
python3 -m pip install -v .
python3 -c "import amrex.space1d as amr; print(amr.__version__)"
Expand Down Expand Up @@ -222,7 +229,8 @@ jobs:
export CXX=$(which g++)
export CUDAHOSTCXX=$(which g++)
python3 -m pip install -U pip importlib_metadata launchpadlib setuptools wheel
python3 -m pip install -U pip
python3 -m pip install -U build packaging setuptools[core] wheel
python3 -m pip install -U cmake
cmake -S . -B build \
Expand Down
2 changes: 1 addition & 1 deletion cmake/dependencies/AMReX.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ option(pyAMReX_amrex_internal "Download & build AMReX" ON)
set(pyAMReX_amrex_repo "https://github.com/AMReX-Codes/amrex.git"
CACHE STRING
"Repository URI to pull and build AMReX from if(pyAMReX_amrex_internal)")
set(pyAMReX_amrex_branch "25.01"
set(pyAMReX_amrex_branch "0f46a1615c17f0bbeaedb20c27a97c9f6e439781"
CACHE STRING
"Repository branch for pyAMReX_amrex_repo if(pyAMReX_amrex_internal)")

Expand Down

0 comments on commit 1a51c42

Please sign in to comment.