Skip to content

Commit 1a51c42

Browse files
authored
AMReX: Update to latest development (#404)
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.
1 parent 2221811 commit 1a51c42

File tree

2 files changed

+13
-5
lines changed

2 files changed

+13
-5
lines changed

.github/workflows/ubuntu.yml

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,9 @@ jobs:
4141
4242
export CMAKE_BUILD_PARALLEL_LEVEL=4
4343
44-
python3 -m pip install -U pip setuptools wheel pytest
44+
python3 -m pip install -U pip
45+
python3 -m pip install -U build packaging setuptools wheel
46+
python3 -m pip install -U cmake pytest
4547
AMREX_MPI=ON python3 -m pip install -v .
4648
python3 -c "import amrex.space1d as amr; print(amr.__version__)"
4749
python3 -c "import amrex.space2d as amr; print(amr.__version__)"
@@ -80,7 +82,8 @@ jobs:
8082
8183
export CC=$(which gcc-10)
8284
export CXX=$(which g++-10)
83-
python3 -m pip install -U pip setuptools wheel
85+
python3 -m pip install -U pip
86+
python3 -m pip install -U build packaging setuptools wheel
8487
python3 -m pip install -U cmake
8588
python3 -m pip install -U pandas pytest mpi4py
8689
@@ -133,7 +136,9 @@ jobs:
133136
134137
export CC=$(which clang-6.0)
135138
export CXX=$(which clang++-6.0)
136-
python3 -m pip install -U pip pytest
139+
python3 -m pip install -U pip
140+
python3 -m pip install -U build packaging setuptools wheel
141+
python3 -m pip install -U cmake pytest
137142
python3 -m pip install -v .
138143
python3 -c "import amrex.space1d as amr; print(amr.__version__)"
139144
python3 -c "import amrex.space2d as amr; print(amr.__version__)"
@@ -177,6 +182,8 @@ jobs:
177182
export CMAKE_BUILD_PARALLEL_LEVEL=4
178183
179184
python3 -m pip install -U pip
185+
python3 -m pip install -U build packaging setuptools wheel
186+
python3 -m pip install -U cmake
180187
python3 -m pip install -U pandas pytest
181188
python3 -m pip install -v .
182189
python3 -c "import amrex.space1d as amr; print(amr.__version__)"
@@ -222,7 +229,8 @@ jobs:
222229
export CXX=$(which g++)
223230
export CUDAHOSTCXX=$(which g++)
224231
225-
python3 -m pip install -U pip importlib_metadata launchpadlib setuptools wheel
232+
python3 -m pip install -U pip
233+
python3 -m pip install -U build packaging setuptools[core] wheel
226234
python3 -m pip install -U cmake
227235
228236
cmake -S . -B build \

cmake/dependencies/AMReX.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ option(pyAMReX_amrex_internal "Download & build AMReX" ON)
8686
set(pyAMReX_amrex_repo "https://github.com/AMReX-Codes/amrex.git"
8787
CACHE STRING
8888
"Repository URI to pull and build AMReX from if(pyAMReX_amrex_internal)")
89-
set(pyAMReX_amrex_branch "25.01"
89+
set(pyAMReX_amrex_branch "0f46a1615c17f0bbeaedb20c27a97c9f6e439781"
9090
CACHE STRING
9191
"Repository branch for pyAMReX_amrex_repo if(pyAMReX_amrex_internal)")
9292

0 commit comments

Comments
 (0)