From 52a9a2f1f8a2c553e9eb4d8de74e28516ab26ac7 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Tue, 4 Jan 2022 17:35:55 +0000 Subject: [PATCH 1/2] updated v22.01 --- recipe/meta.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 2a14ca4..66100bb 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,7 +1,7 @@ {% set name = "warpx" %} -{% set version = "21.12" %} -{% set build = 1 %} -{% set sha256 = "847c98aac20c73d94c823378803c82be9a14139f1c14ea483757229b452ce4c1" %} +{% set version = "22.01" %} +{% set build = 0 %} +{% set sha256 = "e465ffadabb7dc360c63c4d3862dc08082b5b0e77923d3fb05570408748b0d28" %} package: name: {{ name|lower }} From 361bb01854d44425e396e278b5415de840acb605 Mon Sep 17 00:00:00 2001 From: Axel Huebl Date: Tue, 4 Jan 2022 09:59:01 -0800 Subject: [PATCH 2/2] Bump PICMI, Python Tests, rm Patch --- recipe/meta.yaml | 7 ++----- recipe/test.bat | 24 +++++++++++++++++++----- recipe/test.sh | 18 ++++++++++++++---- 3 files changed, 35 insertions(+), 14 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 66100bb..eefe71c 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -10,10 +10,6 @@ package: source: url: https://github.com/ECP-WarpX/WarpX/archive/{{ version }}.tar.gz sha256: {{ sha256 }} - patches: - # The symbolic aliases for our +lib target were missing in the install location - # https://github.com/ECP-WarpX/WarpX/pull/2626 - - 2626.patch build: number: {{ build }} @@ -57,13 +53,14 @@ requirements: run: - numpy - periodictable - - picmistandard ==0.0.16 + - picmistandard ==0.0.18 - python - scipy test: source_files: - Examples/Physics_applications/laser_acceleration/inputs_* + - Examples/Physics_applications/laser_acceleration/PICMI_inputs_* files: - test.sh # [unix] - test.bat # [win] diff --git a/recipe/test.bat b/recipe/test.bat index 6e6357d..b717554 100644 --- a/recipe/test.bat +++ b/recipe/test.bat @@ -11,12 +11,26 @@ if errorlevel 1 exit 1 warpx.2d.NOMPI.OMP.DP.OPMD.PSATD.QED.exe %TEST_DIR%\inputs_2d max_step=50 diag1.intervals=10 diag1.format=openpmd if errorlevel 1 exit 1 -:: 1D - input in 22.01+ -::warpx.1d.NOMPI.OMP.DP.OPMD.PSATD.QED.exe %TEST_DIR%\inputs_1d max_step=50 diag1.intervals=10 diag1.format=openpmd -::if errorlevel 1 exit 1 +:: 1D +warpx.1d.NOMPI.OMP.DP.OPMD.PSATD.QED.exe %TEST_DIR%\inputs_1d max_step=50 diag1.intervals=10 diag1.format=openpmd +if errorlevel 1 exit 1 :: RZ -warpx.RZ.NOMPI.OMP.DP.OPMD.PSATD.QED.exe %TEST_DIR%\inputs_2d_rz max_step=50 diag1.intervals=10 diag1.format=openpmd +warpx.RZ.NOMPI.OMP.DP.OPMD.PSATD.QED.exe %TEST_DIR%\inputs_rz max_step=50 diag1.intervals=10 diag1.format=openpmd +if errorlevel 1 exit 1 + +:: Python: 3D +%PYTHON% %TEST_DIR%\PICMI_inputs_3d.py +if errorlevel 1 exit 1 + +:: Python: 2D +%PYTHON% %TEST_DIR%\PICMI_inputs_2d.py +if errorlevel 1 exit 1 + +:: Python: 1D +%PYTHON% %TEST_DIR%\PICMI_inputs_1d.py if errorlevel 1 exit 1 -:: TODO: Python tests +:: Python: RZ +%PYTHON% %TEST_DIR%\PICMI_inputs_rz.py +if errorlevel 1 exit 1 diff --git a/recipe/test.sh b/recipe/test.sh index 2db10c7..d31961c 100755 --- a/recipe/test.sh +++ b/recipe/test.sh @@ -11,10 +11,20 @@ warpx.3d.NOMPI.OMP.DP.OPMD.PSATD.QED ${TEST_DIR}/inputs_3d max_step=50 diag1.int # 2D warpx.2d.NOMPI.OMP.DP.OPMD.PSATD.QED ${TEST_DIR}/inputs_2d max_step=50 diag1.intervals=10 diag1.format=openpmd -# 1D: input in 22.01+ -#warpx.1d.NOMPI.OMP.DP.OPMD.PSATD.QED ${TEST_DIR}/inputs_1d max_step=50 diag1.intervals=10 diag1.format=openpmd +# 1D +warpx.1d.NOMPI.OMP.DP.OPMD.PSATD.QED ${TEST_DIR}/inputs_1d max_step=50 diag1.intervals=10 diag1.format=openpmd # RZ -warpx.RZ.NOMPI.OMP.DP.OPMD.PSATD.QED ${TEST_DIR}/inputs_2d_rz max_step=50 diag1.intervals=10 diag1.format=openpmd +warpx.RZ.NOMPI.OMP.DP.OPMD.PSATD.QED ${TEST_DIR}/inputs_rz max_step=50 diag1.intervals=10 diag1.format=openpmd -# TODO: Python tests +# Python: 3D +$PYTHON ${TEST_DIR}/PICMI_inputs_3d.py + +# Python: 2D +$PYTHON ${TEST_DIR}/PICMI_inputs_2d.py + +# Python: 1D +$PYTHON ${TEST_DIR}/PICMI_inputs_1d.py + +# Python: RZ +$PYTHON ${TEST_DIR}/PICMI_inputs_rz.py