Skip to content

Upgrade #68

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Upgrade #68

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
60ed92c
Upgraded to xtensor 0.24.0
JohanMabille Oct 20, 2021
de11049
Fixed azure CI
JohanMabille Oct 20, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions .azure-pipelines/azure-pipelines-linux-clang.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,6 @@ jobs:
- job: 'Linux_0'
strategy:
matrix:
clang_4:
llvm_version: '4.0'
clang_5:
llvm_version: '5.0'
clang_6:
llvm_version: '6.0'
clang_7:
Expand All @@ -18,7 +14,7 @@ jobs:
llvm_version: '10'
disable_xsimd: 1
pool:
vmImage: ubuntu-16.04
vmImage: ubuntu-18.04
variables:
CC: clang-$(llvm_version)
CXX: clang++-$(llvm_version)
Expand Down
8 changes: 2 additions & 6 deletions .azure-pipelines/azure-pipelines-linux-gcc.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,9 @@ jobs:
- job: 'Linux_1'
strategy:
matrix:
gcc_4:
gcc_version: '4.9'
gcc_5_disable_xsimd:
gcc_version: '5'
disable_xsimd: 1
gcc_6:
gcc_version: '6'
disable_xsimd: 1
gcc_7:
gcc_version: '7'
gcc_8:
Expand All @@ -19,7 +15,7 @@ jobs:
gcc_9:
gcc_version: '9'
pool:
vmImage: ubuntu-16.04
vmImage: ubuntu-18.04
variables:
CC: gcc-$(gcc_version)
CXX: g++-$(gcc_version)
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ message(STATUS "Building zarray v${${PROJECT_NAME}_VERSION}")
# Dependencies
# ============

set(xtensor_REQUIRED_VERSION 0.23.0)
set(xtensor_REQUIRED_VERSION 0.24.0)
if(TARGET xtensor)
set(xtensor_VERSION
${XTENSOR_VERSION_MAJOR}.${XTENSOR_VERSION_MINOR}.${XTENSOR_VERSION_PATCH})
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ make install

| `zarray` | `xtensor` | `nlohmann_json` |
|----------|-----------|-----------------|
| master | 0.23.8 | 3.2.0 |
| master | 0.24.0 | 3.2.0 |
| 0.1.0 | 0.23.8 | 3.2.0 |
| 0.0.6 | 0.23.8 | 3.2.0 |

Expand Down
8 changes: 4 additions & 4 deletions environment-dev.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ channels:
- conda-forge
dependencies:
- cmake
- xtensor=0.23.8
- xtensor-io=0.12.2
- xsimd=7.4.8
- xtensor=0.24.0
- xtensor-io=0.13.0
- xsimd=8.0.3
- nlohmann_json=3.2.0
- doctest
- doctest