AMReX-Codes · ax3l · Oct 26, 2023 · Oct 26, 2023 · Oct 26, 2023
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -194,13 +194,21 @@ set_cxx_warnings()
 # Generate Configuration and .pc Files ########################################
 #
 # these files are used if pyAMReX is installed and picked up by a downstream
-# project (not needed yet)
+# project
+include(CMakePackageConfigHelpers)
+configure_package_config_file(
+    ${pyAMReX_SOURCE_DIR}/pyAMReXConfig.cmake.in
+    ${pyAMReX_BINARY_DIR}/pyAMReXConfig.cmake
+    INSTALL_DESTINATION ${pyAMReX_INSTALL_CMAKEDIR}
+    #PATH_VARS MODULE_PATH
+    # We have our own check_required_components
+    NO_CHECK_REQUIRED_COMPONENTS_MACRO
+)
 
-#include(CMakePackageConfigHelpers)
-#write_basic_package_version_file("pyAMReXConfigVersion.cmake"
-#    VERSION ${pyAMReX_VERSION}
-#    COMPATIBILITY SameMajorVersion
-#)
+write_basic_package_version_file("pyAMReXConfigVersion.cmake"
+    VERSION ${pyAMReX_VERSION}
+    COMPATIBILITY SameMinorVersion
+)
 
 
 # Installs ####################################################################
@@ -220,17 +228,17 @@ install(TARGETS ${pyAMReX_INSTALL_TARGET_NAMES}
 )
 
 # CMake package file for find_package(pyAMReX) in depending projects
-#install(EXPORT pyAMReXTargets
-#    FILE pyAMReXTargets.cmake
-#    NAMESPACE pyAMReX::
-#    DESTINATION ${pyAMReX_INSTALL_CMAKEDIR}
-#)
-#install(
-#    FILES
-#        ${pyAMReX_BINARY_DIR}/pyAMReXConfig.cmake
-#        ${pyAMReX_BINARY_DIR}/pyAMReXConfigVersion.cmake
-#    DESTINATION ${pyAMReX_INSTALL_CMAKEDIR}
-#)
+install(EXPORT pyAMReXTargets
+    FILE pyAMReXTargets.cmake
+    NAMESPACE pyAMReX::
+    DESTINATION ${pyAMReX_INSTALL_CMAKEDIR}
+)
+install(
+    FILES
+        ${pyAMReX_BINARY_DIR}/pyAMReXConfig.cmake
+        ${pyAMReX_BINARY_DIR}/pyAMReXConfigVersion.cmake
+    DESTINATION ${pyAMReX_INSTALL_CMAKEDIR}
+)
 
 
 # pip helpers for the amrex package ###########################################

diff --git a/cmake/dependencies/AMReX.cmake b/cmake/dependencies/AMReX.cmake
@@ -85,7 +85,7 @@ option(pyAMReX_amrex_internal "Download & build AMReX" ON)
 set(pyAMReX_amrex_repo "https://github.com/AMReX-Codes/amrex.git"
     CACHE STRING
     "Repository URI to pull and build AMReX from if(pyAMReX_amrex_internal)")
-set(pyAMReX_amrex_branch "23.10"
+set(pyAMReX_amrex_branch "be6c6415467d09da6109d27cfa218868abc1f9db"
     CACHE STRING
     "Repository branch for pyAMReX_amrex_repo if(pyAMReX_amrex_internal)")
 

diff --git a/pyAMReXConfig.cmake.in b/pyAMReXConfig.cmake.in
@@ -0,0 +1,40 @@
+@PACKAGE_INIT@
+
+# only add PUBLIC dependencies as well
+#   https://cmake.org/cmake/help/latest/manual/cmake-packages.7.html#creating-a-package-configuration-file
+include(CMakeFindDependencyMacro)
+
+# Search in <PackageName>_ROOT:
+#   https://cmake.org/cmake/help/v3.12/policy/CMP0074.html
+if(POLICY CMP0074)
+    cmake_policy(SET CMP0074 NEW)
+endif()
+
+# General options
+set(pyAMReX_SPACEDIM                  @AMReX_SPACEDIM@)
+set(_search_amrex_dim)
+foreach(D IN LISTS AMReX_SPACEDIM)
+    set(pyAMReX_${D}D_FOUND   ON)
+    set(_search_amrex_dim ${_search_amrex_dim} "${D}D")
+endforeach()
+
+find_dependency(AMReX COMPONENTS ${_search_amrex_dim})
+
+set(pyAMReX_MPI                       @AMReX_MPI@)
+set(pyAMReX_OMP                       @AMReX_OMP@)
+set(pyAMReX_CUDA                      @AMReX_CUDA@)
+set(pyAMReX_SYCL                      @AMReX_SYCL@)
+set(pyAMReX_HIP                       @AMReX_HIP@)
+set(pyAMReX_GPU_BACKEND               @AMReX_GPU_BACKEND@)
+
+# define central pyAMReX::pyAMReX_${D}d targets
+include("${CMAKE_CURRENT_LIST_DIR}/pyAMReXTargets.cmake")
+
+# check if components are fulfilled and set pyAMReX_<COMPONENT>_FOUND vars
+foreach(comp ${pyAMReX_FIND_COMPONENTS})
+    if(NOT pyAMReX_${comp}_FOUND)
+        if(pyAMReX_FIND_REQUIRED_${comp})
+            set(pyAMReX_FOUND FALSE)
+        endif()
+    endif()
+endforeach()
diff --git a/src/amrex/space1d/__init__.pyi b/src/amrex/space1d/__init__.pyi
@@ -492,4 +492,4 @@ def d_decl(x, y, z):
 
 __author__: str = "Axel Huebl, Ryan T. Sandberg, Shreyas Ananthan, David P. Grote, Revathi Jambunathan, Edoardo Zoni, Remi Lehe, Andrew Myers, Weiqun Zhang"
 __license__: str = "BSD-3-Clause-LBNL"
-__version__: str = "23.10"
+__version__: str = "23.10-22-gbe6c6415467d"
diff --git a/src/amrex/space1d/amrex_1d_pybind/__init__.pyi b/src/amrex/space1d/amrex_1d_pybind/__init__.pyi
@@ -3575,7 +3575,7 @@ class BoxArray:
     def size(self) -> int: ...
 
 class Config:
-    amrex_version: typing.ClassVar[str] = "23.10"
+    amrex_version: typing.ClassVar[str] = "23.10-22-gbe6c6415467d"
     gpu_backend = None
     have_gpu: typing.ClassVar[bool] = False
     have_mpi: typing.ClassVar[bool] = True
@@ -10853,4 +10853,4 @@ def write_single_level_plotfile(
 
 __author__: str = "Axel Huebl, Ryan T. Sandberg, Shreyas Ananthan, David P. Grote, Revathi Jambunathan, Edoardo Zoni, Remi Lehe, Andrew Myers, Weiqun Zhang"
 __license__: str = "BSD-3-Clause-LBNL"
-__version__: str = "23.10"
+__version__: str = "23.10-22-gbe6c6415467d"
diff --git a/src/amrex/space2d/__init__.pyi b/src/amrex/space2d/__init__.pyi
@@ -492,4 +492,4 @@ def d_decl(x, y, z):
 
 __author__: str = "Axel Huebl, Ryan T. Sandberg, Shreyas Ananthan, David P. Grote, Revathi Jambunathan, Edoardo Zoni, Remi Lehe, Andrew Myers, Weiqun Zhang"
 __license__: str = "BSD-3-Clause-LBNL"
-__version__: str = "23.10"
+__version__: str = "23.10-22-gbe6c6415467d"
diff --git a/src/amrex/space2d/amrex_2d_pybind/__init__.pyi b/src/amrex/space2d/amrex_2d_pybind/__init__.pyi
@@ -3575,7 +3575,7 @@ class BoxArray:
     def size(self) -> int: ...
 
 class Config:
-    amrex_version: typing.ClassVar[str] = "23.10"
+    amrex_version: typing.ClassVar[str] = "23.10-22-gbe6c6415467d"
     gpu_backend = None
     have_gpu: typing.ClassVar[bool] = False
     have_mpi: typing.ClassVar[bool] = True
@@ -10870,4 +10870,4 @@ def write_single_level_plotfile(
 
 __author__: str = "Axel Huebl, Ryan T. Sandberg, Shreyas Ananthan, David P. Grote, Revathi Jambunathan, Edoardo Zoni, Remi Lehe, Andrew Myers, Weiqun Zhang"
 __license__: str = "BSD-3-Clause-LBNL"
-__version__: str = "23.10"
+__version__: str = "23.10-22-gbe6c6415467d"
diff --git a/src/amrex/space3d/__init__.pyi b/src/amrex/space3d/__init__.pyi
@@ -492,4 +492,4 @@ def d_decl(x, y, z):
 
 __author__: str = "Axel Huebl, Ryan T. Sandberg, Shreyas Ananthan, David P. Grote, Revathi Jambunathan, Edoardo Zoni, Remi Lehe, Andrew Myers, Weiqun Zhang"
 __license__: str = "BSD-3-Clause-LBNL"
-__version__: str = "23.10"
+__version__: str = "23.10-22-gbe6c6415467d"
diff --git a/src/amrex/space3d/amrex_3d_pybind/__init__.pyi b/src/amrex/space3d/amrex_3d_pybind/__init__.pyi
@@ -3575,7 +3575,7 @@ class BoxArray:
     def size(self) -> int: ...
 
 class Config:
-    amrex_version: typing.ClassVar[str] = "23.10"
+    amrex_version: typing.ClassVar[str] = "23.10-22-gbe6c6415467d"
     gpu_backend = None
     have_gpu: typing.ClassVar[bool] = False
     have_mpi: typing.ClassVar[bool] = True
@@ -10894,4 +10894,4 @@ def write_single_level_plotfile(
 
 __author__: str = "Axel Huebl, Ryan T. Sandberg, Shreyas Ananthan, David P. Grote, Revathi Jambunathan, Edoardo Zoni, Remi Lehe, Andrew Myers, Weiqun Zhang"
 __license__: str = "BSD-3-Clause-LBNL"
-__version__: str = "23.10"
+__version__: str = "23.10-22-gbe6c6415467d"