[SYCL] Bump boost to 1.85.0 and trim dependencies (#14163)

oneapi-src · Jun 27, 2024 · 3767874 · 3767874
1 parent 7e96cc9
commit 3767874
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 67 deletions.
diff --git a/sycl/cmake/modules/AddBoostMp11Headers.cmake b/sycl/cmake/modules/AddBoostMp11Headers.cmake
@@ -5,9 +5,9 @@ include(FetchContent)
 
 set(BOOST_MP11_GIT_REPO https://github.com/boostorg/mp11.git)
 # Author: pdimov
-# Date: Jun 23, 2023
-# Release: boost-1.83.0
-set(BOOST_MP11_GIT_TAG ef7608b463298b881bc82eae4f45a4385ed74fca)
+# Date: Dec 31, 2023
+# Release: boost-1.85.0
+set(BOOST_MP11_GIT_TAG 863d8b8d2b20f2acd0b5870f23e553df9ce90e6c)
 
 # Either download from github or use existing if BOOST_MP11_SOURCE_DIR is set
 if (NOT DEFINED BOOST_MP11_SOURCE_DIR)

diff --git a/sycl/cmake/modules/FetchBoostUnorderedHeaders.cmake b/sycl/cmake/modules/FetchBoostUnorderedHeaders.cmake
@@ -27,103 +27,75 @@ function(add_boost_module_headers)
   set(BOOST_UNORDERED_INCLUDE_DIRS ${BOOST_UNORDERED_INCLUDE_DIRS} "${BOOST_MODULE_SRC_DIR}/include" PARENT_SCOPE)
 endfunction(add_boost_module_headers)
 
-set(BOOST_UNORDERED_GIT_TAG bd24dfd284dbc70e7521915af0d8d049f74a1e85)
-# Author: joaquintides <joaquin@tid.es>
-# Date:   Tue Jul 18 18:19:13 2023 +0200
+set(BOOST_UNORDERED_GIT_TAG 5e6b9291deb55567d41416af1e77c2516dc1250f)
+# Merge: 15cfef69 ccf9a76e
+# Author: joaquintides <joaquin.lopezmunoz@gmail.com>
+# Date:   Sat Mar 16 09:18:41 2024 +0100
 #
-#     updated concurrent map benchmark plots
+#     Merge pull request #238 from boostorg/fix/gh-237
 add_boost_module_headers(NAME "unordered" SRC_DIR ${BOOST_UNORDERED_SOURCE_DIR} GIT_TAG ${BOOST_UNORDERED_GIT_TAG})
 
-set(BOOST_ASSERT_GIT_TAG 02256c84fd0cd58a139d9dc1b25b5019ca976ada)
+set(BOOST_ASSERT_GIT_TAG 447e0b3a331930f8708ade0e42683d12de9dfbc3)
 # Author: Peter Dimov <pdimov@gmail.com>
-# Date:   Thu Jun 22 18:11:58 2023 +0300
+# Date:   Sat Feb 3 20:43:55 2024 +0200
 #
-#     Do not use std::source_location::current under nvcc. Fixes #32.
+#     Use __builtin_FUNCSIG() under MSVC 19.35+. Fixes #35.
 add_boost_module_headers(NAME "assert" SRC_DIR ${BOOST_ASSERT_SOURCE_DIR} GIT_TAG ${BOOST_ASSERT_GIT_TAG})
 
-set(BOOST_CONFIG_GIT_TAG a1cf5d531405e62927b0257b5cbecc66a545b508)
-# Merge: f5726a26 a1edcd56
+set(BOOST_CONFIG_GIT_TAG 11385ec21012926e15a612e3bf9f9a71403c1e5b)
+# Merge: eef05e98 601598f8
 # Author: jzmaddock <john@johnmaddock.co.uk>
-# Date:   Sat Apr 15 13:20:12 2023 +0100
+# Date:   Sun Feb 4 09:46:22 2024 +0000
 #
-#     Merge pull request #475 from boostorg/ci_2023_04
+#     Merge branch 'develop'
 add_boost_module_headers(NAME "config" SRC_DIR ${BOOST_CONFIG_SOURCE_DIR} GIT_TAG ${BOOST_CONFIG_GIT_TAG})
 
-set(BOOST_CONTAINER_HASH_GIT_TAG 226eb066e949adbf37b220e993d64ecefeeaae99)
+set(BOOST_CONTAINER_HASH_GIT_TAG 6d214eb776456bf17fbee20780a034a23438084f)
 # Author: Peter Dimov <pdimov@gmail.com>
-# Date:   Thu Jun 29 14:38:53 2023 +0300
+# Date:   Wed Mar 6 05:13:53 2024 +0200
 #
-#     Update .drone.jsonnet
+#     Update .appveyor.yml
 add_boost_module_headers(NAME "container_hash" SRC_DIR ${BOOST_CONTAINER_HASH_SOURCE_DIR} GIT_TAG ${BOOST_CONTAINER_HASH_GIT_TAG})
 
-set(BOOST_CORE_GIT_TAG 216999e552e7f73e63c7bcc88b8ce9c179bbdbe2)
-# Author: Peter Dimov <pdimov@gmail.com>
-# Date:   Sun Jun 25 13:46:53 2023 +0300
+set(BOOST_CORE_GIT_TAG 083b41c17e34f1fc9b43ab796b40d0d8bece685c)
+# Merge: 8cc2fda a973490
+# Author: Andrey Semashev <Lastique@users.noreply.github.com>
+# Date:   Tue Mar 19 18:10:04 2024 +0300
 #
-#     Avoid -Wsign-conversion warning in checked_delete.hpp
+#     Merge pull request #169 from k3DW/feature/168
 add_boost_module_headers(NAME "core" SRC_DIR ${BOOST_CORE_SOURCE_DIR} GIT_TAG ${BOOST_CORE_GIT_TAG})
 
 # Describe is a dependency of container_hash
-set(BOOST_DESCRIBE_GIT_TAG a0eafb08100eb15a57b6dae6d270c0012a56aa21)
-# Merge: 1692c3e b54fda5
+set(BOOST_DESCRIBE_GIT_TAG 50719b212349f3d1268285c586331584d3dbfeb5)
 # Author: Peter Dimov <pdimov@gmail.com>
-# Date:   Sun May 21 04:51:35 2023 +0300
+# Date:   Sat Mar 23 20:27:08 2024 +0200
 #
-#     Merge branch 'fix-deprecated-inline-static-variables' of https://github.com/Romain-Geissler-1A/describe into feature/pr-40
+#     Update .drone.jsonnet
 add_boost_module_headers(NAME "describe" SRC_DIR ${BOOST_DESCRIBE_SOURCE_DIR} GIT_TAG ${BOOST_DESCRIBE_GIT_TAG})
 
-set(BOOST_MOVE_GIT_TAG f1fbb45134065deebe95249c616a967d4b66c809)
-# Author: Ion Gaztañaga <igaztanaga@gmail.com>
-# Date:   Mon Mar 13 13:32:29 2023 +0100
-#
-#     Use [[msvc::intrinsic] attribute if available in move/forward in order to improve debug experience
-add_boost_module_headers(NAME "move" SRC_DIR ${BOOST_MOVE_SOURCE_DIR} GIT_TAG ${BOOST_MOVE_GIT_TAG})
-
 # Reuse mp11 fetched earlier for DPC++ headers
 set(BOOST_UNORDERED_INCLUDE_DIRS ${BOOST_UNORDERED_INCLUDE_DIRS} "${BOOST_MP11_SOURCE_DIR}/include/")
 
-set(BOOST_PREDEF_GIT_TAG 392e4e767469e3469c9390f0d9cca16724dc3fc8)
-# Merge: a12c7fd 499d28e
+set(BOOST_PREDEF_GIT_TAG 0fdfb49c3a6789e50169a44e88a07cc889001106)
+# Merge: 392e4e7 614546d
 # Author: Rene Rivera <grafikrobot@gmail.com>
-# Date:   Sun Feb 27 14:44:35 2022 -0600
+# Date:   Tue Oct 31 20:24:41 2023 -0500
 #
-#     Release 1.14.
+#     Merge branch 'develop'
 add_boost_module_headers(NAME "predef" SRC_DIR ${BOOST_PREDEF_SOURCE_DIR} GIT_TAG ${BOOST_PREDEF_GIT_TAG})
 
-set(BOOST_PREPROCESSOR_GIT_TAG 667e87b3392db338a919cbe0213979713aca52e3)
-# Author: Peter Dimov <pdimov@gmail.com>
-# Date:   Tue Aug 16 20:59:52 2022 +0300
-#
-#     Change C test names to not conflict with the C++ ones
-add_boost_module_headers(NAME "preprocessor" SRC_DIR ${BOOST_PREPROCESSOR_SOURCE_DIR} GIT_TAG ${BOOST_PREPROCESSOR_GIT_TAG})
-
-set(BOOST_STATIC_ASSERT_GIT_TAG 45eec41c293bc5cd36ec3ed83671f70bc1aadc9f)
-# Merge: ba72d33 a1abfec
-# Author: jzmaddock <john@johnmaddock.co.uk>
-# Date:   Tue Mar 8 09:35:50 2022 +0000
+# Static assert is a dependency of core
+set(BOOST_STATIC_ASSERT_GIT_TAG ba72d3340f3dc6e773868107f35902292f84b07e)
+# Merge: 392e4e7 614546d
+# Author: Rene Rivera <grafikrobot@gmail.com>
+# Date:   Tue Oct 31 20:24:41 2023 -0500
 #
-#     Merge pull request #15 from sdarwin/githubactions
+#     Merge branch 'develop'
 add_boost_module_headers(NAME "static_assert" SRC_DIR ${BOOST_STATIC_ASSERT_SOURCE_DIR} GIT_TAG ${BOOST_STATIC_ASSERT_GIT_TAG})
 
-set(BOOST_THROW_EXCEPTION_GIT_TAG 23dd41e920ecd91237500ac6428f7d392a7a875c)
+set(BOOST_THROW_EXCEPTION_GIT_TAG 7c8ec2114bc1f9ab2a8afbd629b96fbdd5901294)
 # Author: Peter Dimov <pdimov@gmail.com>
-# Date:   Sun Jun 25 16:12:57 2023 +0300
+# Date:   Sat Jan 6 19:41:56 2024 +0200
 #
-#     Update ci.yml
+#     Add -Wundef to test/Jamfile
 add_boost_module_headers(NAME "throw_exception" SRC_DIR ${BOOST_THROW_EXCEPTION_SOURCE_DIR} GIT_TAG ${BOOST_THROW_EXCEPTION_GIT_TAG})
-
-set(BOOST_TUPLE_GIT_TAG 500e4fa0a2845b96c0dd919e7485e0f216438a01)
-# Merge: aa16ae3 ded3c1d
-# Author: Joel de Guzman <djowel@gmail.com>
-# Date:   Thu Dec 30 23:20:18 2021 +0800
-#
-#     Merge pull request #21 from igaztanaga/patch-1
-add_boost_module_headers(NAME "tuple" SRC_DIR ${BOOST_TUPLE_SOURCE_DIR} GIT_TAG ${BOOST_TUPLE_GIT_TAG})
-
-set(BOOST_TYPE_TRAITS_GIT_TAG 89f5011b4a79d91e42735670e39f72cb25c86c72)
-# Merge: 55feb75 1ebd31e
-# Author: John Maddock <john@johnmaddock.co.uk>
-# Date:   Fri Feb 24 18:02:30 2023 +0000
-#
-#     Merge branch 'develop'
-add_boost_module_headers(NAME "type_traits" SRC_DIR ${BOOST_TYPE_TRAITS_SOURCE_DIR} GIT_TAG ${BOOST_TYPE_TRAITS_GIT_TAG})