AMReX: development (#791)

* AMReX: `development` Update to the latest `development` commit of AMReX to fix a few bugs. * CI: Windows FFTW w/ double & float Double is default, float (single) precision is opt-in.
BLAST-ImpactX · Jan 10, 2025 · 0267769 · 0267769
1 parent 811b364
commit 0267769
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 2 deletions.
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -44,14 +44,25 @@ jobs:
         # https://github.com/actions/runner-images/issues/10004
         CXXFLAGS: "/D_DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR"
       run: |
-        cmake -S fftw-3.3.10 -B build_fftw       `
+        cmake -S fftw-3.3.10                     `
+              -B build_fftw                      `
               -DBUILD_SHARED_LIBS=OFF            `
               -DBUILD_TESTS=OFF                  `
               -DCMAKE_BUILD_TYPE=RelWithDebInfo  `
               -DDISABLE_FORTRAN=ON
         if(!$?) { Exit $LASTEXITCODE }
         cmake --build build_fftw --config RelWithDebInfo --target install --parallel 4
         if(!$?) { Exit $LASTEXITCODE }
+        cmake -S fftw-3.3.10                     `
+              -B build_fftwf                     `
+              -DBUILD_SHARED_LIBS=OFF            `
+              -DBUILD_TESTS=OFF                  `
+              -DCMAKE_BUILD_TYPE=RelWithDebInfo  `
+              -DDISABLE_FORTRAN=ON               `
+              -DENABLE_FLOAT=ON
+        if(!$?) { Exit $LASTEXITCODE }
+        cmake --build build_fftwf --config RelWithDebInfo --target install --parallel 4
+        if(!$?) { Exit $LASTEXITCODE }
 
         cmake -S hdf5-hdf5-1_12_2 -B build_hdf5  `
               -DCMAKE_BUILD_TYPE=RelWithDebInfo  `
@@ -83,6 +94,7 @@ jobs:
         CXXFLAGS: "/D_DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR"
         # FFTW3 install prefix path
         FFTW3_DIR: "C:/Program Files (x86)/fftw/"
+        FFTW3f_DIR: "C:/Program Files (x86)/fftw/"
       run: |
         $env:HDF5_DIR = "C:/Program Files/HDF_Group/HDF5/1.12.2/cmake/"
         cmake -S . -B build               `
@@ -159,6 +171,17 @@ jobs:
         if errorlevel 1 exit 1
         cmake --build build_fftw --config Release --target install --parallel 4
         if errorlevel 1 exit 1
+        cmake -S fftw-3.3.10                    ^
+              -B build_fftwf                    ^
+              -G "Ninja"                        ^
+              -DBUILD_TESTS=OFF                 ^
+              -DBUILD_SHARED_LIBS=OFF           ^
+              -DCMAKE_BUILD_TYPE=Release        ^
+              -DDISABLE_FORTRAN=ON              ^
+              -DENABLE_FLOAT=ON
+        if errorlevel 1 exit 1
+        cmake --build build_fftwf --config Release --target install --parallel 4
+        if errorlevel 1 exit 1
 
         cmake -S hdf5-hdf5-1_12_2 -B build_hdf5 ^
             -G "Ninja"                          ^
@@ -191,6 +214,7 @@ jobs:
       env:
         # FFTW3 install prefix path
         FFTW3_DIR: "C:/Program Files (x86)/fftw/"
+        FFTW3f_DIR: "C:/Program Files (x86)/fftw/"
       run: |
         call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\vc\Auxiliary\build\vcvarsall.bat" x64
 

diff --git a/cmake/dependencies/ABLASTR.cmake b/cmake/dependencies/ABLASTR.cmake
@@ -170,7 +170,7 @@ set(ImpactX_ablastr_branch "25.01"
 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 ""
+set(ImpactX_amrex_branch "041f225dc5c97a5e3baf2559046ceabffd75f002"
     CACHE STRING
     "Repository branch for ImpactX_amrex_repo if(ImpactX_amrex_internal)")