Skip to content
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

Jump to bottom

[xtensor] update to 0.23.9 #18206

Merged
merged 8 commits into from
Jun 10, 2021
Merged

[xtensor] update to 0.23.9 #18206

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
29dac1d
[xtensor] update to 0.23.9
JonLiu1993 May 31, 2021
35a36d6
update version
JonLiu1993 May 31, 2021
2224862
[xtl] update to 0.7.2
JonLiu1993 Jun 4, 2021
f25b054
update version
JonLiu1993 Jun 4, 2021
3b7f5f7
update patch
JonLiu1993 Jun 4, 2021
0b5fdba
update version
JonLiu1993 Jun 4, 2021
4cde6d9
Update ports/xtl/portfile.cmake
NancyLi1013 Jun 4, 2021
83868cc
update version
JonLiu1993 Jun 4, 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
13 changes: 0 additions & 13 deletions ports/xtensor/CONTROL
View file
Open in desktop

This file was deleted.

13 changes: 13 additions & 0 deletions ports/xtensor/fix-version-request.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index cde49f4..eab6cbb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -29,7 +29,7 @@ message(STATUS "Building xtensor v${${PROJECT_NAME}_VERSION}")
# Dependencies
# ============

-set(xtl_REQUIRED_VERSION 0.7.0)
+set(xtl_REQUIRED_VERSION 0.6.21)
if(TARGET xtl)
set(xtl_VERSION ${XTL_VERSION_MAJOR}.${XTL_VERSION_MINOR}.${XTL_VERSION_PATCH})
# Note: This is not SEMVER compatible comparison
NancyLi1013 marked this conversation as resolved.
Show resolved Hide resolved
7 changes: 5 additions & 2 deletions ports/xtensor/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,15 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO xtensor-stack/xtensor
REF a377fb84c29624e91b6b2451018f3aa3abec1c4f # 0.21.9
SHA512 627eaefef3526b59e9fdc6b0aebca1a47bac2adf382bc8381115c7f9fbf04a1496a46490985b16b5855166f03a873a7b00ea1f062131fd49d5adb545e5c8ecf5
REF f3c11b2d810159e7063daddeaa0764f4006e5a73 # 0.23.10
SHA512 85d94a3e346a13f8d802260e7b182a34f83ed7adddb5c082f10fdaac995ba5b895ea20daf33ac99d3f44e9eb95fdc4ec051eb006259258c4c2ae762c5f08399f
HEAD_REF master
PATCHES
fix-version-request.patch
)

vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
FEATURES
xsimd XTENSOR_USE_XSIMD
tbb XTENSOR_USE_TBB
NancyLi1013 marked this conversation as resolved.
Show resolved Hide resolved
)
Expand Down
24 changes: 24 additions & 0 deletions ports/xtensor/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
{
"name": "xtensor",
"version": "0.23.10",
"description": "C++ tensors with broadcasting and lazy computing",
"homepage": "https://github.com/xtensor-stack/xtensor",
"dependencies": [
"nlohmann-json",
"xtl"
],
"features": {
"tbb": {
"description": "xtensor with tbb support",
"dependencies": [
"tbb"
]
},
"xsimd": {
"description": "xtensor with xsimd support",
"dependencies": [
"xsimd"
]
}
}
}
2 changes: 1 addition & 1 deletion versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6597,7 +6597,7 @@
"port-version": 0
},
"xtensor": {
"baseline": "0.21.9",
"baseline": "0.23.10",
"port-version": 0
},
"xtensor-blas": {
Expand Down
5 changes: 5 additions & 0 deletions versions/x-/xtensor.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "e4701ba972173fb21d49302989442848fc9953ca",
"version": "0.23.10",
"port-version": 0
},
{
"git-tree": "5566727b83f68936619a2bf8872c1148a30c5c61",
"version-string": "0.21.9",
Expand Down