From c31b0b18b7802b8fcb76006023113c8bb3616781 Mon Sep 17 00:00:00 2001 From: Scott Todd Date: Wed, 1 Jul 2026 11:35:42 -0700 Subject: [PATCH] Delete therock-boost now that it is no longer used --- core/CMakeLists.txt | 1 - math-libs/BLAS/CMakeLists.txt | 2 - math-libs/CMakeLists.txt | 2 - third-party/CMakeLists.txt | 1 - third-party/boost/CMakeLists.txt | 52 ------------- .../boost/cmake_project/CMakeLists.txt | 74 ------------------- 6 files changed, 132 deletions(-) delete mode 100644 third-party/boost/CMakeLists.txt delete mode 100644 third-party/boost/cmake_project/CMakeLists.txt diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt index 32c799a68cc..4de3fb77894 100644 --- a/core/CMakeLists.txt +++ b/core/CMakeLists.txt @@ -554,7 +554,6 @@ if(THEROCK_BUILD_TESTING AND THEROCK_ENABLE_CORE_HIPTESTS) -DCMAKE_BUILD_WITH_INSTALL_RPATH=ON BUILD_DEPS rocm-cmake - therock-boost therock-catch2 RUNTIME_DEPS hip-clr diff --git a/math-libs/BLAS/CMakeLists.txt b/math-libs/BLAS/CMakeLists.txt index b9020e91fb9..c65286cf609 100644 --- a/math-libs/BLAS/CMakeLists.txt +++ b/math-libs/BLAS/CMakeLists.txt @@ -69,7 +69,6 @@ if(_enable_rocRoller) BUILD_DEPS mxDataGenerator rocm-cmake - therock-boost therock-catch2 therock-fmt therock-googletest @@ -112,7 +111,6 @@ set(hipBLASLt_rocRoller_deps) if(_enable_rocRoller) list(APPEND hipBLASLt_rocRoller_build_deps mxDataGenerator - therock-boost therock-fmt therock-yaml-cpp therock-spdlog diff --git a/math-libs/CMakeLists.txt b/math-libs/CMakeLists.txt index a312fdec87e..5410993643e 100644 --- a/math-libs/CMakeLists.txt +++ b/math-libs/CMakeLists.txt @@ -299,7 +299,6 @@ if(THEROCK_ENABLE_FFT) amd-hip BUILD_DEPS rocm-cmake - therock-boost therock-googletest therock-fftw3 therock-fftw3f @@ -335,7 +334,6 @@ if(THEROCK_ENABLE_FFT) amd-hip BUILD_DEPS rocm-cmake - therock-boost therock-googletest therock-fftw3 therock-fftw3f diff --git a/third-party/CMakeLists.txt b/third-party/CMakeLists.txt index 7e65ea229ba..6db544903b8 100644 --- a/third-party/CMakeLists.txt +++ b/third-party/CMakeLists.txt @@ -10,7 +10,6 @@ add_custom_target(therock-third-party) # No-dep third party libraries (alphabetical) -add_subdirectory(boost) add_subdirectory(Catch2) add_subdirectory(eigen) add_subdirectory(fftw3) diff --git a/third-party/boost/CMakeLists.txt b/third-party/boost/CMakeLists.txt deleted file mode 100644 index 7e68c2aa493..00000000000 --- a/third-party/boost/CMakeLists.txt +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright Advanced Micro Devices, Inc. -# SPDX-License-Identifier: MIT - -# Installs a limited subset of boost sufficient to build ROCM subprojects. -# Currently, this includes: -# atomic -# filesystem -# multi_index -# system -# Static libraries only -# Release build -# Multithreaded -# See cmake_project/CMakeLists.txt for details. -set(_source_dir "${CMAKE_CURRENT_BINARY_DIR}/source") -set(_download_stamp "${_source_dir}/download.stamp") - -therock_subproject_fetch(boost-sources - SOURCE_DIR "${_source_dir}" - # Originally mirrored from: "https://archives.boost.io/release/1.87.0/source/boost_1_87_0.tar.bz2" - # with `libs\wave\test\testwave\testfiles\utf8-test*` removed. - URL "https://rocm-third-party-deps.s3.us-east-2.amazonaws.com/boost_1_87_0-1.tar.bz2" - URL_HASH "SHA256=0ba4085a0beb3b9c57fa617d09110c79e977a9944750cd93fb17d82807a8c64c" - TOUCH "${_download_stamp}" -) - -therock_cmake_subproject_declare(therock-boost - EXTERNAL_SOURCE_DIR "cmake_project" - USE_DIST_AMDGPU_TARGETS - EXCLUDE_FROM_ALL - NO_MERGE_COMPILE_COMMANDS - BACKGROUND_BUILD - OUTPUT_ON_FAILURE - CMAKE_ARGS - "-DBOOST_SOURCE_DIR=${_source_dir}" - "-DTHEROCK_BOOST_LIBRARIES=atomic,filesystem,multi_index,system" - EXTRA_DEPENDS - "${_download_stamp}" -) -# Important: Version number here must match the version downloaded above. -# Check the install directory if in doubt (i.e. run `ninja therock-boost` and -# see what the install layout is). -set(_boost_version 1.87.0) -# Advertise the Boost meta package and each supported sub-library. Must be -# kept in sync with above library list. -therock_cmake_subproject_provide_package(therock-boost Boost "lib/cmake/Boost-${_boost_version}") -therock_cmake_subproject_provide_package(therock-boost boost_atomic "lib/cmake/boost_atomic-${_boost_version}") -therock_cmake_subproject_provide_package(therock-boost boost_filesystem "lib/cmake/boost_filesystem-${_boost_version}") -therock_cmake_subproject_provide_package(therock-boost boost_headers "lib/cmake/boost_headers-${_boost_version}") -therock_cmake_subproject_provide_package(therock-boost boost_system "lib/cmake/boost_system-${_boost_version}") -therock_cmake_subproject_activate(therock-boost) - -add_dependencies(therock-third-party therock-boost) diff --git a/third-party/boost/cmake_project/CMakeLists.txt b/third-party/boost/cmake_project/CMakeLists.txt deleted file mode 100644 index 8a1acc01cde..00000000000 --- a/third-party/boost/cmake_project/CMakeLists.txt +++ /dev/null @@ -1,74 +0,0 @@ -# Copyright Advanced Micro Devices, Inc. -# SPDX-License-Identifier: MIT - -cmake_minimum_required(VERSION 3.18) - -project(BOOST_BUILD) - -include(ProcessorCount) -ProcessorCount(PROCESSOR_COUNT) - -# Limit Boost B2 threads to 1 by default unless more than 8 cpu threads available -set(B2_NJOBS "1") -if(PROCESSOR_COUNT GREATER 8) - set(B2_NJOBS "8") -endif() -message(STATUS "Setting b2 jobs to: ${B2_NJOBS} / ${PROCESSOR_COUNT} cpu threads") - -set(_terminal_option) -if("$ENV{THEROCK_INTERACTIVE}") - set(_terminal_option "USES_TERMINAL") -endif() - -set(_b2_args -j "${B2_NJOBS}" link=static threading=multi variant=release) - -if(WIN32) - # The boost batch file does not handle --with-libraries and silently builds - # everything. So we run the bootstrap command. And then we run another command - # that we generate in order to add the libraries stanza. - # Have I mentioned before how painful it is to integrate Boost? - string(REPLACE "," ";" boost_libraries_list "${THEROCK_BOOST_LIBRARIES}") - set(_config_content "echo libraries =") - foreach(_boost_lib ${boost_libraries_list}) - string(APPEND _config_content " --with-${_boost_lib}") - endforeach() - string(APPEND _config_content " ; >> project-config.jam\n\n") - file(CONFIGURE OUTPUT "${BOOST_SOURCE_DIR}/fix_libraries.bat" - CONTENT "${_config_content}" - ) - message(STATUS "Adding windows boost config: ${_config_content}") - set(_bootstrap_commands - COMMAND - "cmd.exe" "/C" "bootstrap.bat" - COMMAND - "cmd.exe" "/C" "fix_libraries.bat" - ) - - if(MSVC) - list(APPEND _b2_args msvc) - endif() - if(CMAKE_SYSTEM_PROCESSOR MATCHES "(x86)|(X86)|(amd64)|(AMD64)") - # Don't generate x32 libraries. - list(APPEND _b2_args "architecture=x86" "address-model=64") - endif() -else() - # The unix bootstrap script takes a --with-libraries parameter. - list(APPEND _b2_args "cflags=-fPIC") - set(_bootstrap_commands - COMMAND - bash "bootstrap.sh" "--with-libraries=${THEROCK_BOOST_LIBRARIES}" - ) -endif() - -message(STATUS "b2 args: ${_b2_args}") - -add_custom_target( - bootstrap_and_build ALL - ${_terminal_option} - WORKING_DIRECTORY "${BOOST_SOURCE_DIR}" - ${_bootstrap_commands} - COMMAND - "${BOOST_SOURCE_DIR}/b2" ${_b2_args} - --stagedir="${CMAKE_BINARY_DIR}/b2_out" - --prefix="${CMAKE_INSTALL_PREFIX}" install -)