Skip to content

Commit abb5bbc

Browse files
authored
Merge pull request #2735 from JohanMabille/upgrade_xsimd
Upraded to xsimd 11
2 parents 7445569 + acb0ff8 commit abb5bbc

4 files changed

Lines changed: 7 additions & 7 deletions

File tree

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ if(XTENSOR_USE_TBB AND XTENSOR_USE_OPENMP)
5959
endif()
6060

6161
if(XTENSOR_USE_XSIMD)
62-
set(xsimd_REQUIRED_VERSION 10.0.0)
62+
set(xsimd_REQUIRED_VERSION 11.0.0)
6363
if(TARGET xsimd)
6464
set(xsimd_VERSION ${XSIMD_VERSION_MAJOR}.${XSIMD_VERSION_MINOR}.${XSIMD_VERSION_PATCH})
6565
# Note: This is not SEMVER compatible comparison

docs/rtd_environment.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
name: xtensor-docs
22

33
channels:
4-
- conda-forge
4+
- conda-forge
55

66
dependencies:
7-
- breathe
8-
- sphinx_rtd_theme
7+
- breathe
8+
- sphinx_rtd_theme

environment-dev.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ channels:
44
dependencies:
55
- cmake
66
- xtl=0.7.5
7-
- xsimd=10.0.0
7+
- xsimd=11.1.0
88
- nlohmann_json
99
- doctest=2.4.7
1010
- pre-commit

readthedocs.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
version: 2
22

33
build:
4-
os: "ubuntu-22.04"
4+
os: ubuntu-22.04
55
tools:
6-
python: "mambaforge-22.9"
6+
python: mambaforge-22.9
77

88
conda:
99
environment: docs/rtd_environment.yml

0 commit comments

Comments
 (0)