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

[vtkm|vtk|paraview] update ports #37119

Merged
merged 168 commits into from
Apr 29, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
168 commits
Select commit Hold shift + click to select a range
ac1f57e
force bla vendor in blas
Neumann-A Jan 11, 2021
f2df1fa
force BLA_VENDOR for lapack.
Neumann-A Jan 11, 2021
f14cac7
fix wrapper install
Neumann-A Jan 19, 2021
995f5b2
add version info
Neumann-A Jan 19, 2021
b92ef3b
Merge remote-tracking branch 'upstream/master' into force_bla_vendor
Apr 22, 2022
ef59437
install wrapper if not exist.
Apr 22, 2022
d887061
cleanup stuff
Apr 22, 2022
c12bad7
rename to cmake.in
Apr 22, 2022
c50945d
details
Apr 22, 2022
16373d0
drastically simplify FindLAPACK by clapack
Apr 22, 2022
9759dd2
no find_dependency in modules!
Apr 22, 2022
a8df6e7
add missing @ONLY
Apr 22, 2022
1e1819c
move stuff around
Apr 22, 2022
63b429d
fix platform expr
Apr 22, 2022
dc751ce
be consistent as the comment says
Apr 22, 2022
6feaf6b
Merge remote-tracking branch 'upstream/master' into force_bla_vendor
Neumann-A Apr 22, 2022
677cb68
rename test ports with -test
Neumann-A Apr 22, 2022
5fe252b
use version-string to define blas impl.
Neumann-A Apr 22, 2022
272a28c
add version stuff
Neumann-A Apr 22, 2022
0fe4af8
Merge remote-tracking branch 'upstream/master' into force_bla_vendor
May 4, 2022
ef73585
more pc files
May 4, 2022
d58573d
version stuff
May 4, 2022
244878c
adjust test to check for pc files.
May 4, 2022
55d4d09
revert openblas version
May 4, 2022
b7c002b
fix copy pasta
May 4, 2022
d77a77e
fix uwp regression
Neumann-A May 4, 2022
9896014
version stuff
Neumann-A May 4, 2022
4c2e724
Merge remote-tracking branch 'upstream/master' into force_bla_vendor
Neumann-A Jun 6, 2022
f0b472c
cleanup
Neumann-A Jun 6, 2022
bbf8ace
fix logic
Neumann-A Jun 6, 2022
1044e8d
fine tuning
Neumann-A Jun 7, 2022
b4e1bfc
format manifest
Neumann-A Jun 7, 2022
4b0a163
v db
Neumann-A Jun 7, 2022
e2193ee
fix platform expression
Neumann-A Jul 13, 2022
b40a3a9
overwrite version
Neumann-A Jul 13, 2022
1052fc6
Merge remote-tracking branch 'upstream/master' into force_bla_vendor
Neumann-A Jul 13, 2022
eba70b8
Merge branch 'microsoft:master' into force_bla_vendor
Neumann-A Sep 18, 2022
499886c
Merge branch 'microsoft:master' into force_bla_vendor
Neumann-A Sep 28, 2022
09ddd5e
fix mlpack by fixing armadillo config.
Neumann-A Sep 30, 2022
3cd56c9
v db
Neumann-A Sep 30, 2022
4339948
add licens to clapack
Neumann-A Sep 30, 2022
76c27e2
v db
Neumann-A Sep 30, 2022
f562fcb
Merge branch 'microsoft:master' into force_bla_vendor
Neumann-A Oct 27, 2022
8ab457d
Merge branch 'microsoft:master' into force_bla_vendor
Neumann-A Nov 10, 2022
a1ed890
Merge remote-tracking branch 'upstream/master' into force_bla_vendor
Neumann-A Jan 20, 2023
aa79c87
bump port versions
Neumann-A Jan 20, 2023
41111e1
Merge remote-tracking branch 'upstream/master' into force_bla_vendor
Neumann-A Jan 25, 2023
f3688f5
fix release pc path
Neumann-A Jan 25, 2023
7d7b076
fix urls
Neumann-A Jan 25, 2023
6d4ec44
Merge branch 'microsoft:master' into force_bla_vendor
Neumann-A Feb 3, 2023
d7485f8
v db
Neumann-A Feb 3, 2023
1b3df81
v db the rest
Neumann-A Feb 3, 2023
7ae0409
ci baseline
Neumann-A Feb 3, 2023
ad9405a
Merge remote-tracking branch 'upstream/master' into force_bla_vendor
Neumann-A Feb 26, 2023
0ceb6ca
v db
Neumann-A Feb 26, 2023
fd64330
Merge remote-tracking branch 'upstream/master' into force_bla_vendor
Neumann-A Mar 24, 2023
5e5852d
v db
Neumann-A Mar 24, 2023
f455709
trace failures
Neumann-A Mar 25, 2023
e838da1
add cblas feature as a dependency in static builds
Neumann-A Mar 25, 2023
f1aef26
Slip cblas into lapack for opencv.
Neumann-A Mar 25, 2023
e947d22
format manifest
Neumann-A Mar 25, 2023
e2e85f2
v db
Neumann-A Mar 25, 2023
9b41be6
Merge remote-tracking branch 'upstream/master' into force_bla_vendor
Neumann-A Mar 25, 2023
affdd7e
revert debug changes
Neumann-A Mar 25, 2023
a9f6f57
Merge remote-tracking branch 'upstream/master' into force_bla_vendor
Neumann-A Mar 27, 2023
164ec71
v db
Neumann-A Mar 27, 2023
6e12241
Merge remote-tracking branch 'upstream/master' into force_bla_vendor
Neumann-A Apr 14, 2023
2637ba6
v db
Neumann-A Apr 14, 2023
29fdcb5
Merge remote-tracking branch 'origin/master' into HEAD
BillyONeal Apr 14, 2023
ddac191
Merge remote-tracking branch 'upstream/master' into force_bla_vendor
Neumann-A Jun 10, 2023
5e89b43
v db
Neumann-A Jun 10, 2023
2699c49
Merge remote-tracking branch 'upstream/master' into force_bla_vendor
Neumann-A Dec 29, 2023
912b5d0
v db
Neumann-A Dec 29, 2023
b47cadb
Merge remote-tracking branch 'upstream/master' into force_bla_vendor
Neumann-A Jan 10, 2024
cc03e3d
v db
Neumann-A Jan 10, 2024
66a0139
update vtkm
Neumann-A Mar 3, 2024
5f0b071
update vtk
Neumann-A Mar 4, 2024
93711b0
update paraview
Neumann-A Mar 4, 2024
089116e
fix patch
Neumann-A Mar 4, 2024
e2b33a5
Fix transitiv deps in openturns
Neumann-A Mar 4, 2024
b6453de
include fix for paraview configure/build
Neumann-A Mar 4, 2024
d41e07c
adjust prebuild install for vtk
Neumann-A Mar 4, 2024
b29e4a3
fix nlopt variables being one too deep
Neumann-A Mar 4, 2024
8bcfee7
more dep fixes
Neumann-A Mar 4, 2024
ec9651a
adjust python install dir and qt5 typo
Neumann-A Mar 4, 2024
b6ad74b
trying to fix the deps
Neumann-A Mar 4, 2024
64ecb4f
Fix eigen3 target check.
Neumann-A Mar 4, 2024
6a1fff3
format manifest
Neumann-A Mar 4, 2024
f96d3b1
add another dep
Neumann-A Mar 4, 2024
5cefee7
get trace output for debugging deps
Neumann-A Mar 4, 2024
6db8250
Merge branch 'microsoft:master' into force_bla_vendor
Neumann-A Mar 5, 2024
e0a945c
adjust dlib for linux
Neumann-A Mar 5, 2024
bc45c6d
fix theia and dbow2 ?
Neumann-A Mar 5, 2024
8bec786
devondor exodus and trace
Neumann-A Mar 5, 2024
7d46e80
burn in linkage in openturns
Neumann-A Mar 6, 2024
30ba4c1
fix ot in vtk
Neumann-A Mar 6, 2024
2298ce7
Fix paraview
Neumann-A Mar 6, 2024
408ef74
allow dll in static build
Neumann-A Mar 6, 2024
cb44ad5
Fix post build on !windows
Neumann-A Mar 6, 2024
b1717a4
trying to fix post build
Neumann-A Mar 6, 2024
3cf0b9d
enable modules so VTK components get correctly looked up.
Neumann-A Mar 6, 2024
95052b8
do not touch the prefix
Neumann-A Mar 6, 2024
ed9f0f5
disable fortran
Neumann-A Mar 6, 2024
436a582
check optional deps explicitly
Neumann-A Mar 7, 2024
a99872b
trace openvms
Neumann-A Mar 7, 2024
343d986
remove invalid cblas patch in shogun
Neumann-A Mar 7, 2024
b8d73a3
adjust ci baseline
Neumann-A Mar 7, 2024
0a131bf
Fix shogun?
Neumann-A Mar 7, 2024
58f503d
add missing lapack dep
Neumann-A Mar 7, 2024
481085f
remove flags being nuked by shogun
Neumann-A Mar 7, 2024
9175648
fix accelerate detection
Neumann-A Mar 7, 2024
dd61a83
a bit of debugging shogun
Neumann-A Mar 7, 2024
771e1e4
run trace
Neumann-A Mar 7, 2024
42eb54e
retry with different regex
Neumann-A Mar 7, 2024
1f7cefd
disable lapack/blas usage for eigen on osx
Neumann-A Mar 7, 2024
31284db
v db
Neumann-A Mar 7, 2024
4e099b5
Merge branch 'microsoft:master' into paraview_5.12
Neumann-A Mar 12, 2024
b6710db
revert eigen3 and openmvs
Neumann-A Mar 12, 2024
b75e989
fix optional modules
Neumann-A Mar 12, 2024
0a3aa4f
remove hack due to upstream patch
Neumann-A Mar 12, 2024
e92b975
Merge remote-tracking branch 'upstream/master' into paraview_5.12
Neumann-A Mar 14, 2024
84c5fb0
update patch
Neumann-A Mar 14, 2024
752e8fc
v db
Neumann-A Mar 14, 2024
750bcde
add newline to patch
Neumann-A Mar 15, 2024
6773356
v db
Neumann-A Mar 15, 2024
4f06be1
reenable trace
Neumann-A Mar 15, 2024
7698be2
enable python catalyst
Neumann-A Mar 16, 2024
dfbf132
make the variable a STRING
Neumann-A Mar 16, 2024
fc25dc0
more vtk fixes
Neumann-A Mar 18, 2024
e1273ab
Merge remote-tracking branch 'upstream/master' into force_bla_vendor
Neumann-A Mar 19, 2024
36c0019
add cblas port
Neumann-A Mar 19, 2024
e0bab30
v db
Neumann-A Mar 19, 2024
32210cc
Merge remote-tracking branch 'upstream/master' into paraview_5.12
Neumann-A Mar 19, 2024
b2ebecd
Merge remote-tracking branch 'origin/force_bla_vendor' into paraview_…
Neumann-A Mar 19, 2024
c2c141b
mod ci baseline
Neumann-A Mar 20, 2024
2dcda9e
Fix python3 in VTK
Neumann-A Mar 20, 2024
c5e2b25
add /PDBPAGESIZE:8192 to static windows builds.
Neumann-A Mar 20, 2024
774b30c
trace openmvs
Neumann-A Mar 20, 2024
97f0d02
Merge branch 'microsoft:master' into paraview_5.12
Neumann-A Mar 20, 2024
0ecbd7a
hack static builds to work.
Neumann-A Mar 20, 2024
cf8fc44
Merge branch 'paraview_5.12' of https://github.com/Neumann-A/vcpkg in…
Neumann-A Mar 20, 2024
cb4bca5
bump port version
Neumann-A Mar 21, 2024
6593059
add new patch to paraview
Neumann-A Mar 21, 2024
25bb398
v db
Neumann-A Mar 21, 2024
ecf9312
remove upstream patch again since it does not apply cleanly
Neumann-A Mar 21, 2024
9caf118
v db
Neumann-A Mar 21, 2024
97c3678
revert wrong baseline entry
Neumann-A Mar 21, 2024
6c8d477
revert CI baseline
Neumann-A Mar 22, 2024
23e11c0
Merge remote-tracking branch 'upstream/master' into paraview_5.12
Neumann-A Mar 25, 2024
7995080
v db
Neumann-A Mar 25, 2024
33587b7
v db
Neumann-A Mar 25, 2024
922f4d2
fix patch
Neumann-A Mar 26, 2024
eb5f733
v db
Neumann-A Mar 26, 2024
d33c96d
Merge remote-tracking branch 'upstream/master' into paraview_5.12
Neumann-A Apr 8, 2024
32bb6a4
Merge remote-tracking branch 'origin/master' into HEAD
BillyONeal Apr 8, 2024
f15c3c9
v db
Neumann-A Apr 8, 2024
818ab66
Apply suggestions from code review
Neumann-A Apr 9, 2024
40ff109
Merge branch 'paraview_5.12' of github.com:Neumann-A/vcpkg into parav…
Neumann-A Apr 9, 2024
169b16c
Merge remote-tracking branch 'upstream/master' into paraview_5.12
Neumann-A Apr 9, 2024
bfdbbf1
v db
Neumann-A Apr 9, 2024
4678b96
Merge branch 'microsoft:master' into paraview_5.12
Neumann-A Apr 10, 2024
6f4248a
Merge branch 'microsoft:master' into paraview_5.12
Neumann-A Apr 11, 2024
a35d9cd
Merge remote-tracking branch 'upstream/master' into paraview_5.12
Neumann-A Apr 24, 2024
10d38e1
v db
Neumann-A Apr 24, 2024
195b2a0
[lapack-reference] re-add cblas libraries to wrapper
Neumann-A Apr 25, 2024
74fbefd
v db
Neumann-A Apr 25, 2024
9f7d372
look for correct cblas name
Neumann-A Apr 27, 2024
a1a26ef
v db
Neumann-A Apr 27, 2024
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: 3 additions & 3 deletions ports/lapack-reference/vcpkg-cmake-wrapper.cmake.in
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@ unset(BLA_STATIC)

if(@CBLAS@)
include(SelectLibraryConfigurations)
find_library(CBLAS_LIBRARY_RELEASE NAMES libcblas PATHS "${CURRENT_PACKAGES_DIR}/lib" NO_DEFAULT_PATH)
find_library(CBLAS_LIBRARY_DEBUG NAMES libcblas PATHS "${CURRENT_PACKAGES_DIR}/debug/lib" NO_DEFAULT_PATH)
find_library(CBLAS_LIBRARY_RELEASE NAMES libcblas cblas PATHS "${CURRENT_PACKAGES_DIR}/lib" NO_DEFAULT_PATH)
find_library(CBLAS_LIBRARY_DEBUG NAMES libcblas cblas PATHS "${CURRENT_PACKAGES_DIR}/debug/lib" NO_DEFAULT_PATH)
select_library_configurations(CBLAS)
set(LAPACK_LIBRARIES ${LAPACK_LIBRARIES})
set(LAPACK_LIBRARIES ${LAPACK_LIBRARIES} ${CBLAS_LIBRARIES})
endif()

set(CMAKE_MODULE_PATH "${LAPACK_PREV_MODULE_PATH}")
2 changes: 1 addition & 1 deletion ports/lapack-reference/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "lapack-reference",
"version": "3.11.0",
"port-version": 5,
"port-version": 6,
"description": "LAPACK - Linear Algebra PACKage",
"homepage": "https://netlib.org/lapack/",
"license": "BSD-3-Clause-Open-MPI",
Expand Down
19 changes: 19 additions & 0 deletions ports/openmvs/fix-static-build.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 39ec359ac3..03225b8940 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -177,10 +177,10 @@ if(Boost_FOUND)
LIST(APPEND OpenMVS_DEFINITIONS -D_USE_BOOST)
ADD_DEFINITIONS(${Boost_DEFINITIONS})
LINK_DIRECTORIES(${Boost_LIBRARY_DIRS})
- if(NOT MSVC AND DEFINED CMAKE_TOOLCHAIN_FILE)
- # work around this missing library link in vcpkg
- LIST(APPEND Boost_LIBRARIES zstd)
- endif()
+ LINK_LIBRARIES(${Boost_LIBRARIES})
+ find_package(zstd CONFIG REQUIRED)
+ LINK_LIBRARIES($<IF:$<TARGET_EXISTS:zstd::libzstd_shared>,zstd::libzstd_shared,zstd::libzstd_static>)
+
SET(_USE_BOOST TRUE)
endif()

2 changes: 1 addition & 1 deletion ports/openmvs/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ vcpkg_from_github(
PATCHES
fix-build.patch
no-absolute-paths.patch
fix_no_zstd.patch
fix-static-build.patch
)

vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
Expand Down
2 changes: 1 addition & 1 deletion ports/openmvs/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "openmvs",
"version": "2.1.0",
"port-version": 3,
"port-version": 4,
"description": "OpenMVS: open Multi-View Stereo reconstruction library",
"homepage": "https://cdcseacave.github.io/openMVS",
"license": "AGPL-3.0-only",
Expand Down
Loading