Skip to content

Commit

Permalink
Merge pull request #2735 from JohanMabille/upgrade_xsimd
Browse files Browse the repository at this point in the history
Upraded to xsimd 11
  • Loading branch information
JohanMabille authored Oct 29, 2023
2 parents 7445569 + acb0ff8 commit abb5bbc
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ if(XTENSOR_USE_TBB AND XTENSOR_USE_OPENMP)
endif()

if(XTENSOR_USE_XSIMD)
set(xsimd_REQUIRED_VERSION 10.0.0)
set(xsimd_REQUIRED_VERSION 11.0.0)
if(TARGET xsimd)
set(xsimd_VERSION ${XSIMD_VERSION_MAJOR}.${XSIMD_VERSION_MINOR}.${XSIMD_VERSION_PATCH})
# Note: This is not SEMVER compatible comparison
Expand Down
6 changes: 3 additions & 3 deletions docs/rtd_environment.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
name: xtensor-docs

channels:
- conda-forge
- conda-forge

dependencies:
- breathe
- sphinx_rtd_theme
- breathe
- sphinx_rtd_theme
2 changes: 1 addition & 1 deletion environment-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ channels:
dependencies:
- cmake
- xtl=0.7.5
- xsimd=10.0.0
- xsimd=11.1.0
- nlohmann_json
- doctest=2.4.7
- pre-commit
4 changes: 2 additions & 2 deletions readthedocs.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
version: 2

build:
os: "ubuntu-22.04"
os: ubuntu-22.04
tools:
python: "mambaforge-22.9"
python: mambaforge-22.9

conda:
environment: docs/rtd_environment.yml

0 comments on commit abb5bbc

Please sign in to comment.