upgrade to at least boost-1.74.0

Fixes alpaka-group#1512
bernhardmgruber · Dec 17, 2021 · 66fdd4a · 66fdd4a
1 parent eba8dff
commit 66fdd4a
Show file tree

Hide file tree

Showing 15 changed files with 80 additions and 82 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
diff --git a/cmake/alpakaCommon.cmake b/cmake/alpakaCommon.cmake
@@ -173,6 +173,10 @@ if(ALPAKA_ACC_CPU_B_SEQ_T_FIBERS_ENABLE AND (ALPAKA_ACC_GPU_CUDA_ENABLE OR ALPAK
     message(FATAL_ERROR "Fibers and CUDA or HIP back-end can not be enabled both at the same time.")
 endif()
 
+if (ALPAKA_ACC_CPU_B_SEQ_T_FIBERS_ENABLE AND CMAKE_CXX_COMPILER_ID MATCHES "Clang" AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 6.0)
+    message(FATAL_ERROR "Clang versions < 6.0 do not support Boost.Fiber!")
+endif()
+
 #-------------------------------------------------------------------------------
 # Compiler settings.
 
@@ -204,7 +208,7 @@ endif()
 
 #-------------------------------------------------------------------------------
 # Find Boost.
-set(_ALPAKA_BOOST_MIN_VER "1.65.1")
+set(_ALPAKA_BOOST_MIN_VER "1.74.0")
 
 if(${ALPAKA_DEBUG} GREATER 1)
     SET(Boost_DEBUG ON)

diff --git a/script/before_install.sh b/script/before_install.sh
@@ -157,20 +157,17 @@ then
             exit 1
         fi
     fi
+fi
 
-    if [ "${ALPAKA_CI_STDLIB}" == "libstdc++" ]
+if [ ! -z "${ALPAKA_CI_CLANG_VER+x}" ]
+then
+    if [ "${ALPAKA_CI_CLANG_VER}" == 5 ]
     then
-        if [ ! -z "${ALPAKA_CXX_STANDARD+x}" ]
+        if [ "${ALPAKA_CI_INSTALL_FIBERS}" == "ON" ]
         then
-            if [ "${ALPAKA_CI_INSTALL_FIBERS}" == "ON" ]
-            then
-                if (( ( ( "${ALPAKA_CI_BOOST_BRANCH_MAJOR}" == 1 ) && ( "${ALPAKA_CI_BOOST_BRANCH_MINOR}" < 67 ) ) || ( "${ALPAKA_CI_BOOST_BRANCH_MAJOR}" < 1 ) ))
-                then
-                    # https://github.com/boostorg/coroutine2/issues/26
-                    echo "libstdc++ in c++17 mode is not compatible with boost.fibers in boost-1.66 and below."
-                    exit 1
-                fi
-            fi
+            # https://github.com/boostorg/fiber/issues/272
+            echo "clang-5 is not compatible with boost.fibers."
+            exit 1
         fi
     fi
 fi

diff --git a/script/gitlabci/job_cuda10.0.yml b/script/gitlabci/job_cuda10.0.yml
@@ -5,7 +5,7 @@ linux_clang-9_cuda-10.0_debug:
     ALPAKA_CI_CUDA_VERSION: "10.0"
     ALPAKA_CI_CLANG_VER: 9
     CMAKE_BUILD_TYPE: Debug
-    ALPAKA_BOOST_VERSION: 1.73.0
+    ALPAKA_BOOST_VERSION: 1.77.0
     ALPAKA_CI_CMAKE_VER: 3.20.0
     ALPAKA_ACC_GPU_CUDA_ENABLE: "ON"
     CMAKE_CUDA_COMPILER: clang++
@@ -18,7 +18,7 @@ linux_clang-10_cuda-10.0_release:
     ALPAKA_CI_UBUNTU_VER: "20.04"
     ALPAKA_CI_CUDA_VERSION: "10.0"
     ALPAKA_CI_CLANG_VER: 10
-    ALPAKA_BOOST_VERSION: 1.72.0
+    ALPAKA_BOOST_VERSION: 1.75.0
     ALPAKA_CI_CMAKE_VER: 3.20.0
     ALPAKA_ACC_GPU_CUDA_ENABLE: "ON"
     CMAKE_CUDA_COMPILER: clang++

diff --git a/script/gitlabci/job_cuda10.1.yml b/script/gitlabci/job_cuda10.1.yml
@@ -5,7 +5,7 @@ linux_clang-9_cuda-10.1_debug:
     ALPAKA_CI_CUDA_VERSION: "10.1"
     ALPAKA_CI_CLANG_VER: 9
     CMAKE_BUILD_TYPE: Debug
-    ALPAKA_BOOST_VERSION: 1.67.0
+    ALPAKA_BOOST_VERSION: 1.75.0
     ALPAKA_CI_CMAKE_VER: 3.19.7
     ALPAKA_ACC_GPU_CUDA_ENABLE: "ON"
     CMAKE_CUDA_COMPILER: clang++
@@ -33,7 +33,7 @@ linux_clang-11_cuda-10.1_debug:
     ALPAKA_CI_CUDA_VERSION: "10.1"
     ALPAKA_CI_CLANG_VER: 11
     CMAKE_BUILD_TYPE: Debug
-    ALPAKA_BOOST_VERSION: 1.73.0
+    ALPAKA_BOOST_VERSION: 1.77.0
     ALPAKA_CI_CMAKE_VER: 3.20.0
     ALPAKA_ACC_GPU_CUDA_ENABLE: "ON"
     CMAKE_CUDA_COMPILER: clang++

diff --git a/script/gitlabci/job_cuda10.2.yml b/script/gitlabci/job_cuda10.2.yml
@@ -5,7 +5,7 @@ linux_clang-11_cuda-10.2_release:
     ALPAKA_CI_CUDA_VERSION: "10.2"
     CMAKE_CUDA_ARCHITECTURES: "61;72"
     ALPAKA_CI_CLANG_VER: 11
-    ALPAKA_BOOST_VERSION: 1.73.0
+    ALPAKA_BOOST_VERSION: 1.77.0
     ALPAKA_CI_CMAKE_VER: 3.20.0
     ALPAKA_ACC_GPU_CUDA_ENABLE: "ON"
     CMAKE_CUDA_COMPILER: clang++

diff --git a/script/gitlabci/job_cuda11.0.yml b/script/gitlabci/job_cuda11.0.yml
@@ -18,7 +18,7 @@ linux_nvcc-11.0_gcc-7_release_extended_lambda_off:
     ALPAKA_CI_CUDA_VERSION: "11.0"
     ALPAKA_CI_GCC_VER: 7
     CMAKE_BUILD_TYPE: Release
-    ALPAKA_BOOST_VERSION: 1.73.0
+    ALPAKA_BOOST_VERSION: 1.77.0
     ALPAKA_CI_CMAKE_VER: 3.20.0
     ALPAKA_ACC_GPU_CUDA_ENABLE: "ON"
     ALPAKA_CUDA_EXPT_EXTENDED_LAMBDA: "OFF"
@@ -31,7 +31,7 @@ linux_nvcc-11.0_gcc-7_debug:
     ALPAKA_CI_CUDA_VERSION: "11.0"
     ALPAKA_CI_GCC_VER: 7
     CMAKE_BUILD_TYPE: Debug
-    ALPAKA_BOOST_VERSION: 1.67.0
+    ALPAKA_BOOST_VERSION: 1.75.0
     ALPAKA_CI_CMAKE_VER: 3.20.0
     CMAKE_CUDA_ARCHITECTURES: "61;80"
   stage: stageCompile0
@@ -43,7 +43,7 @@ linux_nvcc-11.0_gcc-8_release:
     ALPAKA_CI_CUDA_VERSION: "11.0"
     ALPAKA_CI_GCC_VER: 8
     CMAKE_BUILD_TYPE: Release
-    ALPAKA_BOOST_VERSION: 1.69.0
+    ALPAKA_BOOST_VERSION: 1.77.0
     ALPAKA_CI_CMAKE_VER: 3.18.6
   stage: stageCompile1
 
@@ -53,7 +53,7 @@ linux_nvcc-11.0_gcc-9_release:
     ALPAKA_CI_UBUNTU_VER: "20.04"
     ALPAKA_CI_CUDA_VERSION: "11.0"
     ALPAKA_CI_GCC_VER: 9
-    ALPAKA_BOOST_VERSION: 1.69.0
+    ALPAKA_BOOST_VERSION: 1.75.0
     ALPAKA_CI_CMAKE_VER: 3.19.7
   stage: stageRun0
 
@@ -77,7 +77,7 @@ linux_nvcc-11.0_clang-9_debug:
     ALPAKA_CI_CUDA_VERSION: "11.0"
     ALPAKA_CI_CLANG_VER: 9
     CMAKE_BUILD_TYPE: Debug
-    ALPAKA_BOOST_VERSION: 1.73.0
+    ALPAKA_BOOST_VERSION: 1.74.0
     ALPAKA_CI_CMAKE_VER: 3.20.0
     CMAKE_CUDA_COMPILER: nvcc
   stage: stageCompile1

diff --git a/script/gitlabci/job_cuda11.1.yml b/script/gitlabci/job_cuda11.1.yml
@@ -6,7 +6,7 @@ linux_nvcc-11.1_gcc-7_debug:
     ALPAKA_CI_CUDA_VERSION: "11.1"
     ALPAKA_CI_GCC_VER: 7
     CMAKE_BUILD_TYPE: Debug
-    ALPAKA_BOOST_VERSION: 1.67.0
+    ALPAKA_BOOST_VERSION: 1.75.0
     ALPAKA_CI_CMAKE_VER: 3.20.0
     CMAKE_CUDA_ARCHITECTURES: "61;80"
   stage: stageCompile0
@@ -17,7 +17,7 @@ linux_nvcc-11.1_gcc-8_release:
     ALPAKA_CI_UBUNTU_VER: "20.04"
     ALPAKA_CI_CUDA_VERSION: "11.1"
     ALPAKA_CI_GCC_VER: 8
-    ALPAKA_BOOST_VERSION: 1.69.0
+    ALPAKA_BOOST_VERSION: 1.77.0
     ALPAKA_CI_CMAKE_VER: 3.18.6
   stage: stageCompile1
 
@@ -27,7 +27,7 @@ linux_nvcc-11.1_gcc-9_release:
     ALPAKA_CI_UBUNTU_VER: "20.04"
     ALPAKA_CI_CUDA_VERSION: "11.1"
     ALPAKA_CI_GCC_VER: 9
-    ALPAKA_BOOST_VERSION: 1.69.0
+    ALPAKA_BOOST_VERSION: 1.77.0
     ALPAKA_CI_CMAKE_VER: 3.19.7
   stage: stageRun1
 
@@ -52,7 +52,7 @@ linux_nvcc-11.1_clang-9_debug:
     ALPAKA_CI_CUDA_VERSION: "11.1"
     ALPAKA_CI_CLANG_VER: 9
     CMAKE_BUILD_TYPE: Debug
-    ALPAKA_BOOST_VERSION: 1.73.0
+    ALPAKA_BOOST_VERSION: 1.77.0
     ALPAKA_CI_CMAKE_VER: 3.20.0
     CMAKE_CUDA_COMPILER: nvcc
   stage: stageCompile1
@@ -63,7 +63,7 @@ linux_nvcc-11.1_clang-10_release:
     ALPAKA_CI_UBUNTU_VER: "20.04"
     ALPAKA_CI_CUDA_VERSION: "11.1"
     ALPAKA_CI_CLANG_VER: 10
-    ALPAKA_BOOST_VERSION: 1.72.0
+    ALPAKA_BOOST_VERSION: 1.75.0
     ALPAKA_CI_CMAKE_VER: 3.19.7
     CMAKE_CUDA_COMPILER: nvcc
   stage: stageRun1
diff --git a/script/gitlabci/job_cuda11.2.yml b/script/gitlabci/job_cuda11.2.yml
@@ -6,7 +6,7 @@ linux_nvcc-11.2_gcc-7_debug:
     ALPAKA_CI_CUDA_VERSION: "11.2"
     ALPAKA_CI_GCC_VER: 7
     CMAKE_BUILD_TYPE: Debug
-    ALPAKA_BOOST_VERSION: 1.67.0
+    ALPAKA_BOOST_VERSION: 1.75.0
     ALPAKA_CI_CMAKE_VER: 3.20.0
     CMAKE_CUDA_ARCHITECTURES: "61;80"
   stage: stageCompile0
@@ -17,7 +17,7 @@ linux_nvcc-11.2_gcc-8_release:
     ALPAKA_CI_UBUNTU_VER: "20.04"
     ALPAKA_CI_CUDA_VERSION: "11.2"
     ALPAKA_CI_GCC_VER: 8
-    ALPAKA_BOOST_VERSION: 1.69.0
+    ALPAKA_BOOST_VERSION: 1.76.0
     ALPAKA_CI_CMAKE_VER: 3.18.6
   stage: stageCompile1
 
@@ -27,7 +27,7 @@ linux_nvcc-11.2_gcc-9_release:
     ALPAKA_CI_UBUNTU_VER: "20.04"
     ALPAKA_CI_CUDA_VERSION: "11.2"
     ALPAKA_CI_GCC_VER: 9
-    ALPAKA_BOOST_VERSION: 1.69.0
+    ALPAKA_BOOST_VERSION: 1.74.0
     ALPAKA_CI_CMAKE_VER: 3.19.7
   stage: stageRun1
 
@@ -52,7 +52,7 @@ linux_nvcc-11.2_clang-9_debug:
     ALPAKA_CI_CUDA_VERSION: "11.2"
     ALPAKA_CI_CLANG_VER: 9
     CMAKE_BUILD_TYPE: Debug
-    ALPAKA_BOOST_VERSION: 1.73.0
+    ALPAKA_BOOST_VERSION: 1.77.0
     ALPAKA_CI_CMAKE_VER: 3.20.0
     CMAKE_CUDA_COMPILER: nvcc
   stage: stageCompile1
@@ -63,7 +63,7 @@ linux_nvcc-11.2_clang-10_release:
     ALPAKA_CI_UBUNTU_VER: "20.04"
     ALPAKA_CI_CUDA_VERSION: "11.2"
     ALPAKA_CI_CLANG_VER: 10
-    ALPAKA_BOOST_VERSION: 1.72.0
+    ALPAKA_BOOST_VERSION: 1.75.0
     ALPAKA_CI_CMAKE_VER: 3.19.7
     CMAKE_CUDA_COMPILER: nvcc
   stage: stageRun1
diff --git a/script/gitlabci/job_cuda11.3.yml b/script/gitlabci/job_cuda11.3.yml
@@ -6,7 +6,7 @@ linux_nvcc-11.3_gcc-7_debug:
     ALPAKA_CI_CUDA_VERSION: "11.3"
     ALPAKA_CI_GCC_VER: 7
     CMAKE_BUILD_TYPE: Debug
-    ALPAKA_BOOST_VERSION: 1.67.0
+    ALPAKA_BOOST_VERSION: 1.76.0
     ALPAKA_CI_CMAKE_VER: 3.20.0
     CMAKE_CUDA_ARCHITECTURES: "61;86"
   stage: stageCompile0
@@ -17,7 +17,7 @@ linux_nvcc-11.3_gcc-8_release:
     ALPAKA_CI_UBUNTU_VER: "20.04"
     ALPAKA_CI_CUDA_VERSION: "11.3"
     ALPAKA_CI_GCC_VER: 8
-    ALPAKA_BOOST_VERSION: 1.69.0
+    ALPAKA_BOOST_VERSION: 1.74.0
     ALPAKA_CI_CMAKE_VER: 3.18.6
   stage: stageCompile1
 
@@ -27,7 +27,7 @@ linux_nvcc-11.3_gcc-9_release:
     ALPAKA_CI_UBUNTU_VER: "20.04"
     ALPAKA_CI_CUDA_VERSION: "11.3"
     ALPAKA_CI_GCC_VER: 9
-    ALPAKA_BOOST_VERSION: 1.69.0
+    ALPAKA_BOOST_VERSION: 1.75.0
     ALPAKA_CI_CMAKE_VER: 3.19.7
   stage: stageRun1
 
@@ -52,7 +52,7 @@ linux_nvcc-11.3_clang-9_debug:
     ALPAKA_CI_CUDA_VERSION: "11.3"
     ALPAKA_CI_CLANG_VER: 9
     CMAKE_BUILD_TYPE: Debug
-    ALPAKA_BOOST_VERSION: 1.73.0
+    ALPAKA_BOOST_VERSION: 1.77.0
     ALPAKA_CI_CMAKE_VER: 3.20.0
     CMAKE_CUDA_COMPILER: nvcc
   stage: stageCompile1
@@ -63,7 +63,7 @@ linux_nvcc-11.3_clang-10_release:
     ALPAKA_CI_UBUNTU_VER: "20.04"
     ALPAKA_CI_CUDA_VERSION: "11.3"
     ALPAKA_CI_CLANG_VER: 10
-    ALPAKA_BOOST_VERSION: 1.72.0
+    ALPAKA_BOOST_VERSION: 1.75.0
     ALPAKA_CI_CMAKE_VER: 3.19.7
     CMAKE_CUDA_COMPILER: nvcc
   stage: stageRun1
diff --git a/script/gitlabci/job_cuda11.4.yml b/script/gitlabci/job_cuda11.4.yml
@@ -6,7 +6,7 @@ linux_nvcc-11.4_gcc-7_debug:
     ALPAKA_CI_CUDA_VERSION: "11.4"
     ALPAKA_CI_GCC_VER: 7
     CMAKE_BUILD_TYPE: Debug
-    ALPAKA_BOOST_VERSION: 1.67.0
+    ALPAKA_BOOST_VERSION: 1.75.0
     ALPAKA_CI_CMAKE_VER: 3.20.0
     CMAKE_CUDA_ARCHITECTURES: "61;86"
   stage: stageCompile0
@@ -17,7 +17,7 @@ linux_nvcc-11.4_gcc-8_release:
     ALPAKA_CI_UBUNTU_VER: "20.04"
     ALPAKA_CI_CUDA_VERSION: "11.4"
     ALPAKA_CI_GCC_VER: 8
-    ALPAKA_BOOST_VERSION: 1.69.0
+    ALPAKA_BOOST_VERSION: 1.74.0
     ALPAKA_CI_CMAKE_VER: 3.18.6
   stage: stageCompile1
 
@@ -27,7 +27,7 @@ linux_nvcc-11.4_gcc-9_release:
     ALPAKA_CI_UBUNTU_VER: "20.04"
     ALPAKA_CI_CUDA_VERSION: "11.4"
     ALPAKA_CI_GCC_VER: 9
-    ALPAKA_BOOST_VERSION: 1.69.0
+    ALPAKA_BOOST_VERSION: 1.74.0
     ALPAKA_CI_CMAKE_VER: 3.19.7
   stage: stageRun0
 
@@ -52,7 +52,7 @@ linux_nvcc-11.4_clang-9_debug:
     ALPAKA_CI_CUDA_VERSION: "11.4"
     ALPAKA_CI_CLANG_VER: 9
     CMAKE_BUILD_TYPE: Debug
-    ALPAKA_BOOST_VERSION: 1.73.0
+    ALPAKA_BOOST_VERSION: 1.77.0
     ALPAKA_CI_CMAKE_VER: 3.20.0
     CMAKE_CUDA_COMPILER: nvcc
   stage: stageCompile1
@@ -63,7 +63,7 @@ linux_nvcc-11.4_clang-10_release:
     ALPAKA_CI_UBUNTU_VER: "20.04"
     ALPAKA_CI_CUDA_VERSION: "11.4"
     ALPAKA_CI_CLANG_VER: 10
-    ALPAKA_BOOST_VERSION: 1.72.0
+    ALPAKA_BOOST_VERSION: 1.75.0
     ALPAKA_CI_CMAKE_VER: 3.19.7
     CMAKE_CUDA_COMPILER: nvcc
   stage: stageCompile0
@@ -74,7 +74,7 @@ linux_nvcc-11.4_clang-11_release:
     ALPAKA_CI_UBUNTU_VER: "20.04"
     ALPAKA_CI_CUDA_VERSION: "11.4"
     ALPAKA_CI_CLANG_VER: 11
-    ALPAKA_BOOST_VERSION: 1.72.0
+    ALPAKA_BOOST_VERSION: 1.76.0
     ALPAKA_CI_CMAKE_VER: 3.19.7
     CMAKE_CUDA_COMPILER: nvcc
   stage: stageCompile1
@@ -85,7 +85,7 @@ linux_nvcc-11.4_clang-12_release:
     ALPAKA_CI_UBUNTU_VER: "20.04"
     ALPAKA_CI_CUDA_VERSION: "11.4"
     ALPAKA_CI_CLANG_VER: 12
-    ALPAKA_BOOST_VERSION: 1.72.0
+    ALPAKA_BOOST_VERSION: 1.75.0
     ALPAKA_CI_CMAKE_VER: 3.19.7
     CMAKE_CUDA_COMPILER: nvcc
   stage: stageRun1