git subrepo pull umbrella

subrepo: subdir: "umbrella" merged: "7123a7a" upstream: origin: "git@github.com:pdlfs/umbrella.git" branch: "master" commit: "7123a7a" git-subrepo: version: "0.3.1" origin: "???" commit: "???"
pdlfs · Nov 21, 2024 · 2e9e62b · 2e9e62b
1 parent 9c4dcfb
commit 2e9e62b
Show file tree

Hide file tree

Showing 21 changed files with 602 additions and 147 deletions.
diff --git a/umbrella/.gitrepo b/umbrella/.gitrepo
@@ -6,6 +6,6 @@
 [subrepo]
 	remote = git@github.com:pdlfs/umbrella.git
 	branch = master
-	commit = 325b6ab6933828cdaaf02e61b025344795f5b8d9
-	parent = f806513c980ffd1e4b31f518e9a6fbead7555499
+	commit = 7123a7a0097c1ea1d68f3da9b73aec2784f041c0
+	parent = 9c4dcfb742b60d2614e5de0a41a045c9ed02368b
 	cmdver = 0.3.1
diff --git a/umbrella/umbrella-main.cmake b/umbrella/umbrella-main.cmake
diff --git a/umbrella/umbrella/amr-tools.cmake b/umbrella/umbrella/amr-tools.cmake
@@ -0,0 +1,77 @@
+#
+# amr-tools.cmake  umbrella for amr-tools
+# 10-May-2023  ankushj@andrew.cmu.edu
+#
+
+#
+# config:
+#  AMR_TOOLS_REPO - url of git repository
+#  AMR_TOOLS_TAG  - tag to checkout of git
+#  AMR_TOOLS_TAR  - cache tar file name (default should be ok)
+#
+
+if (NOT TARGET amr-tools)
+
+umbrella_defineopt (AMR_TOOLS_REPO "https://github.com/anku94/amr.git"
+     STRING "AMR_TOOLS GIT repository")
+umbrella_defineopt (AMR_TOOLS_TAG "main" STRING "AMR_TOOLS GIT tag")
+umbrella_defineopt (AMR_TOOLS_TAR "amr-tools-${AMR_TOOLS_TAG}.tar.gz"
+     STRING "AMR_TOOLS cache tar file")
+
+umbrella_defineopt(AMR_TOOLS_GUROBI OFF BOOL "Build amr-tools with Gurobi")
+umbrella_defineopt(AMR_TOOLS_TAU OFF BOOL "Build amr-tools with TAU")
+
+umbrella_defineopt (AMR_TOOLS_OWNMPI OFF BOOL "Use mpirun in install tree")
+#
+# depends
+#
+
+set (AMR_CMCACHE "${UMBRELLA_CMAKECACHE}")
+
+set(AMR_TOOLS_DEPENDS glog kokkos pdlfs-common)
+
+include (umbrella/glog)
+include (umbrella/kokkos)
+include (umbrella/pdlfs-common)
+
+if (UMBRELLA_MPI_DEPS)
+  include (umbrella/${UMBRELLA_MPI_DEPS})
+  list(APPEND AMR_TOOLS_DEPENDS ${UMBRELLA_MPI_DEPS})
+  list (APPEND AMR_CMCACHE -DAMR_TOOLS_OWNMPI:STRING=1)
+endif()
+
+if (AMR_TOOLS_GUROBI)
+  include (umbrella/gurobi)
+  list(APPEND AMR_TOOLS_DEPENDS gurobi)
+endif (AMR_TOOLS_GUROBI)
+
+if (AMR_TOOLS_TAU)
+  include (umbrella/tau)
+  list(APPEND AMR_TOOLS_DEPENDS tau)
+  list (APPEND AMR_CMCACHE -DTAU_ROOT:STRING=${CMAKE_INSTALL_PREFIX})
+endif (AMR_TOOLS_TAU)
+
+#
+# generate parts of the ExternalProject_Add args...
+#
+umbrella_download (AMR_TOOLS_DOWNLOAD amr-tools
+                   ${AMR_TOOLS_TAR}
+                   GIT_REPOSITORY ${AMR_TOOLS_REPO}
+                   GIT_TAG ${AMR_TOOLS_TAG})
+umbrella_patchcheck (AMR_TOOLS_PATCHCMD amr-tools)
+# TODO: hook up tests (also add to ExternalProject_Add)
+# umbrella_testcommand (amr-tools AMR_TOOLS_TESTCMD
+#                       ctest -R preload -V )
+
+
+#
+# create amr-tools target
+#
+ExternalProject_Add (amr-tools
+    DEPENDS ${AMR_TOOLS_DEPENDS}
+    ${AMR_TOOLS_DOWNLOAD} ${AMR_TOOLS_PATCHCMD}
+    CMAKE_CACHE_ARGS ${AMR_CMCACHE}
+    UPDATE_COMMAND ""
+)
+
+endif (NOT TARGET amr-tools)
diff --git a/umbrella/umbrella/argobots.cmake b/umbrella/umbrella/argobots.cmake
@@ -28,7 +28,7 @@ umbrella_download (ARGOBOTS_DOWNLOAD argobots ${ARGOBOTS_TAR}
                    GIT_REPOSITORY ${ARGOBOTS_REPO}
                    GIT_TAG ${ARGOBOTS_TAG})
 umbrella_patchcheck (ARGOBOTS_PATCHCMD argobots)
-umbrella_testcommand(argobots ARGOBOTS_TESTCMD TEST_COMMAND make -C test check)
+umbrella_testcommand(argobots ARGOBOTS_TESTCMD make -C test check)
 
 #
 # create argobots target

diff --git a/umbrella/umbrella/carp.cmake b/umbrella/umbrella/carp.cmake
@@ -40,9 +40,10 @@ umbrella_patchcheck (CARP_PATCHCMD carp)
 #
 # depends
 #
-set (CARP_DEPENDS deltafs)
+set (CARP_DEPENDS deltafs vpic)
 
 include (umbrella/deltafs)
+include (umbrella/vpic)
 if (CARP_H5PART)
     umbrella_opt_default (HDF5_ENABLE_PARALLEL ON)
     if (NOT HDF5_ENABLE_PARALLEL)

diff --git a/umbrella/umbrella/ch-placement.cmake b/umbrella/umbrella/ch-placement.cmake
@@ -29,7 +29,7 @@ umbrella_download (CH_PLACEMENT_DOWNLOAD ch-placement ${CH_PLACEMENT_TAR}
                    GIT_REPOSITORY ${CH_PLACEMENT_REPO}
                    GIT_TAG ${CH_PLACEMENT_TAG})
 umbrella_patchcheck (CH_PLACEMENT_PATCHCMD ch-placement)
-umbrella_testcommand(ch-placement CH_PLACEMENT_TESTCMD TEST_COMMAND make check)
+umbrella_testcommand(ch-placement CH_PLACEMENT_TESTCMD make check)
 
 #
 # create ch-placement target

diff --git a/umbrella/umbrella/deltafs-common.cmake b/umbrella/umbrella/deltafs-common.cmake
@@ -33,18 +33,26 @@ umbrella_download (DELTAFS_COMMON_DOWNLOAD deltafs-common ${DELTAFS_COMMON_TAR}
                    GIT_REPOSITORY ${DELTAFS_COMMON_REPO}
                    GIT_TAG ${DELTAFS_COMMON_TAG})
 umbrella_patchcheck (DELTAFS_COMMON_PATCHCMD deltafs-common)
-umbrella_testcommand (deltafs-common DELTAFS_COMMON_TESTCMD TEST_COMMAND
+umbrella_testcommand (deltafs-common DELTAFS_COMMON_TESTCMD
       ctest -E "gigaplus_test|autocompact_test|db_test|index_block_test" )
 
 #
 # depends
 #
+set (DELTAFS_COMMON_DEPENDS mercury)
+
+# if UMBRELLA_USE_GLOG is set to ON, include it
+if (UMBRELLA_USE_GLOG)
+    include (umbrella/glog)
+    list (APPEND DELTAFS_COMMON_DEPENDS glog)
+endif (UMBRELLA_USE_GLOG)
+
 include (umbrella/mercury)
 
 #
 # create deltafs-common target
 #
-ExternalProject_Add (deltafs-common DEPENDS mercury
+ExternalProject_Add (deltafs-common DEPENDS ${DELTAFS_COMMON_DEPENDS}
     ${DELTAFS_COMMON_DOWNLOAD} ${DELTAFS_COMMON_PATCHCMD}
     CMAKE_ARGS ${PDLFS_OPTIONS} -DBUILD_SHARED_LIBS=ON
         -DBUILD_TESTS=${DELTAFS_COMMON_BUILDTESTS}

diff --git a/umbrella/umbrella/deltafs-nexus.cmake b/umbrella/umbrella/deltafs-nexus.cmake
@@ -31,8 +31,8 @@ umbrella_download (DELTAFS_NEXUS_DOWNLOAD deltafs-nexus ${DELTAFS_NEXUS_TAR}
                    GIT_TAG ${DELTAFS_NEXUS_TAG})
 umbrella_patchcheck (DELTAFS_NEXUS_PATCHCMD deltafs-nexus)
 umbrella_testcommand (deltafs-nexus DELTAFS_NEXUS_TESTCMD
-    ### TEST_COMMAND "ctest -R nexus -V"
-    TEST_COMMAND "" )
+    ### "ctest -R nexus -V"
+    "" )
 
 #
 # depends

diff --git a/umbrella/umbrella/deltafs-vpic-preload.cmake b/umbrella/umbrella/deltafs-vpic-preload.cmake
@@ -33,7 +33,7 @@ umbrella_download (DELTAFS_VPIC_PRELOAD_DOWNLOAD deltafs-vpic-preload
                    GIT_TAG ${DELTAFS_VPIC_PRELOAD_TAG})
 umbrella_patchcheck (DELTAFS_VPIC_PRELOAD_PATCHCMD deltafs-vpic-preload)
 umbrella_testcommand (deltafs-vpic-preload DELTAFS_VPIC_PRELOAD_TESTCMD
-    TEST_COMMAND ctest -R preload -V )
+    ctest -R preload -V )
 
 #
 # depends

diff --git a/umbrella/umbrella/deltafs.cmake b/umbrella/umbrella/deltafs.cmake
@@ -30,7 +30,7 @@ umbrella_download (DELTAFS_DOWNLOAD deltafs ${DELTAFS_TAR}
                    GIT_REPOSITORY ${DELTAFS_REPO}
                    GIT_TAG ${DELTAFS_TAG})
 umbrella_patchcheck (DELTAFS_PATCHCMD deltafs)
-umbrella_testcommand (deltafs DELTAFS_TESTCMD TEST_COMMAND
+umbrella_testcommand (deltafs DELTAFS_TESTCMD
       ctest -E "gigaplus_test|autocompact_test|db_test|index_block_test" )
 
 #

diff --git a/umbrella/umbrella/gflags.cmake b/umbrella/umbrella/gflags.cmake
@@ -30,7 +30,7 @@ umbrella_download (GFLAGS_DOWNLOAD gflags ${GFLAGS_TAR}
                    GIT_REPOSITORY ${GFLAGS_REPO}
                    GIT_TAG ${GFLAGS_TAG})
 umbrella_patchcheck (GFLAGS_PATCHCMD gflags)
-umbrella_testcommand (gflags GFLAGS_TESTCMD TEST_COMMAND make test)
+umbrella_testcommand (gflags GFLAGS_TESTCMD make test)
 
 #
 # create gflags target

diff --git a/umbrella/umbrella/json-c.cmake b/umbrella/umbrella/json-c.cmake
@@ -30,8 +30,7 @@ umbrella_download (JSON_C_DOWNLOAD json-c ${JSON_C_TAR}
                    GIT_REPOSITORY ${JSON_C_REPO}
                    GIT_TAG ${JSON_C_TAG})
 umbrella_patchcheck (JSON_C_PATCHCMD json-c)
-umbrella_testcommand (json-c JSON_C_TESTCMD
-    TEST_COMMAND "" )
+umbrella_testcommand (json-c JSON_C_TESTCMD "" )
 
 #
 # create deltafs-nexus target

diff --git a/umbrella/umbrella/kokkos.cmake b/umbrella/umbrella/kokkos.cmake
@@ -0,0 +1,42 @@
+#
+# kokkos.cmake  umbrella for kokkos
+# 10-May-2023  ankushj@andrew.cmu.edu
+#
+
+#
+# config:
+#  KOKKOS_REPO - url of git repository
+#  KOKKOS_TAG  - tag to checkout of git
+#  KOKKOS_TAR  - cache tar file name (default should be ok)
+#
+
+if (NOT TARGET kokkos)
+
+umbrella_defineopt (KOKKOS_REPO "https://github.com/kokkos/kokkos.git"
+     STRING "KOKKOS GIT repository")
+umbrella_defineopt (KOKKOS_TAG "4.0.01" STRING "KOKKOS GIT tag")
+umbrella_defineopt (KOKKOS_TAR "kokkos-${KOKKOS_TAG}.tar.gz"
+     STRING "KOKKOS cache tar file")
+#
+# generate parts of the ExternalProject_Add args...
+#
+umbrella_download (KOKKOS_DOWNLOAD kokkos
+                   ${KOKKOS_TAR}
+                   GIT_REPOSITORY ${KOKKOS_REPO}
+                   GIT_TAG ${KOKKOS_TAG})
+umbrella_patchcheck (KOKKOS_PATCHCMD kokkos)
+# TODO: hook up tests (also add to ExternalProject_Add)
+# umbrella_testcommand (kokkos KOKKOS_TESTCMD
+#                       ctest -R preload -V )
+
+#
+# create kokkos target
+#
+ExternalProject_Add (kokkos
+    ${KOKKOS_DOWNLOAD} ${KOKKOS_PATCHCMD}
+    CMAKE_ARGS -DKokkos_ENABLE_AGGRESSIVE_VECTORIZATION=ON
+    CMAKE_CACHE_ARGS ${UMBRELLA_CMAKECACHE}
+    UPDATE_COMMAND ""
+)
+
+endif (NOT TARGET kokkos)
diff --git a/umbrella/umbrella/margo.cmake b/umbrella/umbrella/margo.cmake
@@ -29,7 +29,7 @@ umbrella_download (MARGO_DOWNLOAD margo ${MARGO_TAR}
                    GIT_REPOSITORY ${MARGO_REPO}
                    GIT_TAG ${MARGO_TAG})
 umbrella_patchcheck (MARGO_PATCHCMD margo)
-umbrella_testcommand (margo MARGO_TESTCMD TEST_COMMAND make check)
+umbrella_testcommand (margo MARGO_TESTCMD make check)
 
 #
 # depends

diff --git a/umbrella/umbrella/mercury-progressor.cmake b/umbrella/umbrella/mercury-progressor.cmake
@@ -33,7 +33,7 @@ umbrella_download (MERCURY_PROGRESSOR_DOWNLOAD
                    GIT_TAG ${MERCURY_PROGRESSOR_TAG})
 umbrella_patchcheck (MERCURY_PROGRESSOR_PATCHCMD mercury-progressor)
 umbrella_testcommand (mercury-progressor MERCURY_PROGRESSOR_TESTCMD
-    TEST_COMMAND ctest )
+    ctest )
 
 #
 # depends

diff --git a/umbrella/umbrella/mercury-runner.cmake b/umbrella/umbrella/mercury-runner.cmake
@@ -8,6 +8,7 @@
 #  MERCURY_RUNNER_REPO - url of git repository
 #  MERCURY_RUNNER_TAG  - tag to checkout of git
 #  MERCURY_RUNNER_TAR  - cache tar file name (default should be ok)
+#  MERCURY_RUNNER_PROGESSOR - use mercury progressor
 #
 
 if (NOT TARGET mercury-runner)
@@ -22,6 +23,8 @@ umbrella_defineopt (MERCURY_RUNNER_TAG "master" STRING "mercury-runner GIT tag")
 umbrella_defineopt (MERCURY_RUNNER_TAR 
      "mercury-runner-${MERCURY_RUNNER_TAG}.tar.gz"
      STRING "mercury-runner cache tar file")
+umbrella_defineopt (MERCURY_RUNNER_PROGESSOR "Off" BOOL
+     "use mercury-progressor network progress")
 
 #
 # generate parts of the ExternalProject_Add args...
@@ -34,14 +37,19 @@ umbrella_patchcheck (MERCURY_RUNNER_PATCHCMD mercury-runner)
 #
 # depends
 #
+unset(extradeps)
 include (umbrella/mercury)
+if (MERCURY_RUNNER_PROGESSOR)
+    include (umbrella/mercury-progressor)
+    list (APPEND extradeps mercury-progressor)
+endif ()
 
 #
 # create mercury-runner target
 #
-ExternalProject_Add (mercury-runner DEPENDS mercury
+ExternalProject_Add (mercury-runner DEPENDS mercury ${extradeps}
     ${MERCURY_RUNNER_DOWNLOAD} ${MERCURY_RUNNER_PATCHCMD}
-    CMAKE_ARGS -DMPI=ON
+    CMAKE_ARGS -DMPI=ON -DPROGRESSOR=${MERCURY_RUNNER_PROGESSOR}
     CMAKE_CACHE_ARGS ${UMBRELLA_CMAKECACHE}
     UPDATE_COMMAND ""
 )

diff --git a/umbrella/umbrella/mssg.cmake b/umbrella/umbrella/mssg.cmake
@@ -31,8 +31,8 @@ umbrella_download (MSSG_DOWNLOAD mssg ${MSSG_TAR}
                    GIT_TAG ${MSSG_TAG})
 umbrella_patchcheck (MSSG_PATCHCMD mssg)
 umbrella_testcommand (mssg MSSG_TESTCMD
-    ### TEST_COMMAND "ctest -R mssg -V"
-    TEST_COMMAND "" )
+    ### "ctest -R mssg -V"
+    "" )
 
 #
 # depends

diff --git a/umbrella/umbrella/mvapich.cmake b/umbrella/umbrella/mvapich.cmake
@@ -22,9 +22,9 @@ umbrella_defineopt (MVAPICH_BASEURL
     "http://mvapich.cse.ohio-state.edu/download/mvapich"
     STRING "base url for mvapich")
 umbrella_defineopt (MVAPICH_URLDIR "mv2" STRING "mvapich subdir")
-umbrella_defineopt (MVAPICH_URLFILE "mvapich2-2.3.6.tar.gz"
+umbrella_defineopt (MVAPICH_URLFILE "mvapich2-2.3.7-1.tar.gz"
     STRING "mvapich tar file name")
-umbrella_defineopt (MVAPICH_URLMD5 "3972f5db02bd4b30e073bb092fa5deb1"
+umbrella_defineopt (MVAPICH_URLMD5 "22f78ec18d417781ff803943ae62d6a9"
     STRING "MD5 of tar file")
 #
 # XXX: default dev is ch3:mrail

diff --git a/umbrella/umbrella/parthenon.cmake b/umbrella/umbrella/parthenon.cmake
@@ -0,0 +1,71 @@
+#
+# parthenon.cmake  umbrella for parthenon
+# 10-May-2023  ankushj@andrew.cmu.edu
+#
+
+#
+# config:
+#  PARTHENON_REPO - url of git repository
+#  PARTHENON_TAG  - tag to checkout of git
+#  PARTHENON_TAR  - cache tar file name (default should be ok)
+#
+
+if (NOT TARGET parthenon)
+
+umbrella_defineopt (PARTHENON_REPO "https://github.com/anku94/parthenon.git"
+     STRING "PARTHENON GIT repository")
+umbrella_defineopt (PARTHENON_TAG "develop" STRING "PARTHENON GIT tag")
+umbrella_defineopt (PARTHENON_TAR "parthenon-${PARTHENON_TAG}.tar.gz"
+     STRING "PARTHENON cache tar file")
+#
+# generate parts of the ExternalProject_Add args...
+#
+umbrella_download (PARTHENON_DOWNLOAD parthenon
+                   ${PARTHENON_TAR}
+                   GIT_REPOSITORY ${PARTHENON_REPO}
+                   GIT_TAG ${PARTHENON_TAG})
+umbrella_patchcheck (PARTHENON_PATCHCMD parthenon)
+# TODO: hook up tests (also add to ExternalProject_Add)
+# umbrella_testcommand (parthenon PARTHENON_TESTCMD
+#                       ctest -R preload -V )
+
+#
+# depends
+#
+set (PARTHENON_DEPENDS amr-tools)
+include (umbrella/amr-tools)
+
+if (NOT PARTHENON_DISABLE_HDF5)
+    set (PARTHENON_DEPENDS ${PARTHENON_DEPENDS} hdf5)
+endif()
+
+if (PARTHENON_DISABLE_OPENMP) 
+  set (KOKKOS_ENABLE_OPENMP OFF)
+else()
+  set (KOKKOS_ENABLE_OPENMP ON)
+endif()
+
+set (PARTHENON_CMAKE_ARGS 
+  -DBUILD_SHARED_LIBS=ON 
+  -DTAU_ROOT=${CMAKE_INSTALL_PREFIX}
+  -DPARTHENON_DISABLE_HDF5=${PARTHENON_DISABLE_HDF5} 
+  -DPARTHENON_DISABLE_OPENMP=${PARTHENON_DISABLE_OPENMP}
+  -DPARTHENON_ENABLE_TESTING=OFF
+  -DKokkos_ENABLE_OPENMP=${Kokkos_ENABLE_OPENMP})
+
+if (UMBRELLA_MPI_DEPS)
+    include (umbrella/${UMBRELLA_MPI_DEPS})
+endif()
+
+#
+# create parthenon target
+#
+ExternalProject_Add (parthenon
+    DEPENDS ${PARTHENON_DEPENDS}
+    ${PARTHENON_DOWNLOAD} ${PARTHENON_PATCHCMD}
+    CMAKE_ARGS ${PARTHENON_CMAKE_ARGS}
+    CMAKE_CACHE_ARGS ${UMBRELLA_CMAKECACHE}
+    UPDATE_COMMAND ""
+)
+
+endif (NOT TARGET parthenon)