Skip to content

Commit

Permalink
Remove unused compilers and dependencies in .travis.yml
Browse files Browse the repository at this point in the history
- Removed gcc-13, g++-13, clang-16 from the list of compilers

Comply with clang-format-17.

Update vcpkg to 01acfdfde3ed99280d3883a8fccd5fa4408f5214
  • Loading branch information
acgetchell committed Nov 7, 2023
1 parent 8443a78 commit a5bb7cd
Show file tree
Hide file tree
Showing 16 changed files with 53 additions and 49 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/codecov-upload.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
- name: Restore artifacts or setup vcpkg
uses: lukka/run-vcpkg@v11
with:
vcpkgGitCommitId: f7dc9c8f5e4f2545af02404069aad3aa238188f6
vcpkgGitCommitId: 01acfdfde3ed99280d3883a8fccd5fa4408f5214

- name: Configure
run: cmake -G Ninja -D CMAKE_BUILD_TYPE=RelWithDebInfo -D ENABLE_TESTING:BOOL=TRUE -D ENABLE_COVERAGE:BOOL=TRUE -S . -B build
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ jobs:
- name: Restore artifacts or setup vcpkg
uses: lukka/run-vcpkg@v11
with:
vcpkgGitCommitId: f7dc9c8f5e4f2545af02404069aad3aa238188f6
vcpkgGitCommitId: 01acfdfde3ed99280d3883a8fccd5fa4408f5214

- name: Configure
run: cmake --preset=build
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/linux-clang-pkgx.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
- name: Restore artifacts or setup vcpkg
uses: lukka/run-vcpkg@v11
with:
vcpkgGitCommitId: f7dc9c8f5e4f2545af02404069aad3aa238188f6
vcpkgGitCommitId: 01acfdfde3ed99280d3883a8fccd5fa4408f5214

- name: Configure
run: cmake --preset=build
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/linux-clang.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
- name: Restore artifacts or setup vcpkg
uses: lukka/run-vcpkg@v11
with:
vcpkgGitCommitId: f7dc9c8f5e4f2545af02404069aad3aa238188f6
vcpkgGitCommitId: 01acfdfde3ed99280d3883a8fccd5fa4408f5214

- name: Configure
run: cmake --preset=build
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/linux-gcc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
- name: Restore artifacts or setup vcpkg
uses: lukka/run-vcpkg@v11
with:
vcpkgGitCommitId: f7dc9c8f5e4f2545af02404069aad3aa238188f6
vcpkgGitCommitId: 01acfdfde3ed99280d3883a8fccd5fa4408f5214

- name: Configure
run: cmake --preset=build
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
- name: Restore artifacts or setup vcpkg
uses: lukka/run-vcpkg@v11
with:
vcpkgGitCommitId: f7dc9c8f5e4f2545af02404069aad3aa238188f6
vcpkgGitCommitId: 01acfdfde3ed99280d3883a8fccd5fa4408f5214

- name: Configure
run: cmake --preset=build
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/sonarcloud.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
- name: Restore artifacts or setup vcpkg
uses: lukka/run-vcpkg@v11
with:
vcpkgGitCommitId: f7dc9c8f5e4f2545af02404069aad3aa238188f6
vcpkgGitCommitId: 01acfdfde3ed99280d3883a8fccd5fa4408f5214

- name: Configure
run: cmake -G Ninja -D CMAKE_BUILD_TYPE=RelWithDebInfo -D ENABLE_TESTING:BOOL=TRUE -D ENABLE_COVERAGE:BOOL=TRUE -S . -B build
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/windows-msvc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
- name: Restore artifacts, or setup vcpkg
uses: lukka/run-vcpkg@v11
with:
vcpkgGitCommitId: f7dc9c8f5e4f2545af02404069aad3aa238188f6
vcpkgGitCommitId: 01acfdfde3ed99280d3883a8fccd5fa4408f5214

- name: Install vcpkg packages and configure CMake
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/windows-pkgx.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
- name: Restore artifacts, or setup vcpkg
uses: lukka/run-vcpkg@v11
with:
vcpkgGitCommitId: f7dc9c8f5e4f2545af02404069aad3aa238188f6
vcpkgGitCommitId: 01acfdfde3ed99280d3883a8fccd5fa4408f5214

- name: Install vcpkg packages and configure CMake
run: |
Expand Down
34 changes: 19 additions & 15 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,6 @@ addons:
- libtool-bin
- texinfo
- yasm
- gcc-13
- g++-13
- clang-16
- ninja-build
- cppcheck
- doxygen
Expand All @@ -33,22 +30,22 @@ os:
- linux

compiler:
- g++-13
- clang-16
- g++
- clang

jobs:
fast_finish: true
include:
# CppCheck
- os: linux
compiler: g++-13
compiler: g++
env: CPPCHECK=true
before_script:
- export CMAKE_ARGS="-D ENABLE_CPPCHECK:BOOL=TRUE"
after_success: skip
# Valgrind
- os: linux
compiler: g++-13
compiler: g++
env: VALGRIND=true
before_script:
- export CMAKE_ARGS="-D ENABLE_IPO:BOOL=FALSE -D ENABLE_VALGRIND:BOOL=TRUE"
Expand All @@ -61,7 +58,7 @@ jobs:
- travis_wait 30 valgrind --leak-check=full --show-leak-kinds=all --verbose ./cdt --s -n64 -t3 -a0.6 -k1.1 -l0.1 -p10
# AddressSanitizer and UndefinedBehaviorSanitizer
- os: linux
compiler: clang-16
compiler: clang
env: ASAN=true
before_script:
- export CMAKE_ARGS="-D ENABLE_SANITIZER_ADDRESS:BOOL=TRUE -D ENABLE_SANITIZER_UNDEFINED_BEHAVIOR:BOOL=TRUE"
Expand All @@ -72,7 +69,7 @@ jobs:
- ./initialize --s -n32000 -t11 -o
# LeakSanitizer
- os: linux
compiler: clang-16
compiler: clang
env: LSAN=true
before_script:
- export CMAKE_ARGS="-D ENABLE_SANITIZER_LEAK:BOOL=TRUE"
Expand All @@ -83,7 +80,7 @@ jobs:
- ./initialize --s -n32000 -t11 -o
# MemorySanitizer
- os: linux
compiler: clang-16
compiler: clang
env: MSAN=true
before_script:
- export CMAKE_ARGS="-D ENABLE_SANITIZER_MEMORY:BOOL=TRUE"
Expand All @@ -94,7 +91,7 @@ jobs:
- ./initialize --s -n32000 -t11 -o
# ThreadSanitizer
- os: linux
compiler: clang-16
compiler: clang
env: TSAN=true
before_script:
- export CMAKE_ARGS="-D ENABLE_SANITIZER_THREAD:BOOL=TRUE"
Expand All @@ -105,7 +102,7 @@ jobs:
- ./initialize --s -n32000 -t11 -o
# Doxygen
- os: linux
compiler: g++-13
compiler: g++
env: DOXYGEN=true
install: skip
script:
Expand All @@ -128,12 +125,19 @@ jobs:
condition: $TRAVIS_BRANCH =~ ^(master|develop)$
allow_failures:
- os: linux
compiler: g++-13
compiler: g++
env: DOXYGEN=true

before_install:
- if [[ "$CXX" == "g++" ]]; then export CXX="g++-13" CC="gcc-13"; fi
- if [[ "$CXX" == "clang++" ]]; then export CXX="clang++-16" CC="clang-16"; fi
- eval "$(curl https://pkgx.sh)"
- if [[ "$CXX" == "g++" ]]; then
env +gcc@13
export CXX="g++-13" CC="gcc-13"
fi
- if [[ "$CXX" == "clang++" ]]; then
env +clang@16
export CXX="clang++-16" CC="clang-16"
fi

install:
# vcpkg should be cached, but clone it if not
Expand Down
2 changes: 1 addition & 1 deletion include/Metropolis.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ class MoveStrategy<Strategies::METROPOLIS, ManifoldType>
mpfr_t r_1;
mpfr_t r_2;
mpfr_t a_1;
mpfr_inits2(PRECISION, a_1, nullptr); // NOLINT
mpfr_inits2(PRECISION, a_1, nullptr); // NOLINT

mpfr_init_set_si(r_1, this_move, MPFR_RNDD); // r_1 = this_move NOLINT
mpfr_init_set_si(r_2, all_moves, MPFR_RNDD); // r_2 = total_moves NOLINT
Expand Down
34 changes: 17 additions & 17 deletions include/S3Action.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -350,23 +350,23 @@
mpfr_mul(r5, r4, n1_tl, MPFR_RNDD); // r5 = r4*n1_tl

// Second term accumulates in r30
mpfr_sqrt(r6, three, MPFR_RNDD); // r6 = sqrt(3)
mpfr_mul(r7, four, alpha, MPFR_RNDD); // r7 = 4*alpha
mpfr_add(r8, one, r7, MPFR_RNDD); // r8 = r7+1 = 4*alpha+1
mpfr_sqrt(r9, r8, MPFR_RNDD); // r9 = sqrt(r8) = sqrt(4*alpha+1)
mpfr_mul(r10, r6, r9, MPFR_RNDD); // r10 = r6*r9
mpfr_div(r11, one, r10, MPFR_RNDD); // r11 = 1/r10
mpfr_asinh(r12, r11, MPFR_RNDD); // r12 = arcsinh(r11)
mpfr_neg(r13, three, MPFR_RNDD); // r13 = -3
mpfr_mul(r14, r13, k, MPFR_RNDD); // r14 = r13*k = -3*k
mpfr_mul(r15, r14, r12, MPFR_RNDD); // r15 = r14*r12 = -3*k*arcsinh(r11)

mpfr_mul(r16, two, alpha, MPFR_RNDD); // r16 = 2*alpha
mpfr_add(r17, r16, one, MPFR_RNDD); // r17 = 2*alpha+1
mpfr_div(r18, r17, r8, MPFR_RNDD); // r18 = (2*alpha+1)/(4*alpha+1)
mpfr_acos(r19, r18, MPFR_RNDD); // r19 = arccos(r18)
mpfr_mul(r20, r14, r3, MPFR_RNDD); // r20 = -3*k*sqrt(alpha)
mpfr_mul(r21, r20, r19, MPFR_RNDD); // r21 = -3*k*sqrt(alpha)*arccos(r18)
mpfr_sqrt(r6, three, MPFR_RNDD); // r6 = sqrt(3)
mpfr_mul(r7, four, alpha, MPFR_RNDD); // r7 = 4*alpha
mpfr_add(r8, one, r7, MPFR_RNDD); // r8 = r7+1 = 4*alpha+1
mpfr_sqrt(r9, r8, MPFR_RNDD); // r9 = sqrt(r8) = sqrt(4*alpha+1)
mpfr_mul(r10, r6, r9, MPFR_RNDD); // r10 = r6*r9
mpfr_div(r11, one, r10, MPFR_RNDD); // r11 = 1/r10
mpfr_asinh(r12, r11, MPFR_RNDD); // r12 = arcsinh(r11)
mpfr_neg(r13, three, MPFR_RNDD); // r13 = -3
mpfr_mul(r14, r13, k, MPFR_RNDD); // r14 = r13*k = -3*k
mpfr_mul(r15, r14, r12, MPFR_RNDD); // r15 = r14*r12 = -3*k*arcsinh(r11)

mpfr_mul(r16, two, alpha, MPFR_RNDD); // r16 = 2*alpha
mpfr_add(r17, r16, one, MPFR_RNDD); // r17 = 2*alpha+1
mpfr_div(r18, r17, r8, MPFR_RNDD); // r18 = (2*alpha+1)/(4*alpha+1)
mpfr_acos(r19, r18, MPFR_RNDD); // r19 = arccos(r18)
mpfr_mul(r20, r14, r3, MPFR_RNDD); // r20 = -3*k*sqrt(alpha)
mpfr_mul(r21, r20, r19, MPFR_RNDD); // r21 = -3*k*sqrt(alpha)*arccos(r18)

mpfr_mul(r22, three, alpha, MPFR_RNDD); // r22 = 3*alpha
mpfr_add(r23, r22, one, MPFR_RNDD); // r23 = 3*alpha+1
Expand Down
2 changes: 1 addition & 1 deletion include/Triangulation_traits.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,6 @@ struct TriangulationTraits<3>
using Spherical_points_generator = CGAL::Random_points_on_sphere_3<Point>;

static inline Point const ORIGIN_POINT = Point{0, 0, 0};
}; // TriangulationTraits<3>
}; // TriangulationTraits<3>

#endif // CDT_PLUSPLUS_TRIANGULATION_TRAITS_HPP
8 changes: 4 additions & 4 deletions src/cdt-opt.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,15 @@ auto main() -> int
try
{
fmt::print("cdt-opt started at {}\n", utilities::current_date_time());
constexpr Int_precision simplices = 256;
constexpr Int_precision timeslices = 4;
Int_precision constexpr simplices = 256;
Int_precision constexpr timeslices = 4;
/// @brief Constants in units of \f$c=G=\hbar=1 \alpha\approx 0.0397887\f$
auto constexpr alpha = static_cast<long double>(0.6);
auto constexpr k = static_cast<long double>(1.1); // NOLINT
/// @brief \f$\Lambda=2.036\times 10^{-35} s^{-2}\approx 0\f$
auto constexpr lambda = static_cast<long double>(0.1);
constexpr Int_precision passes = 10;
constexpr Int_precision checkpoint = 10;
Int_precision constexpr passes = 10;
Int_precision constexpr checkpoint = 10;

// Create logs
utilities::create_logger();
Expand Down
2 changes: 1 addition & 1 deletion src/cdt.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ using Timer = CGAL::Real_timer;
using namespace std;

/// Help message parsed by docopt into options
static constexpr string_view USAGE{
static string_view constexpr USAGE{
R"(Causal Dynamical Triangulations in C++ using CGAL.
Copyright (c) 2013 Adam Getchell
Expand Down
2 changes: 1 addition & 1 deletion src/initialize.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
using namespace std;

/// Help message parsed by docopt into options
static constexpr string_view USAGE{
static string_view constexpr USAGE{
R"(Causal Dynamical Triangulations in C++ using CGAL.
Copyright (c) 2014 Adam Getchell
Expand Down

0 comments on commit a5bb7cd

Please sign in to comment.