[Draft] Regression testing: CMake

Author: ax3l

Regression/WarpX-tests.ini

@@ -11,13 +11,14 @@ sourceTree = C_Src
 # suiteName is the name prepended to all output directories
 suiteName = WarpX
 
-COMP = g++
-add_to_c_make_command = TEST=TRUE USE_ASSERTION=TRUE WarpxBinDir=
+#COMP = g++
 
 purge_output = 1
 
+useCmake = 1
+isSuperbuild = 1
 MAKE = make
-numMakeJobs = 8
+numMakeJobs = 2
 
 # MPIcommand should use the placeholders:
 #   @host@ to indicate where to put the hostname to run on
@@ -53,10 +54,11 @@ branch = 798240684d9696fb00392688e3c216e21596b921
 [source]
 dir = /home/regtester/AMReX_RegTesting/warpx
 branch = development
+cmakeSetupOpts = -DAMReX_ASSERTIONS=ON
 
-[extra-PICSAR]
-dir = /home/regtester/AMReX_RegTesting/picsar/
-branch = a78be127f66adc1558f527edc8964e37e3a055ff
+#[extra-PICSAR]
+#dir = /home/regtester/AMReX_RegTesting/picsar/
+#branch = a78be127f66adc1558f527edc8964e37e3a055ff
 
 # individual problems follow
 
@@ -317,6 +319,7 @@ inputFile = Examples/Tests/Langmuir/inputs_3d_multi_rt
 runtime_params = warpx.do_dynamic_scheduling=0
 dim = 3
 addToCompileString =
+cmakeSetupOpts = -DWarpX_PRECISION=DOUBLE -DWarpX_DIMS=3
 restartTest = 0
 useMPI = 1
 numprocs = 2

Tools/Release/updateAMReX.py

@@ -102,7 +102,7 @@
 
 # Updates #####################################################################
 
-# run_test.sh (used also for Azure Pipelines)
+# run_test.sh (used also for Azure Pipelines) TODO: could maybe be short-cut now
 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()

Tools/Release/updatePICSAR.py

@@ -102,37 +102,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 picsar && git checkout COMMIT_TAG_OR_BRANCH && cd -
-    run_test_content = re.sub(
-        r'(.*cd\s+picsar.+git checkout\s+--detach\s+)(.+)(\s+&&\s.*)',
-        r'\g<1>{}\g<3>'.format(PICSAR_new_branch),
-        run_test_content, flags = re.MULTILINE)
-
-with open(run_test_path, "w", encoding='utf-8') as f:
-    f.write(run_test_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['extra-PICSAR']['branch'].value = PICSAR_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['extra-PICSAR']['branch'].value = PICSAR_new_branch
-    cp.update_file()
-
 # WarpX references to PICSAR: cmake/dependencies/PICSAR.cmake
 with open(PICSAR_cmake_path, encoding='utf-8') as f:
     PICSAR_cmake_content = f.read()

run_test.sh

@@ -53,13 +53,13 @@ echo "cd $PWD"
 git clone https://github.com/AMReX-Codes/amrex.git
 cd amrex && git checkout --detach 798240684d9696fb00392688e3c216e21596b921 && cd -
 # Use QED brach for QED tests
-git clone https://github.com/ECP-WarpX/picsar.git
-cd picsar && git checkout --detach a78be127f66adc1558f527edc8964e37e3a055ff && cd -
+#git clone https://github.com/ECP-WarpX/picsar.git
+#cd picsar && git checkout --detach a78be127f66adc1558f527edc8964e37e3a055ff && cd -
 # warpx-data contains various required data sets
 git clone --depth 1 https://github.com/ECP-WarpX/warpx-data.git
 
 # Clone the AMReX regression test utility
-git clone https://github.com/AMReX-Codes/regression_testing.git
+git clone --branch cmake-extraConfig https://github.com/ax3l/regression_testing.git
 
 # Prepare regression tests
 mkdir -p rt-WarpX/WarpX-benchmarks