From 65e74ce8acfe5b578206fd66de39c7186e5d0ac1 Mon Sep 17 00:00:00 2001 From: Alfredo Correa Date: Sat, 25 May 2024 21:27:22 -0700 Subject: [PATCH] circle test --- include/boost/multi/adaptors/complex.hpp | 3 +- .../adaptors/complex/test/CMakeLists.txt | 46 +++++++++---------- pre-push | 2 +- test/initializer_list.cpp | 4 +- 4 files changed, 27 insertions(+), 28 deletions(-) diff --git a/include/boost/multi/adaptors/complex.hpp b/include/boost/multi/adaptors/complex.hpp index 85723a8f2..af5cf121c 100644 --- a/include/boost/multi/adaptors/complex.hpp +++ b/include/boost/multi/adaptors/complex.hpp @@ -1,5 +1,4 @@ -// -*-indent-tabs-mode:t;c-basic-offset:4;tab-width:4;autowrap:nil;-*- -// Copyright 2023 Alfredo A. Correa +// Copyright 2023-2024 Alfredo A. Correa #ifndef BOOST_MULTI_ADAPTORS_COMPLEX_HPP #define BOOST_MULTI_ADAPTORS_COMPLEX_HPP diff --git a/include/boost/multi/adaptors/complex/test/CMakeLists.txt b/include/boost/multi/adaptors/complex/test/CMakeLists.txt index 953407ebd..d17b35fd8 100644 --- a/include/boost/multi/adaptors/complex/test/CMakeLists.txt +++ b/include/boost/multi/adaptors/complex/test/CMakeLists.txt @@ -3,30 +3,30 @@ cmake_minimum_required(VERSION 3.16) set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_CXX_EXTENSIONS OFF) -if((NOT - CMAKE_CXX_COMPILER_ID - STREQUAL - "PGI" - ) - AND (NOT - DART_COMPILER_NAME - STREQUAL - "nvcc" - ) - AND (NOT - DART_COMPILER_NAME - STREQUAL - "icpc" - ) -) - find_package(Boost REQUIRED COMPONENTS unit_test_framework) - link_libraries("-lboost_unit_test_framework") -else() - find_package(Boost REQUIRED) # cmake cannot detect this component with pgi compiler - link_libraries("-lboost_unit_test_framework") +# if((NOT +# CMAKE_CXX_COMPILER_ID +# STREQUAL +# "PGI" +# ) +# AND (NOT +# DART_COMPILER_NAME +# STREQUAL +# "nvcc" +# ) +# AND (NOT +# DART_COMPILER_NAME +# STREQUAL +# "icpc" +# ) +# ) +# find_package(Boost REQUIRED COMPONENTS unit_test_framework) +# link_libraries("-lboost_unit_test_framework") +# else() +# find_package(Boost REQUIRED) # cmake cannot detect this component with pgi compiler +# link_libraries("-lboost_unit_test_framework") - link_libraries("-lblas") # cmake cannot detect BLAS with pgi/nvc++ but it ships with its own version -endif() +# link_libraries("-lblas") # cmake cannot detect BLAS with pgi/nvc++ but it ships with its own version +# endif() if(CMAKE_CXX_COMPILER_ID STREQUAL "PGI") add_definitions(-DRETURN_BY_STACK) diff --git a/pre-push b/pre-push index f58b2883c..6771a0b12 100755 --- a/pre-push +++ b/pre-push @@ -13,7 +13,7 @@ export CMAKE_GENERATOR=Ninja (mkdir -p .build.g++.std23 && cd .build.g++.std23 && CXX=g++ cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_STANDARD=23 -DCMAKE_CXX_COMPILER_LAUNCHER="ccache" && cmake --build . && ctest -j 12 --output-on-failure) || exit 666 (mkdir -p .build.clang++ && cd .build.clang++ && CXX=clang++ cmake .. -DCMAKE_BUILD_TYPE=Debug -DCMAKE_CXX_FLAGS="-Wfatal-errors" -DCMAKE_CXX_COMPILER_LAUNCHER="ccache" && cmake --build . && ctest -j 12 --output-on-failure) || exit 666 -#(mkdir -p .build.circle && cd .build.circle && CXX="$HOME/bin/circle" cmake .. -GNinja -DCMAKE_BUILD_TYPE=Debug -DENABLE_CIRCLE=1 -DCMAKE_CXX_COMPILER_LAUNCHER="ccache" && cmake --build . && ctest -j 12 --output-on-failure) || exit 666 + (mkdir -p .build.circle && cd .build.circle && CXX="$HOME/bin/circle" cmake .. -GNinja -DCMAKE_BUILD_TYPE=Debug -DENABLE_CIRCLE=1 -DCMAKE_CXX_COMPILER_LAUNCHER="ccache" && cmake --build . && ctest -j 12 --output-on-failure) || exit 666 (mkdir -p .build.clang++.tidy && cd .build.clang++.tidy && CXX=clang++ cmake .. -GNinja -DCMAKE_BUILD_TYPE=Debug -DCMAKE_CXX_CLANG_TIDY="clang-tidy" -DBOOST_MULTI_STANDALONE=1 -DBUILD_TESTING=0 -DCMAKE_CXX_FLAGS="-D_GLIBCXX_DEBUG=0 -D_LIBCPP_DEBUG=0 -Wfatal-errors" -DCMAKE_CXX_COMPILER_LAUNCHER="ccache" && cmake --build . && ASAN_OPTIONS="new_delete_type_mismatch=0" ctest -j 12 --output-on-failure) || exit 666 #(mkdir -p .build.g++.m32 && cd .build.g++.m32 && CXX=g++ CXXFLAGS="-m32" cmake .. -GNinja -DCMAKE_BUILD_TYPE=Release -DCMAKE_CUDA_COMPILER_LAUNCHER="ccache" && cmake --build . --verbose && ctest -j 12 --output-on-failure) || exit 666 (mkdir -p .build.clang++.m32 && cd .build.clang++.m32 && CXX=clang++ CXXFLAGS="-m32" cmake .. -GNinja -DCMAKE_BUILD_TYPE=Release -DCMAKE_CUDA_COMPILER_LAUNCHER="ccache" && cmake --build . --verbose && ctest -j 12 --output-on-failure) || exit 666 diff --git a/test/initializer_list.cpp b/test/initializer_list.cpp index d52ae3b50..97cc782fe 100644 --- a/test/initializer_list.cpp +++ b/test/initializer_list.cpp @@ -103,12 +103,12 @@ BOOST_AUTO_TEST_CASE(multi_tests_initializer_list_1d) { BOOST_AUTO_TEST_CASE(multi_tests_initializer_list_1d_ctad) { #if defined(__cpp_deduction_guides) && !defined(__NVCC__) { -#if !defined(__circle_build__) // crashes circle 198 +// #if !defined(__circle_build__) // crashes circle 198 multi::static_array const arr = {12, 34, 56}; BOOST_TEST_REQUIRE( size(arr) == 3 ); BOOST_TEST_REQUIRE( arr[2] == 56 ); BOOST_TEST_REQUIRE(( arr == multi::static_array{12, 34, 56} )); -#endif +// #endif } { multi::array arr({12, 34, 56});