From 77a650a8018e0be6fcc76bf66685ff352ae23ef1 Mon Sep 17 00:00:00 2001 From: Johan Mabille Date: Sun, 29 Oct 2023 06:26:17 +0100 Subject: [PATCH 1/2] Upraded to xsimd 11 --- CMakeLists.txt | 2 +- environment-dev.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 753564931..693be0142 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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 diff --git a/environment-dev.yml b/environment-dev.yml index efb744249..81dd49ab0 100644 --- a/environment-dev.yml +++ b/environment-dev.yml @@ -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 From acb0ff8e86b71812333ec7c9ead4e7d91e1a0b56 Mon Sep 17 00:00:00 2001 From: Johan Mabille Date: Sun, 29 Oct 2023 06:31:32 +0100 Subject: [PATCH 2/2] Fixed linter --- docs/rtd_environment.yml | 6 +++--- readthedocs.yml | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/rtd_environment.yml b/docs/rtd_environment.yml index 114c292d0..54fb700ca 100644 --- a/docs/rtd_environment.yml +++ b/docs/rtd_environment.yml @@ -1,8 +1,8 @@ name: xtensor-docs channels: - - conda-forge +- conda-forge dependencies: - - breathe - - sphinx_rtd_theme +- breathe +- sphinx_rtd_theme diff --git a/readthedocs.yml b/readthedocs.yml index 6cc465c9b..f21130321 100644 --- a/readthedocs.yml +++ b/readthedocs.yml @@ -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