diff --git a/.gitignore b/.gitignore index a8e6e47a87..ee9ae770e9 100644 --- a/.gitignore +++ b/.gitignore @@ -3,7 +3,6 @@ build transport lib/*-build lib/checkpoint -lib/detector lib/googletest lib/kokkos .emacs.desktop diff --git a/ci/build_cpp.sh b/ci/build_cpp.sh index 6207215553..ddb76f1d5b 100755 --- a/ci/build_cpp.sh +++ b/ci/build_cpp.sh @@ -6,7 +6,6 @@ source_dir=${1} build_dir=${2} # Dependency versions, when fetched via git. -detector_rev=master checkpoint_rev=develop if test "${VT_DOXYGEN_ENABLED:-0}" -eq 1 @@ -38,40 +37,11 @@ fi mkdir -p "${build_dir}" pushd "${build_dir}" -if test -d "detector" -then - rm -Rf detector -fi - if test -d "checkpoint" then rm -Rf checkpoint fi -if test -d "${source_dir}/lib/detector" -then - { echo "Detector already in lib... not downloading, building, and installing"; } 2>/dev/null -else - if test "${VT_DOXYGEN_ENABLED:-0}" -eq 1 - then - cd "${source_dir}/lib" - git clone -b "${detector_rev}" --depth 1 https://github.com/DARMA-tasking/detector.git - cd - - else - git clone -b "${detector_rev}" --depth 1 https://github.com/DARMA-tasking/detector.git - export DETECTOR=$PWD/detector - export DETECTOR_BUILD=${build_dir}/detector - mkdir -p "$DETECTOR_BUILD" - cd "$DETECTOR_BUILD" - mkdir build - cd build - cmake -G "${CMAKE_GENERATOR:-Ninja}" \ - -DCMAKE_INSTALL_PREFIX="$DETECTOR_BUILD/install" \ - "$DETECTOR" - cmake --build . ${dashj} --target install - fi -fi - if test -d "${source_dir}/lib/checkpoint" then { echo "Checkpoint already in lib... not downloading, building, and installing"; } 2>/dev/null @@ -91,7 +61,6 @@ else cd build cmake -G "${CMAKE_GENERATOR:-Ninja}" \ -DCMAKE_INSTALL_PREFIX="$CHECKPOINT_BUILD/install" \ - -Ddetector_DIR="$DETECTOR_BUILD/install" \ "$CHECKPOINT" cmake --build . ${dashj} --target install fi @@ -144,7 +113,6 @@ cmake -G "${CMAKE_GENERATOR:-Ninja}" \ -DCMAKE_CXX_COMPILER="${CXX:-c++}" \ -DCMAKE_C_COMPILER="${CC:-cc}" \ -DCMAKE_EXE_LINKER_FLAGS="${CMAKE_EXE_LINKER_FLAGS:-}" \ - -Ddetector_DIR="$DETECTOR_BUILD/install" \ -Dcheckpoint_DIR="$CHECKPOINT_BUILD/install" \ -DCMAKE_PREFIX_PATH="${CMAKE_PREFIX_PATH:-}" \ -DCMAKE_INSTALL_PREFIX="$VT_BUILD/install" \ diff --git a/ci/build_vt_sample.sh b/ci/build_vt_sample.sh index 1d220e47aa..84c60a8ad2 100755 --- a/ci/build_vt_sample.sh +++ b/ci/build_vt_sample.sh @@ -21,8 +21,7 @@ then export VT=${source_dir} export VT_BUILD=${build_dir}/vt export VT_INSTALL=${VT_BUILD}/install - export DETECTOR=${build_dir}/detector - export CHECKPOINT=${DETECTOR}/build/checkpoint + export CHECKPOINT=${build_dir}/checkpoint/install cd "$VT_BUILD" @@ -45,7 +44,6 @@ then cmake -G "${CMAKE_GENERATOR:-Ninja}" \ -Dvt_DIR="${VT}" \ -Dcheckpoint_DIR="${CHECKPOINT}" \ - -Ddetector_DIR="${DETECTOR}" \ -Dkokkos_DISABLE:BOOL=1 \ -Dkokkos_kernels_DISABLE:BOOL=1 \ -Dvt_trace_only="1" \ diff --git a/ci/ctest_build_all.sh b/ci/ctest_build_all.sh index a0d83754e5..59fcc5fffd 100755 --- a/ci/ctest_build_all.sh +++ b/ci/ctest_build_all.sh @@ -6,7 +6,6 @@ source_dir=${1} build_dir=${2} # Dependency versions, when fetched via git. -detector_rev=master checkpoint_rev=develop if test "${VT_DOXYGEN_ENABLED:-0}" -eq 1 @@ -40,40 +39,11 @@ fi mkdir -p "${build_dir}" pushd "${build_dir}" -if test -d "detector" -then - rm -Rf detector -fi - if test -d "checkpoint" then rm -Rf checkpoint fi -if test -d "${source_dir}/lib/detector" -then - { echo "Detector already in lib... not downloading, building, and installing"; } 2>/dev/null -else - if test "${VT_DOXYGEN_ENABLED:-0}" -eq 1 - then - cd "${source_dir}/lib" - git clone -b "${detector_rev}" --depth 1 https://github.com/DARMA-tasking/detector.git - cd - - else - git clone -b "${detector_rev}" --depth 1 https://github.com/DARMA-tasking/detector.git - export DETECTOR=$PWD/detector - export DETECTOR_BUILD=${build_dir}/detector - mkdir -p "$DETECTOR_BUILD" - cd "$DETECTOR_BUILD" - mkdir build - cd build - cmake -G "${CMAKE_GENERATOR:-Ninja}" \ - -DCMAKE_INSTALL_PREFIX="$DETECTOR_BUILD/install" \ - "$DETECTOR" - cmake --build . ${dashj} --target install - fi -fi - if test -d "${source_dir}/lib/checkpoint" then { echo "Checkpoint already in lib... not downloading, building, and installing"; } 2>/dev/null @@ -93,7 +63,6 @@ else cd build cmake -G "${CMAKE_GENERATOR:-Ninja}" \ -DCMAKE_INSTALL_PREFIX="$CHECKPOINT_BUILD/install" \ - -Ddetector_DIR="$DETECTOR_BUILD/install" \ "$CHECKPOINT" cmake --build . ${dashj} --target install fi diff --git a/ci/ctest_job_script.cmake b/ci/ctest_job_script.cmake index 7a592684b9..b6d354dc2f 100644 --- a/ci/ctest_job_script.cmake +++ b/ci/ctest_job_script.cmake @@ -148,7 +148,6 @@ set(configureOpts "-DCMAKE_CXX_COMPILER=$ENV{CXX}" "-DCMAKE_C_COMPILER=$ENV{CC}" "-DCMAKE_EXE_LINKER_FLAGS=$ENV{CMAKE_EXE_LINKER_FLAGS}" - "-Ddetector_DIR=$ENV{DETECTOR_BUILD}/install" "-Dcheckpoint_DIR=$ENV{CHECKPOINT_BUILD}/install" "-DCMAKE_PREFIX_PATH=$ENV{CMAKE_PREFIX_PATH}" "-DCMAKE_INSTALL_PREFIX=$ENV{VT_BUILD}/install" diff --git a/cmake/link_vt.cmake b/cmake/link_vt.cmake index e02c7a0651..b85f79dff0 100644 --- a/cmake/link_vt.cmake +++ b/cmake/link_vt.cmake @@ -27,7 +27,6 @@ function(link_target_with_vt) LINK_ZLIB LINK_FCONTEXT LINK_CHECKPOINT - LINK_DETECTOR LINK_CLI11 LINK_DL LINK_ZOLTAN @@ -194,15 +193,6 @@ function(link_target_with_vt) ) endif() - if (NOT DEFINED ARG_LINK_DETECTOR AND ${ARG_DEFAULT_LINK_SET} OR ARG_LINK_DETECTOR) - if (${ARG_DEBUG_LINK}) - message(STATUS "link_target_with_vt: detector=${ARG_LINK_DETECTOR}") - endif() - target_link_libraries( - ${ARG_TARGET} PUBLIC ${ARG_BUILD_TYPE} vt::lib::detector - ) - endif() - if (NOT DEFINED ARG_LINK_CLI11 AND ${ARG_DEFAULT_LINK_SET} OR ARG_LINK_CLI11) if (${ARG_DEBUG_LINK}) message(STATUS "link_target_with_vt: cli11=${ARG_LINK_CLI11}") diff --git a/cmake/load_local_packages.cmake b/cmake/load_local_packages.cmake index ac98393db5..029d8bd96e 100644 --- a/cmake/load_local_packages.cmake +++ b/cmake/load_local_packages.cmake @@ -5,15 +5,6 @@ include(cmake/local_package.cmake) -if (EXISTS "${PROJECT_LIB_DIR}/detector") - add_subdirectory(${PROJECT_LIB_DIR}/detector) -else() - # require directories for these packages - require_pkg_directory(detector "VT detector library") - # find these required packages locally - find_package_local(detector "${detector_DIR}" detector) -endif() - if (EXISTS "${PROJECT_LIB_DIR}/checkpoint") add_subdirectory(${PROJECT_LIB_DIR}/checkpoint) else() diff --git a/cmake/load_packages.cmake b/cmake/load_packages.cmake index b3c8eb05c7..01c60990e4 100644 --- a/cmake/load_packages.cmake +++ b/cmake/load_packages.cmake @@ -1,6 +1,6 @@ get_directory_property(projHasParent PARENT_DIRECTORY) -# Local packages that VT depends on (detector/checkpoint) +# Local packages that VT depends on: checkpoint include(cmake/load_local_packages.cmake) # MPI package diff --git a/cmake/vtConfig.cmake.in b/cmake/vtConfig.cmake.in index 357a389d9b..97a179750d 100644 --- a/cmake/vtConfig.cmake.in +++ b/cmake/vtConfig.cmake.in @@ -18,11 +18,6 @@ include(CMakeFindDependencyMacro) find_dependency(MPI REQUIRED) -if (@detector_PACKAGE_LOADED@) - set (detector_DIR @detector_DIR@) - find_dependency(detector REQUIRED HINTS @detector_DIR@) -endif() - if (@checkpoint_PACKAGE_LOADED@) set (checkpoint_DIR @checkpoint_DIR@) find_dependency(checkpoint REQUIRED HINTS @checkpoint_DIR@) diff --git a/docs/Doxyfile.in-mcss b/docs/Doxyfile.in-mcss index aa8bc4751f..8d1fd5803e 100644 --- a/docs/Doxyfile.in-mcss +++ b/docs/Doxyfile.in-mcss @@ -14,7 +14,7 @@ M_LINKS_NAVBAR1 = \ M_LINKS_NAVBAR2 = \ "annotated" \ "files" \ - "GitHub Checkpoint Detector LBAF Checkpoint Analyzer Documentation" + "GitHub Checkpoint LBAF Checkpoint Analyzer Documentation" ALIASES += \ diff --git a/docs/md/building.md b/docs/md/building.md index 77cea6e7d1..d47c2b7048 100644 --- a/docs/md/building.md +++ b/docs/md/building.md @@ -9,21 +9,19 @@ external dependencies come bundled with \vt for ease of compiling. To build \vt, one must obtain the following dependencies: \subsection required-deps Required - - detector, (*vt* ecosystem) - checkpoint, (*vt* ecosystem) - MPI (mpich/openmpi/mvapich/IBM Spectrum MPI/Cray MPICH/etc.) \subsection automatic-build-deps Automatically build dependencies -Assuming MPI is installed and accessible via CC/CXX, the only other dependencies -that are required are checkpoint and detector. The easiest way to get these -built are to clone them inside `vt/lib`: +Assuming MPI is installed and accessible via CC/CXX, the only other dependency +that is required is checkpoint. The easiest way to get these +built are to clone it inside `vt/lib`: ```bash $ git clone git@github.com:DARMA-tasking/vt $ cd vt/lib $ git clone git@github.com:DARMA-tasking/checkpoint -$ git clone git@github.com:DARMA-tasking/detector ``` With these in `vt/lib`, cmake will automatically build them and stitch them into @@ -31,7 +29,7 @@ With these in `vt/lib`, cmake will automatically build them and stitch them into \subsection use-cmake-directly-vars Using cmake directly -One may use `cmake` as normal on *vt*, with checkpoint and detector cloned in +One may use `cmake` as normal on *vt*, with checkpoint cloned in `vt/lib` to compile them all together as explained above. The following are some custom configuration build options that can be provided to `cmake` to change the build configuration: diff --git a/docs/md/mainpage.md b/docs/md/mainpage.md index 270b84eb70..7583c0aa63 100644 --- a/docs/md/mainpage.md +++ b/docs/md/mainpage.md @@ -27,7 +27,6 @@ supercomputer architectures. The main public repositories are: | ---------------------------------- | -------------------------------------------------------------- | -------------------------- | | HPC Runtime | @m_span{m-text m-success} DARMA/vt @m_endspan (Virtual Transport) | [Github](https://github.com/DARMA-tasking/vt) | | HPC Serialization | @m_span{m-text m-success} DARMA/checkpoint @m_endspan (Checkpointing and Serialization Library) | [Github](https://github.com/DARMA-tasking/checkpoint) | -| C++ trait detection and checking | @m_span{m-text m-success} DARMA/detector @m_endspan (C++ trait detector) | [Github](https://github.com/DARMA-tasking/detector) | | HPC LB Simulator | @m_span{m-text m-success} DARMA/LBAF @m_endspan (Load Balancing Analysis Framework) | [Github](https://github.com/DARMA-tasking/LB-analysis-framework) | | HPC Serializer compiler analyzer | @m_span{m-text m-success} DARMA/checkpoint-analyzer @m_endspan (Static verification of serializers) | [Github](https://github.com/DARMA-tasking/checkpoint-member-analyzer) | | Toolkit documentation | @m_span{m-text m-success} DARMA/docs @m_endspan | [Docs](https://github.com/DARMA-tasking/DARMA-tasking.github.io) | diff --git a/src/vt/topos/index/traits/traits.h b/src/vt/topos/index/traits/traits.h index bd17a1248b..f6a7260f0c 100644 --- a/src/vt/topos/index/traits/traits.h +++ b/src/vt/topos/index/traits/traits.h @@ -50,7 +50,7 @@ #include #include -#include "detector_headers.h" +#include "checkpoint/detector.h" namespace vt { namespace index { diff --git a/src/vt/vrt/collection/traits/coll_msg.h b/src/vt/vrt/collection/traits/coll_msg.h index aeeb8afb2c..a3c7785c0b 100644 --- a/src/vt/vrt/collection/traits/coll_msg.h +++ b/src/vt/vrt/collection/traits/coll_msg.h @@ -46,7 +46,7 @@ #include "vt/config.h" -#include "detector_headers.h" +#include "checkpoint/detector.h" namespace vt { namespace vrt { namespace collection {