[xsimd][xtensor][xtl] Update to lastest (#9158)

* [xsimd][xtensor][xtl] Update to lastest

* [xtensor-io] Disable parallel config

* [xsimd][xtensor][xtensor-blas][xtensor-io][xtl] Update to 2019-12-06

* [xsimd][xtensor-blas][xtensor][xtl] Update to lastest

* [xsimd][xtensor-blas][xtensor-io][xtensor][xtl] Update to lastest

10 files changed, 31 insertions, 53 deletions

diff --git a/ports/xsimd/CONTROL b/ports/xsimd/CONTROL
index 4eb4115b8..ae2ef2249 100644
--- a/ports/xsimd/CONTROL
+++ b/ports/xsimd/CONTROL
@@ -1,7 +1,7 @@
 Source: xsimd

-Version: 7.2.5

+Version: 7.4.5

 Description: Modern, portable C++ wrappers for SIMD intrinsics

-Homepage: https://github.com/QuantStack/xsimd

+Homepage: https://github.com/xtensor-stack/xsimd

 

 Feature: xcomplex

 Description: xtl complex support

diff --git a/ports/xsimd/portfile.cmake b/ports/xsimd/portfile.cmake
index b2eb8a251..46cf996cf 100644
--- a/ports/xsimd/portfile.cmake
+++ b/ports/xsimd/portfile.cmake
@@ -1,12 +1,10 @@
 # header-only library

 

-include(vcpkg_common_functions)

-

 vcpkg_from_github(

     OUT_SOURCE_PATH SOURCE_PATH

-    REPO QuantStack/xsimd

-    REF 75702dd2772aebc6afaa1a86530170a5ef2e10cd
-    SHA512 2cf04dbf71818db571919f04a476cc8d45676ea56d88b7543b7f10c9ee5d6f718a6addc586c8a6a882ea0a34b09b83d6e20c3bf49e73d4ec1d14f3c1db47a55c

+    REPO xtensor-stack/xsimd

+    REF 90613ca516fa89e4db01fbc76b95b1d8e0abb416 # 7.4.5

+    SHA512 08d0662f2d9b3f73c1703e826012406860dbe632ed18a7bbdaa7d6de84c63d9fdae0ce574e0ec1d6e351ded801f84614867e2aad27fe942cb647cba9832ef027

     HEAD_REF master

 )

 

@@ -30,8 +28,4 @@ vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT})
 

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

 

-# Handle copyright

-configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY)

-

-# CMake integration test

-vcpkg_test_cmake(PACKAGE_NAME ${PORT})

+file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)

diff --git a/ports/xtensor-blas/CONTROL b/ports/xtensor-blas/CONTROL
index 1779f1760..6020152fe 100644
--- a/ports/xtensor-blas/CONTROL
+++ b/ports/xtensor-blas/CONTROL
@@ -1,4 +1,5 @@
 Source: xtensor-blas
-Version: 0.16.1
+Version: 0.17.1
 Description: BLAS extension to xtensor
+Homepage: https://github.com/xtensor-stack/xtensor-blas
 Build-Depends: xtensor
diff --git a/ports/xtensor-blas/portfile.cmake b/ports/xtensor-blas/portfile.cmake
index 000a567a3..6db2e3876 100644
--- a/ports/xtensor-blas/portfile.cmake
+++ b/ports/xtensor-blas/portfile.cmake
@@ -1,12 +1,10 @@
 # header-only library

 

-include(vcpkg_common_functions)

-

 vcpkg_from_github(

     OUT_SOURCE_PATH SOURCE_PATH

-    REPO QuantStack/xtensor-blas

-    REF 0.16.1

-    SHA512 3bdbd48b74d7be0b9f4ad2d435789e266b3cc1e043bbe73739978678bd1ca81504a688cdd80c03667305d210d299127be9939333c9bd0ac27dff0423ccb4861d

+    REPO xtensor-stack/xtensor-blas

+    REF 0b23657413bb4380014b82c4dd45821f04a4adad # 0.17.1

+    SHA512 d155d9fdad2e2d1851657953544e9ef3e3c1b203a1cb4e092d0f5bab8bad27bcf3a21a0ae3be0c06a7b8a3fa8b41f244da45690d39ee6c9794ac4fcabc4de35f

     HEAD_REF master

 )

 

@@ -31,8 +29,4 @@ vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT})
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug ${CURRENT_PACKAGES_DIR}/lib)

 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/xflens/cxxblas/netlib)

 

-# Handle copyright

-configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY)

-

-# CMake integration test

-vcpkg_test_cmake(PACKAGE_NAME ${PORT})

+file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)

diff --git a/ports/xtensor-io/CONTROL b/ports/xtensor-io/CONTROL
index 734c0becf..20d92198d 100644
--- a/ports/xtensor-io/CONTROL
+++ b/ports/xtensor-io/CONTROL
@@ -1,5 +1,6 @@
 Source: xtensor-io

-Version: 0.7.0

+Version: 0.9.0

 Description: xtensor plugin to read and write images, audio files, numpy (compressed) npz and HDF5

+Homepage: https://github.com/xtensor-stack/xtensor-io

 Build-Depends: xtensor, xtl

 

diff --git a/ports/xtensor-io/portfile.cmake b/ports/xtensor-io/portfile.cmake
index d8cc89a09..d5b85978f 100644
--- a/ports/xtensor-io/portfile.cmake
+++ b/ports/xtensor-io/portfile.cmake
@@ -1,18 +1,17 @@
 # header-only library

 

-include(vcpkg_common_functions)

-

 vcpkg_from_github(

     OUT_SOURCE_PATH SOURCE_PATH

-    REPO QuantStack/xtensor-io

-    REF 0.7.0

-    SHA512 6c8416c595d022ed60cd802deec6d63128d205d6fd13962098b6242ace4fa9e61122e5b05837a1aab3b64bc042da7cbf2f72f2328155c342de3a6db741d4d4ee

+    REPO xtensor-stack/xtensor-io

+    REF 863dd7dad6010038568c169f20e3d3e87bd3b37a # 0.9.0

+    SHA512 f6190c5c2c487a8170e5af1ddfd2e921c414274762dac6c8f9519d579d5eb5dd3683678e7b4f589b7ced8a42f648742755acb42e2122960d6ca7fc1a82b0723e

     HEAD_REF master

 )

 

 vcpkg_configure_cmake(

     SOURCE_PATH ${SOURCE_PATH}

     PREFER_NINJA

+    DISABLE_PARALLEL_CONFIGURE

     OPTIONS

         -DBUILD_TESTS=OFF

         -DDOWNLOAD_GTEST=OFF

@@ -25,7 +24,4 @@ vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT})
 

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

 

-# Handle copyright

-file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})

-file(RENAME ${CURRENT_PACKAGES_DIR}/share/${PORT}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright)

-

+file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)

diff --git a/ports/xtensor/CONTROL b/ports/xtensor/CONTROL
index 3f1a1d5fe..8f0e6fac5 100644
--- a/ports/xtensor/CONTROL
+++ b/ports/xtensor/CONTROL
@@ -1,7 +1,7 @@
 Source: xtensor

-Version: 0.20.8

+Version: 0.21.2

 Description: C++ tensors with broadcasting and lazy computing

-Homepage: https://quantstack.net/xtensor

+Homepage: https://github.com/xtensor-stack/xtensor

 Build-Depends: nlohmann-json, xtl

 

 Feature: xsimd

diff --git a/ports/xtensor/portfile.cmake b/ports/xtensor/portfile.cmake
index b8c28727a..cdbc1f1e1 100644
--- a/ports/xtensor/portfile.cmake
+++ b/ports/xtensor/portfile.cmake
@@ -1,12 +1,10 @@
 # header-only library

 

-include(vcpkg_common_functions)

-

 vcpkg_from_github(

     OUT_SOURCE_PATH SOURCE_PATH

-    REPO QuantStack/xtensor

-    REF b2d81961ac1b335bf2c362e6b7f792ebacb8abf8
-    SHA512 cfa64ae8163ce5cf7be762d5e67f4b2b15721f7d83cebab78ebf4ff1d85825aa3065769644d0314dd583bfb8dce76659c1a5cb95ecd87d00bb2fb8309623d0ae

+    REPO xtensor-stack/xtensor

+    REF 8c77ea7fe479714a297efc0263c933a41fd2fc50 # 0.21.2

+    SHA512 f535e3a5d9325b73af31b64a2c20f504d754202f2d557f63bab280a0b2c7e67d357f9a5c281a2cf73cccf0af129b29e38e218c95ab421c5473a92fe28bd9b2d6

     HEAD_REF master

 )

 

@@ -36,8 +34,4 @@ vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT})
 

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

 

-# Handle copyright

-configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY)

-

-# CMake integration test

-vcpkg_test_cmake(PACKAGE_NAME ${PORT})

+file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)

diff --git a/ports/xtl/CONTROL b/ports/xtl/CONTROL
index b0fbdd39c..600536d12 100644
--- a/ports/xtl/CONTROL
+++ b/ports/xtl/CONTROL
@@ -1,4 +1,5 @@
 Source: xtl

-Version: 0.6.5
+Version: 0.6.10

 Build-Depends: nlohmann-json

 Description: The x template library.

+Homepage: https://github.com/xtensor-stack/xtl

diff --git a/ports/xtl/portfile.cmake b/ports/xtl/portfile.cmake
index 74cbbbc03..1e09d5fc5 100644
--- a/ports/xtl/portfile.cmake
+++ b/ports/xtl/portfile.cmake
@@ -1,12 +1,10 @@
 # header-only library

 

-include(vcpkg_common_functions)

-

 vcpkg_from_github(

     OUT_SOURCE_PATH SOURCE_PATH

-    REPO QuantStack/xtl

-    REF 0d1f896ba90664248279baaea0059699cff5ab9b
-    SHA512 8375dc3c64d49b1722bdb579b397f296ae28042fd41b2e0556b3ad53b8b3615c250096aa09f1997d964285f6969d599d49e3b9204b45877af858c9a463619ab2

+    REPO xtensor-stack/xtl

+    REF 557bbc914e91e4efa93b2ca8d09ab11b1e70b711 # 0.6.10

+    SHA512 bf02c90f17dcf46ca424fb4bb6bbda5a57f0f1258c35f0c9ddc3ff6f0bcdd1c5f485f786b986ee96b0044340b2a9e25f1750fbee1b32c76b0c68e8a04127fba5

     HEAD_REF master

 )

 

@@ -24,5 +22,4 @@ vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT})
 

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

 

-# Handle copyright

-configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY)

+file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)