Skip to content

Commit 590b4be

Browse files
authored
Release 22.07 (#3211)
* AMReX: 22.07 * PICSAR: 22.07 * WarpX: 22.07 * SENSEI: Update to 4.0.0 * AMReX: 22.07-4-gcbdc6580ee Include SENSEI build fixes.
1 parent 70c852f commit 590b4be

File tree

12 files changed

+17
-18
lines changed

12 files changed

+17
-18
lines changed

.github/workflows/cuda.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ jobs:
106106
which nvcc || echo "nvcc not in PATH!"
107107
108108
git clone https://github.com/AMReX-Codes/amrex.git ../amrex
109-
cd amrex && git checkout --detach 027f2ff77fed33a191cfc735d8adaabb42d21743 && cd -
109+
cd amrex && git checkout --detach cbdc6580ee3d78cccdd37172e4ba077ee181f483 && cd -
110110
make COMP=gcc QED=FALSE USE_MPI=TRUE USE_GPU=TRUE USE_OMP=FALSE USE_PSATD=TRUE USE_CCACHE=TRUE -j 2
111111
112112
build_nvhpc21-11-nvcc:

.github/workflows/insitu.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,17 +16,16 @@ jobs:
1616
CC: clang
1717
CXXFLAGS: "-Werror -Wshadow -Woverloaded-virtual -Wunreachable-code -Wno-error=pass-failed"
1818
CMAKE_GENERATOR: Ninja
19-
CMAKE_PREFIX_PATH: /root/install/sensei/develop/lib/cmake
19+
CMAKE_PREFIX_PATH: /root/install/sensei/v4.0.0/lib64/cmake
2020
container:
21-
image: ryankrattiger/sensei:fedora33-vtk-mpi-20210616
21+
image: senseiinsitu/ci:fedora35-amrex-20220613
2222
steps:
2323
- uses: actions/checkout@v2
2424
- name: Configure
2525
run: |
2626
cmake -S . -B build \
2727
-DWarpX_SENSEI=ON \
28-
-DWarpX_COMPUTE=NOACC \
29-
-DCMAKE_CXX_STANDARD=14
28+
-DWarpX_COMPUTE=NOACC
3029
- name: Build
3130
run: |
3231
cmake --build build -j 2

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Preamble ####################################################################
22
#
33
cmake_minimum_required(VERSION 3.18.0)
4-
project(WarpX VERSION 22.06)
4+
project(WarpX VERSION 22.07)
55

66
include(${WarpX_SOURCE_DIR}/cmake/WarpXFunctions.cmake)
77

Docs/source/conf.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,9 +71,9 @@
7171
# built documents.
7272
#
7373
# The short X.Y version.
74-
version = u'22.06'
74+
version = u'22.07'
7575
# The full version, including alpha/beta/rc tags.
76-
release = u'22.06'
76+
release = u'22.07'
7777

7878
# The language for content autogenerated by Sphinx. Refer to documentation
7979
# for a list of supported languages.

LICENSE.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
WarpX v22.06 Copyright (c) 2018-2022, The Regents of the University of California, through Lawrence Berkeley National Laboratory, and Lawrence Livermore National Security, LLC, for the operation of Lawrence Livermore National Laboratory (subject to receipt of any required approvals from the U.S. Dept. of Energy). All rights reserved.
1+
WarpX v22.07 Copyright (c) 2018-2022, The Regents of the University of California, through Lawrence Berkeley National Laboratory, and Lawrence Livermore National Security, LLC, for the operation of Lawrence Livermore National Laboratory (subject to receipt of any required approvals from the U.S. Dept. of Energy). All rights reserved.
22

33

44
Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:

Python/setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
package_data = {}
5555

5656
setup(name = 'pywarpx',
57-
version = '22.06',
57+
version = '22.07',
5858
packages = ['pywarpx'],
5959
package_dir = {'pywarpx': 'pywarpx'},
6060
description = """Wrapper of WarpX""",

Regression/WarpX-GPU-tests.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ emailBody = Check https://ccse.lbl.gov/pub/GpuRegressionTesting/WarpX/ for more
6060

6161
[AMReX]
6262
dir = /home/regtester/git/amrex/
63-
branch = 027f2ff77fed33a191cfc735d8adaabb42d21743
63+
branch = cbdc6580ee3d78cccdd37172e4ba077ee181f483
6464

6565
[source]
6666
dir = /home/regtester/git/WarpX

Regression/WarpX-tests.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ emailBody = Check https://ccse.lbl.gov/pub/RegressionTesting/WarpX/ for more det
5959

6060
[AMReX]
6161
dir = /home/regtester/AMReX_RegTesting/amrex/
62-
branch = 027f2ff77fed33a191cfc735d8adaabb42d21743
62+
branch = cbdc6580ee3d78cccdd37172e4ba077ee181f483
6363

6464
[source]
6565
dir = /home/regtester/AMReX_RegTesting/warpx

cmake/dependencies/AMReX.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ macro(find_amrex)
227227
endif()
228228
set(COMPONENT_PRECISION ${WarpX_PRECISION} P${WarpX_PARTICLE_PRECISION})
229229

230-
find_package(AMReX 22.06 CONFIG REQUIRED COMPONENTS ${COMPONENT_ASCENT} ${COMPONENT_DIM} ${COMPONENT_EB} PARTICLES ${COMPONENT_PIC} ${COMPONENT_PRECISION} ${COMPONENT_SENSEI} TINYP LSOLVERS)
230+
find_package(AMReX 22.07 CONFIG REQUIRED COMPONENTS ${COMPONENT_ASCENT} ${COMPONENT_DIM} ${COMPONENT_EB} PARTICLES ${COMPONENT_PIC} ${COMPONENT_PRECISION} ${COMPONENT_SENSEI} TINYP LSOLVERS)
231231
message(STATUS "AMReX: Found version '${AMReX_VERSION}'")
232232
endif()
233233
endmacro()
@@ -241,7 +241,7 @@ set(WarpX_amrex_src ""
241241
set(WarpX_amrex_repo "https://github.com/AMReX-Codes/amrex.git"
242242
CACHE STRING
243243
"Repository URI to pull and build AMReX from if(WarpX_amrex_internal)")
244-
set(WarpX_amrex_branch "027f2ff77fed33a191cfc735d8adaabb42d21743"
244+
set(WarpX_amrex_branch "cbdc6580ee3d78cccdd37172e4ba077ee181f483"
245245
CACHE STRING
246246
"Repository branch for WarpX_amrex_repo if(WarpX_amrex_internal)")
247247

cmake/dependencies/PICSAR.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ function(find_picsar)
8282
#message(STATUS "PICSAR: Using version '${PICSAR_VERSION}'")
8383
else()
8484
# not supported by PICSAR (yet)
85-
#find_package(PICSAR 22.06 CONFIG REQUIRED QED)
85+
#find_package(PICSAR 22.07 CONFIG REQUIRED QED)
8686
#message(STATUS "PICSAR: Found version '${PICSAR_VERSION}'")
8787
message(FATAL_ERROR "PICSAR: Cannot be used as externally installed "
8888
"library yet. "
@@ -103,7 +103,7 @@ if(WarpX_QED)
103103
set(WarpX_picsar_repo "https://github.com/ECP-WarpX/picsar.git"
104104
CACHE STRING
105105
"Repository URI to pull and build PICSAR from if(WarpX_picsar_internal)")
106-
set(WarpX_picsar_branch "2becfe0665590063fdfca10abaa05c4c1bd3ec22"
106+
set(WarpX_picsar_branch "4252e567089fce30d2a3a82d78998e8d3d8220c2"
107107
CACHE STRING
108108
"Repository branch for WarpX_picsar_repo if(WarpX_picsar_internal)")
109109

0 commit comments

Comments
 (0)