Skip to content

Commit 84bbef7

Browse files
committed
Merge branch 'remove-commented-lines' into 'master'
remove commented lines See merge request correaa/boost-multi!1336
2 parents d50a4a0 + f56659a commit 84bbef7

File tree

2 files changed

+25
-35
lines changed

2 files changed

+25
-35
lines changed

.gitlab-ci-correaa.yml

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -821,6 +821,30 @@ cuda-12.5.0:
821821
- ctest || ctest --rerun-failed --output-on-failure
822822
needs: ["cuda"]
823823

824+
cuda-12.6.0:
825+
stage: build
826+
allow_failure: true
827+
image: nvcr.io/nvidia/cuda:12.6.3-devel-ubuntu24.04 # nvcr.io/nvidia/cuda:12.5.0-devel-ubuntu22.04
828+
tags:
829+
- non-shared
830+
- nvidia-gpu
831+
interruptible: true
832+
script:
833+
- nvidia-smi
834+
- apt-get -qq update
835+
- apt-get install --no-install-recommends -y cmake g++ wget pkg-config make libboost-serialization-dev libboost-timer-dev libblas-dev libfftw3-dev
836+
- cmake --version
837+
# - wget https://github.com/Kitware/CMake/releases/download/v3.27.0-rc3/cmake-3.27.0-rc3-linux-x86_64.sh --no-verbose
838+
# - sh ./cmake-3.27.0-rc3-linux-x86_64.sh --skip-license --prefix=/usr # for CMAKE_CUDA_STANDARD=20
839+
# - cmake --version
840+
- mkdir build && cd build
841+
- g++ --version
842+
- /usr/local/cuda/bin/nvcc --version
843+
- CUDACXX=/usr/local/cuda/bin/nvcc cmake .. -DCMAKE_BUILD_TYPE=Release -DENABLE_CUDA=1 -DCMAKE_CUDA_STANDARD=20 -DCMAKE_CUDA_ARCHITECTURES=61 -DCMAKE_CUDA_HOST_COMPILER=g++
844+
- cmake --verbose --build . --parallel 2 || cmake --build . --verbose
845+
- ctest || ctest --rerun-failed --output-on-failure
846+
needs: ["cuda"]
847+
824848
rocm:
825849
stage: build
826850
image: rocm/dev-ubuntu-24.04 # rocm/dev-ubuntu-22.04
@@ -924,7 +948,7 @@ inq:
924948
inq cuda:
925949
allow_failure: false
926950
stage: test
927-
image: nvcr.io/nvidia/cuda:11.8.0-devel-ubuntu22.04
951+
image: nvcr.io/nvidia/cuda:12.0.1-devel-ubuntu22.04 # nvcr.io/nvidia/cuda:11.8.0-devel-ubuntu22.04
928952
tags:
929953
- non-shared
930954
- nvidia-gpu

include/boost/multi/array_ref.hpp

Lines changed: 0 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -3066,40 +3066,6 @@ struct const_subarray<T, 1, ElementPtr, Layout> // NOLINT(fuchsia-multiple-inhe
30663066
BOOST_MULTI_FRIEND_CONSTEXPR auto cbegin(const_subarray const& self) {return self.cbegin();}
30673067
BOOST_MULTI_FRIEND_CONSTEXPR auto cend (const_subarray const& self) {return self.cend() ;}
30683068

3069-
// // fix mutation
3070-
// template<class TT, class... As> constexpr auto operator=(const_subarray<TT, 1L, As...> const& other) && -> const_subarray& {operator=( other ); return *this;}
3071-
// template<class TT, class... As> constexpr auto operator=(const_subarray<TT, 1L, As...> const& other) & -> const_subarray& {
3072-
// assert(other.extensions() == this->extensions());
3073-
// elements() = other.elements();
3074-
// return *this;
3075-
// }
3076-
3077-
// // fix mutation
3078-
// template<class TT, class... As> constexpr auto operator=(const_subarray<TT, 1L, As...> && other) && -> const_subarray& {operator=(std::move(other)); return *this;}
3079-
// template<class TT, class... As> constexpr auto operator=(const_subarray<TT, 1L, As...> && other) & -> const_subarray& {
3080-
// assert(this->extensions() == other.extensions());
3081-
// elements() = std::move(other).elements();
3082-
// return *this;
3083-
// }
3084-
3085-
// template<
3086-
// class Range,
3087-
// class = std::enable_if_t<! std::is_base_of_v<const_subarray, Range> >,
3088-
// class = std::enable_if_t<! is_subarray<Range>::value> // NOLINT(modernize-use-constraints) TODO(correaa) for C++20
3089-
// >
3090-
// constexpr auto operator=(Range const& rng) & // TODO(correaa) check that you LHS is not read-only?
3091-
// -> const_subarray& { // lints(cppcoreguidelines-c-copy-assignment-signature,misc-unconventional-assign-operator)
3092-
// assert(this->size() == static_cast<size_type>(adl_size(rng))); // TODO(correaa) or use std::cmp_equal?
3093-
// adl_copy_n(adl_begin(rng), adl_size(rng), begin());
3094-
// return *this;
3095-
// }
3096-
// template<
3097-
// class Range,
3098-
// class = std::enable_if_t<! std::is_base_of_v<const_subarray, Range>>,
3099-
// class = std::enable_if_t<! is_subarray<Range>::value> // NOLINT(modernize-use-constraints) TODO(correaa) for C++20
3100-
// >
3101-
// constexpr auto operator=(Range const& rng) && -> const_subarray& {operator=(rng); return *this;}
3102-
31033069
template<class It> constexpr auto assign(It first) &&
31043070
->decltype(adl_copy_n(first, std::declval<size_type>(), std::declval<iterator>()), void()) {
31053071
return adl_copy_n(first, this-> size() , std::move(*this).begin()), void(); }

0 commit comments

Comments
 (0)