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.

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

[xtensor] update to 0.23.9 #18206

Merged
merged 8 commits into from
Jun 10, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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

This file was deleted.

9 changes: 5 additions & 4 deletions ports/xtensor/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +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
)

vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
xsimd XTENSOR_USE_XSIMD
tbb XTENSOR_USE_TBB
FEATURES
xsimd XTENSOR_USE_XSIMD
tbb XTENSOR_USE_TBB
)

vcpkg_configure_cmake(
Expand Down
24 changes: 24 additions & 0 deletions ports/xtensor/vcpkg.json
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"
]
}
}
}
5 changes: 0 additions & 5 deletions ports/xtl/CONTROL

This file was deleted.

19 changes: 19 additions & 0 deletions ports/xtl/fix-fixup-cmake.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index cbc6651..4e31f71 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -122,7 +122,7 @@ install(FILES ${XTL_HEADERS}
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/xtl)
endif()

-set(XTL_CMAKECONFIG_INSTALL_DIR "${CMAKE_INSTALL_DATAROOTDIR}/cmake/${PROJECT_NAME}" CACHE
+set(XTL_CMAKECONFIG_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}" CACHE
STRING "install path for xtlConfig.cmake")

configure_package_config_file(${PROJECT_NAME}Config.cmake.in
@@ -157,4 +157,4 @@ configure_file(${PROJECT_NAME}.pc.in
"${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.pc"
@ONLY)
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.pc"
- DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/pkgconfig/")
+ DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig/")
8 changes: 6 additions & 2 deletions ports/xtl/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,11 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO xtensor-stack/xtl
REF 6c017f4a81a59bd52008025a785ce745e5b7f49c # 0.6.21
SHA512 f007196a38da267b6f457ce587220b60686b1c23670ab03d5f0516bb3b8c7b1e5b8859d57255e96f713bfc08a46d38dd497e55afc17fa40f2b653073690093c9
REF e0f00666d90086bb245ae73abb6123d0e2c1b30b # 0.7.2
SHA512 d7a552dc4e43a3270a56c57fde8fdc48a108909d4fa1e3fdd7ab12b178b3e271ed4d89aac9fd184e2739ddacfb3b5cb248538ed50a0ba56e740875c0faf5aa62
HEAD_REF master
PATCHES
fix-fixup-cmake.patch
)

vcpkg_configure_cmake(
Expand All @@ -20,6 +22,8 @@ vcpkg_install_cmake()

vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT})

vcpkg_fixup_pkgconfig()

file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)

file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
9 changes: 9 additions & 0 deletions ports/xtl/vcpkg.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"name": "xtl",
"version": "0.7.2",
"description": "The x template library",
"homepage": "https://github.com/xtensor-stack/xtl",
"dependencies": [
"nlohmann-json"
]
}
4 changes: 2 additions & 2 deletions versions/baseline.json
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 All @@ -6613,7 +6613,7 @@
"port-version": 1
},
"xtl": {
"baseline": "0.6.21",
"baseline": "0.7.2",
"port-version": 0
},
"xxhash": {
Expand Down
5 changes: 5 additions & 0 deletions versions/x-/xtensor.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "ca365f721479380995943c5ab4e8cdd6866ec785",
"version": "0.23.10",
"port-version": 0
},
{
"git-tree": "5566727b83f68936619a2bf8872c1148a30c5c61",
"version-string": "0.21.9",
Expand Down
5 changes: 5 additions & 0 deletions versions/x-/xtl.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "2665b2dcd2f142f932337987817369ae8a377bbe",
"version": "0.7.2",
"port-version": 0
},
{
"git-tree": "f0cc60a9db2ec13e64cda97ae85bb344a8cd3e10",
"version-string": "0.6.21",
Expand Down