Skip to content

chore:Move to conan 2 - #2228

Merged
rprospero merged 19 commits into
develop2from
conan-2-rebase
Sep 5, 2025
Merged

chore:Move to conan 2#2228
rprospero merged 19 commits into
develop2from
conan-2-rebase

Conversation

@rprospero

@rprospero rprospero commented Sep 3, 2025

Copy link
Copy Markdown
Contributor

With GitHub actions moving to XCode 17, we're finally being forced to make the transition to Conan 2. The following changes were made to make this possible:

  1. Conan is invoked earlier in the CMake file. This work was done by @trisyoungs
  2. The CI for mac and windows were updated both to install the latest conan version (instead of insisting on version 1)
  3. Update conan configuration commands for each platform
  4. Remove the lines that fixed the Mac CI build to XCode 16
  5. Update msvc to 19.44 (from 19.41), as that is now required to build gtest
  6. Fix a weird typo bug that's been in array2D for a long time, but was part of a template function that never got called before XCode changed how the compiled the code.

@rprospero
rprospero changed the base branch from develop to develop2 September 3, 2025 09:07
@rprospero
rprospero force-pushed the conan-2-rebase branch 3 times, most recently from 4c3a6af to eb87da4 Compare September 3, 2025 10:04

@github-actions github-actions Bot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Performance Alert ⚠️

Possible performance regression was detected for benchmark.
Benchmark result of this commit is worse than the previous benchmark result exceeding threshold 2.

Benchmark suite Current: 2200d9b Previous: 080eb63 Ratio
BM_Box_MinimumVector<CubicBox> 10.603886618401043 ns/iter 5.292752627757738 ns/iter 2.00
BM_CalculateForces_SpeciesTorsion<SpeciesType::MediumMolecule, SpeciesPopulation::Small> 667.6720667212232 ns/iter 315.4423191484812 ns/iter 2.12

This comment was automatically generated by workflow using github-action-benchmark.

CC: @disorderedmaterials/dissolve-devs

@rprospero
rprospero marked this pull request as ready for review September 4, 2025 12:14
conan profile update settings.compiler.version=17 default
conan profile detect
conan profile show
# -cc settings.compiler="Visual Studio" -cc settings.compiler.version=17 -cc core.download:download_cache="${GITHUB_WORKSPACE}/.conancache"

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Still required?

Comment thread conanfile.txt
Comment on lines +8 to +10
gsl/2.7.1
gtest/1.16.0
benchmark/1.8.4

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I guess we're happy with having these "unnecessary" dependencies pulled in all the time?

Comment thread src/templates/array2D.h
assert(nColumns_ == B.nColumns_ && nRows_ == B.nRows_);

std::transform(array_.begin(), array_.end(), B.array_begin(), array_.begin(), [](auto &a, auto &b) { return a - b; });
std::transform(array_.begin(), array_.end(), B.array_.begin(), array_.begin(), [](auto &a, auto &b) { return a - b; });

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oops!

@rprospero
rprospero merged commit f6641a4 into develop2 Sep 5, 2025
8 checks passed
@rprospero
rprospero deleted the conan-2-rebase branch September 5, 2025 09:00
rprospero added a commit that referenced this pull request Sep 5, 2025
Co-authored-by: trisyoungs <tristan.youngs@stfc.ac.uk>
Co-authored-by: Tristan Youngs <trisyoungs@googlemail.com>
rprospero added a commit that referenced this pull request Sep 15, 2025
Co-authored-by: trisyoungs <tristan.youngs@stfc.ac.uk>
Co-authored-by: Tristan Youngs <trisyoungs@googlemail.com>
rprospero added a commit that referenced this pull request Feb 4, 2026
Co-authored-by: trisyoungs <tristan.youngs@stfc.ac.uk>
Co-authored-by: Tristan Youngs <trisyoungs@googlemail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants