AMReX/pyAMReX/PICSAR: Weekly Update (ECP-WarpX#5262)

* Update updater scripts

* AMReX: Weekly Update

* pyAMReX: Weekly Update

.github/workflows/cuda.yml

@@ -131,7 +131,7 @@ jobs:
         which nvcc || echo "nvcc not in PATH!"
 
         git clone https://github.com/AMReX-Codes/amrex.git ../amrex
-        cd ../amrex && git checkout --detach 4460afbbce250ac6b463ea2bee0d9930c5059d2f && cd -
+        cd ../amrex && git checkout --detach 028638564f7be0694b9898f8d4088cdbf9a6f9f5 && cd -
         make COMP=gcc QED=FALSE USE_MPI=TRUE USE_GPU=TRUE USE_OMP=FALSE USE_FFT=TRUE USE_CCACHE=TRUE -j 4
 
         ccache -s

Tools/Release/updateAMReX.py

@@ -15,15 +15,6 @@
 
 import requests
 
-try:
-    from configupdater import ConfigUpdater
-except ImportError:
-    print("Warning: Cannot update .ini files without 'configupdater'")
-    print("Consider running 'python -m pip install configupdater'")
-    ConfigUpdater = None
-    sys.exit(1)
-
-
 # Maintainer Inputs ###########################################################
 
 print("""Hi there, this is a WarpX maintainer tool to update the source
@@ -110,22 +101,6 @@
 
 # Updates #####################################################################
 
-# run_test.sh (used also for Azure Pipelines)
-run_test_path = str(REPO_DIR.joinpath("run_test.sh"))
-with open(run_test_path, encoding="utf-8") as f:
-    run_test_content = f.read()
-    #   branch/commit/tag (git fetcher) version
-    #     cd amrex && git checkout COMMIT_TAG_OR_BRANCH && cd -
-    run_test_content = re.sub(
-        r"(.*cd\s+amrex.+git checkout\s+--detach\s+)(.+)(\s+&&\s.*)",
-        r"\g<1>{}\g<3>".format(amrex_new_branch),
-        run_test_content,
-        flags=re.MULTILINE,
-    )
-
-with open(run_test_path, "w", encoding="utf-8") as f:
-    f.write(run_test_content)
-
 # CI: legacy build check in .github/workflows/cuda.yml
 ci_gnumake_path = str(REPO_DIR.joinpath(".github/workflows/cuda.yml"))
 with open(ci_gnumake_path, encoding="utf-8") as f:
@@ -142,23 +117,6 @@
 with open(ci_gnumake_path, "w", encoding="utf-8") as f:
     f.write(ci_gnumake_content)
 
-if ConfigUpdater is not None:
-    # WarpX-tests.ini
-    tests_ini_path = str(REPO_DIR.joinpath("Regression/WarpX-tests.ini"))
-    cp = ConfigUpdater()
-    cp.optionxform = str
-    cp.read(tests_ini_path)
-    cp["AMReX"]["branch"].value = amrex_new_branch
-    cp.update_file()
-
-    # WarpX-GPU-tests.ini
-    tests_gpu_ini_path = str(REPO_DIR.joinpath("Regression/WarpX-GPU-tests.ini"))
-    cp = ConfigUpdater()
-    cp.optionxform = str
-    cp.read(tests_gpu_ini_path)
-    cp["AMReX"]["branch"].value = amrex_new_branch
-    cp.update_file()
-
 # WarpX references to AMReX: cmake/dependencies/AMReX.cmake
 with open(amrex_cmake_path, encoding="utf-8") as f:
     amrex_cmake_content = f.read()

cmake/dependencies/AMReX.cmake

@@ -279,7 +279,7 @@ set(WarpX_amrex_src ""
 set(WarpX_amrex_repo "https://github.com/AMReX-Codes/amrex.git"
     CACHE STRING
     "Repository URI to pull and build AMReX from if(WarpX_amrex_internal)")
-set(WarpX_amrex_branch "4460afbbce250ac6b463ea2bee0d9930c5059d2f"
+set(WarpX_amrex_branch "028638564f7be0694b9898f8d4088cdbf9a6f9f5"
     CACHE STRING
     "Repository branch for WarpX_amrex_repo if(WarpX_amrex_internal)")
 

cmake/dependencies/pyAMReX.cmake

@@ -74,7 +74,7 @@ option(WarpX_pyamrex_internal "Download & build pyAMReX" ON)
 set(WarpX_pyamrex_repo "https://github.com/AMReX-Codes/pyamrex.git"
     CACHE STRING
     "Repository URI to pull and build pyamrex from if(WarpX_pyamrex_internal)")
-set(WarpX_pyamrex_branch "da2d5a000330395b3fcbcb43a519b3c8a318c584"
+set(WarpX_pyamrex_branch "41c856b8a588c3c8b04bb35d2d05b56f6ce0dd7f"
     CACHE STRING
     "Repository branch for WarpX_pyamrex_repo if(WarpX_pyamrex_internal)")