mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2025-06-07 14:15:51 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Update VMs for Patch Tuesday May 2022 (#24695)

Browse Source 
* Install Ubuntu nasm package rather than building from source; 2.14 which is available in Ubuntu 20.04 is sufficient for intel-ipsec.

* Add cmake and ninja.

* Update CUDA signing key.

* Update pwsh to 7.2.3

* Remove clean downloads step obsoleted since we ripped out pacman.

* Note that haskell-stack is for bond.

* Cherry pick from https://github.com/microsoft/vcpkg/pull/23569 : add cuda-nvml-dev-11-6

* Update pools.

* Baseline updates

PASSING, REMOVE FROM FAIL LIST: mesa:x64-windows-static-md (C:\a\2\s\scripts\azure-pipelines/../ci.baseline.txt).

:)

```
REGRESSION: cppgraphqlgen:arm64-windows failed with BUILD_FAILED. If expected, add cppgraphqlgen:arm64-windows=fail to C:\a\1\s\scripts\azure-pipelines/../ci.baseline.txt.
REGRESSION: cppgraphqlgen:x64-windows failed with BUILD_FAILED. If expected, add cppgraphqlgen:x64-windows=fail to C:\a\2\s\scripts\azure-pipelines/../ci.baseline.txt.
REGRESSION: cppgraphqlgen:x64-windows-static failed with BUILD_FAILED. If expected, add cppgraphqlgen:x64-windows-static=fail to C:\a\2\s\scripts\azure-pipelines/../ci.baseline.txt.
REGRESSION: cppgraphqlgen:x64-windows-static-md failed with BUILD_FAILED. If expected, add cppgraphqlgen:x64-windows-static-md=fail to C:\a\2\s\scripts\azure-pipelines/../ci.baseline.txt.
REGRESSION: cppgraphqlgen:x86-windows failed with BUILD_FAILED. If expected, add cppgraphqlgen:x86-windows=fail to C:\a\2\s\scripts\azure-pipelines/../ci.baseline.txt.
```

This is a compiler behavior change or bug in VS 2022 16.2:

```
C:\PROGRA~1\MICROS~1\2022\ENTERP~1\VC\Tools\MSVC\1432~1.313\bin\Hostx64\x86\cl.exe   /TP -DGRAPHQL_DLLEXPORTS -DIMPL_GRAPHQLSERVICE_DLL -Dgraphqlservice_EXPORTS -ID:\buildtrees\cppgraphqlgen\src\v4.3.1-9d04ffd723.clean\src\..\include -ID:\buildtrees\cppgraphqlgen\src\v4.3.1-9d04ffd723.clean\src\..\PEGTL\include -external:ID:\installed\x86-windows\include -external:W0 /nologo /DWIN32 /D_WINDOWS /W3 /utf-8 /GR /EHsc /MP  /D_DEBUG /MDd /Z7 /Ob0 /Od /RTC1  -MDd /W4 /WX /permissive- -std:c++20 /showIncludes /Fosrc\CMakeFiles\graphqlservice.dir\GraphQLService.cpp.obj /Fdsrc\CMakeFiles\graphqlservice.dir\ /FS -c D:\buildtrees\cppgraphqlgen\src\v4.3.1-9d04ffd723.clean\src\GraphQLService.cpp
cl : Command line warning D9025 : overriding '/W3' with '/W4'
D:\installed\x86-windows\include\tao\pegtl/demangle.hpp(147): error C2338: static_assert failed: 'internal::dependent_true< T > && ( begin != std::string_view::npos )'
D:\buildtrees\cppgraphqlgen\src\v4.3.1-9d04ffd723.clean\include\graphqlservice/internal/SyntaxTree.h(120): note: see reference to function template instantiation 'std::string_view tao::graphqlpeg::demangle<graphql::peg::variable_value>(void) noexcept' being compiled
D:\buildtrees\cppgraphqlgen\src\v4.3.1-9d04ffd723.clean\include\graphqlservice/internal/SyntaxTree.h(53): note: see reference to function template instantiation 'std::string_view graphql::peg::ast_node::type_name<graphql::peg::variable_value>(void) noexcept' being compiled
D:\buildtrees\cppgraphqlgen\src\v4.3.1-9d04ffd723.clean\src\GraphQLService.cpp(310): note: see reference to function template instantiation 'bool graphql::peg::ast_node::is_type<graphql::peg::variable_value>(void) noexcept const' being compiled
ninja: build stopped: subcommand failed.
```

This is a compiler behavior change in 17.2. @wravery do you have comments?

```
REGRESSION: qtwebengine:x64-windows failed with BUILD_FAILED. If expected, add qtwebengine:x64-windows=fail to C:\a\1\s\scripts\azure-pipelines/../ci.baseline.txt.
REGRESSION: qtwebengine:x64-windows failed with BUILD_FAILED. If expected, add qtwebengine:x64-windows=fail to C:\a\1\s\scripts\azure-pipelines/../ci.baseline.txt.
REGRESSION: qtwebengine:x64-windows failed with BUILD_FAILED. If expected, add qtwebengine:x64-windows=fail to C:\a\2\s\scripts\azure-pipelines/../ci.baseline.txt.
REGRESSION: qtwebengine:x64-windows failed with BUILD_FAILED. If expected, add qtwebengine:x64-windows=fail to C:\a\2\s\scripts\azure-pipelines/../ci.baseline.txt.
REGRESSION: qtwebengine:x64-windows failed with BUILD_FAILED. If expected, add qtwebengine:x64-windows=fail to C:\a\2\s\scripts\azure-pipelines/../ci.baseline.txt.
REGRESSION: qtwebengine:x64-windows failed with BUILD_FAILED. If expected, add qtwebengine:x64-windows=fail to C:\a\2\s\scripts\azure-pipelines/../ci.baseline.txt.
REGRESSION: qtwebengine:x64-windows failed with BUILD_FAILED. If expected, add qtwebengine:x64-windows=fail to C:\a\2\s\scripts\azure-pipelines/../ci.baseline.txt.
```

qtwebengine doesn't report logs, but I'm pretty sure it's this ICE: https://developercommunity.visualstudio.com/t/Visual-Studio-2022-v1720-reports-fata/10039296 @Neumann-A

```
REGRESSION: rsocket:x64-windows failed with BUILD_FAILED. If expected, add rsocket:x64-windows=fail to C:\a\2\s\scripts\azure-pipelines/../ci.baseline.txt.
REGRESSION: rsocket:x64-windows-static failed with BUILD_FAILED. If expected, add rsocket:x64-windows-static=fail to C:\a\2\s\scripts\azure-pipelines/../ci.baseline.txt.
REGRESSION: rsocket:x64-windows-static-md failed with BUILD_FAILED. If expected, add rsocket:x64-windows-static-md=fail to C:\a\2\s\scripts\azure-pipelines/../ci.baseline.txt.
```

ICE :( https://devdiv.visualstudio.com/DefaultCollection/DevDiv/_workitems/edit/1490389

Other changes:
* Removed qt5-webengine skips because they are now skipped by a "supports" clause.
* Removed ctp skips because asset caching exists.

* [stxxl] Guard definition of log2 for current MSVCs.
This commit is contained in:
Billy O'Neal 2022-05-17 13:03:13 -07:00 committed by GitHub
parent d132d128b4
commit 22b4033861
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 304 additions and 299 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

529
ports/stxxl/0001-fix-visual-studio.patch
View File

@ -1,272 +1,289 @@
diff --git a/include/stxxl/bits/algo/ksort.h b/include/stxxl/bits/algo/ksort.h
index 33ec8cf..4079a57 100644
--- a/include/stxxl/bits/algo/ksort.h
+++ b/include/stxxl/bits/algo/ksort.h
@@ -299,11 +299,7 @@ create_runs(
template <typename BlockType,
typename prefetcher_type,
typename KeyExtractor>
-struct run_cursor2_cmp : public std::binary_function<
- run_cursor2<BlockType, prefetcher_type>,
- run_cursor2<BlockType, prefetcher_type>,
- bool
- >
diff --git a/include/stxxl/bits/algo/ksort.h b/include/stxxl/bits/algo/ksort.h
index 33ec8cf..8101741 100644
--- a/include/stxxl/bits/algo/ksort.h
+++ b/include/stxxl/bits/algo/ksort.h
@@ -299,11 +299,7 @@ create_runs(
template <typename BlockType,
typename prefetcher_type,
typename KeyExtractor>
-struct run_cursor2_cmp : public std::binary_function<
- run_cursor2<BlockType, prefetcher_type>,
- run_cursor2<BlockType, prefetcher_type>,
- bool
- >
+struct run_cursor2_cmp
{
typedef run_cursor2<BlockType, prefetcher_type> cursor_type;
KeyExtractor keyobj;
@@ -327,7 +323,7 @@ private:
};
template <typename RecordType, typename KeyExtractor>
-class key_comparison : public std::binary_function<RecordType, RecordType, bool>
{
typedef run_cursor2<BlockType, prefetcher_type> cursor_type;
KeyExtractor keyobj;
@@ -327,7 +323,7 @@ private:
};
template <typename RecordType, typename KeyExtractor>
-class key_comparison : public std::binary_function<RecordType, RecordType, bool>
+class key_comparison
{
KeyExtractor ke;
diff --git a/include/stxxl/bits/algo/sort_helper.h b/include/stxxl/bits/algo/sort_helper.h
index 524e40d..69234c4 100644
--- a/include/stxxl/bits/algo/sort_helper.h
+++ b/include/stxxl/bits/algo/sort_helper.h
@@ -51,7 +51,6 @@ struct trigger_entry
template <typename TriggerEntryType, typename ValueCmp>
struct trigger_entry_cmp
- : public std::binary_function<TriggerEntryType, TriggerEntryType, bool>
{
typedef TriggerEntryType trigger_entry_type;
ValueCmp cmp;
@@ -67,11 +66,6 @@ template <typename BlockType,
typename PrefetcherType,
typename ValueCmp>
struct run_cursor2_cmp
- : public std::binary_function<
- run_cursor2<BlockType, PrefetcherType>,
- run_cursor2<BlockType, PrefetcherType>,
- bool
- >
{
typedef BlockType block_type;
typedef PrefetcherType prefetcher_type;
diff --git a/include/stxxl/bits/compat/unique_ptr.h b/include/stxxl/bits/compat/unique_ptr.h
index 9df12ff..7110246 100644
--- a/include/stxxl/bits/compat/unique_ptr.h
+++ b/include/stxxl/bits/compat/unique_ptr.h
@@ -22,12 +22,7 @@ STXXL_BEGIN_NAMESPACE
template <class Type>
struct compat_unique_ptr {
-#if __cplusplus >= 201103L && ((__GNUC__ * 10000 + __GNUC_MINOR__ * 100) >= 40400)
typedef std::unique_ptr<Type> result;
-#else
- // auto_ptr is inherently broken and is deprecated by unique_ptr in c++0x
- typedef std::auto_ptr<Type> result;
-#endif
};
STXXL_END_NAMESPACE
diff --git a/include/stxxl/bits/containers/btree/leaf.h b/include/stxxl/bits/containers/btree/leaf.h
index d7c619f..c6b2fcc 100644
--- a/include/stxxl/bits/containers/btree/leaf.h
+++ b/include/stxxl/bits/containers/btree/leaf.h
@@ -66,7 +66,7 @@ public:
typedef node_cache<normal_leaf, btree_type> leaf_cache_type;
public:
- struct value_compare : public std::binary_function<value_type, value_type, bool>
{
KeyExtractor ke;
diff --git a/include/stxxl/bits/algo/sort_helper.h b/include/stxxl/bits/algo/sort_helper.h
index 524e40d..69234c4 100644
--- a/include/stxxl/bits/algo/sort_helper.h
+++ b/include/stxxl/bits/algo/sort_helper.h
@@ -51,7 +51,6 @@ struct trigger_entry
template <typename TriggerEntryType, typename ValueCmp>
struct trigger_entry_cmp
- : public std::binary_function<TriggerEntryType, TriggerEntryType, bool>
{
typedef TriggerEntryType trigger_entry_type;
ValueCmp cmp;
@@ -67,11 +66,6 @@ template <typename BlockType,
typename PrefetcherType,
typename ValueCmp>
struct run_cursor2_cmp
- : public std::binary_function<
- run_cursor2<BlockType, PrefetcherType>,
- run_cursor2<BlockType, PrefetcherType>,
- bool
- >
{
typedef BlockType block_type;
typedef PrefetcherType prefetcher_type;
diff --git a/include/stxxl/bits/compat/unique_ptr.h b/include/stxxl/bits/compat/unique_ptr.h
index 9df12ff..7110246 100644
--- a/include/stxxl/bits/compat/unique_ptr.h
+++ b/include/stxxl/bits/compat/unique_ptr.h
@@ -22,12 +22,7 @@ STXXL_BEGIN_NAMESPACE
template <class Type>
struct compat_unique_ptr {
-#if __cplusplus >= 201103L && ((__GNUC__ * 10000 + __GNUC_MINOR__ * 100) >= 40400)
typedef std::unique_ptr<Type> result;
-#else
- // auto_ptr is inherently broken and is deprecated by unique_ptr in c++0x
- typedef std::auto_ptr<Type> result;
-#endif
};
STXXL_END_NAMESPACE
diff --git a/include/stxxl/bits/containers/btree/leaf.h b/include/stxxl/bits/containers/btree/leaf.h
index d7c619f..969adfd 100644
--- a/include/stxxl/bits/containers/btree/leaf.h
+++ b/include/stxxl/bits/containers/btree/leaf.h
@@ -66,7 +66,7 @@ public:
typedef node_cache<normal_leaf, btree_type> leaf_cache_type;
public:
- struct value_compare : public std::binary_function<value_type, value_type, bool>
+ struct value_compare
{
key_compare comp;
diff --git a/include/stxxl/bits/containers/btree/node.h b/include/stxxl/bits/containers/btree/node.h
index 13dec7b..a4c47d8 100644
--- a/include/stxxl/bits/containers/btree/node.h
+++ b/include/stxxl/bits/containers/btree/node.h
@@ -71,7 +71,7 @@ public:
typedef node_cache<normal_node, btree_type> node_cache_type;
private:
- struct value_compare : public std::binary_function<value_type, value_type, bool>
{
key_compare comp;
diff --git a/include/stxxl/bits/containers/btree/node.h b/include/stxxl/bits/containers/btree/node.h
index 13dec7b..c26cfff 100644
--- a/include/stxxl/bits/containers/btree/node.h
+++ b/include/stxxl/bits/containers/btree/node.h
@@ -71,7 +71,7 @@ public:
typedef node_cache<normal_node, btree_type> node_cache_type;
private:
- struct value_compare : public std::binary_function<value_type, value_type, bool>
+ struct value_compare
{
key_compare comp;
diff --git a/include/stxxl/bits/containers/hash_map/hash_map.h b/include/stxxl/bits/containers/hash_map/hash_map.h
index 0759bd2..ecf19cd 100644
--- a/include/stxxl/bits/containers/hash_map/hash_map.h
+++ b/include/stxxl/bits/containers/hash_map/hash_map.h
@@ -1258,10 +1258,7 @@ protected:
* lexicographically by <hash-value, key> Note: the hash-value has already
* been computed.
*/
- struct Cmp : public std::binary_function<
- std::pair<internal_size_type, value_type>,
- std::pair<internal_size_type, value_type>, bool
- >
{
key_compare comp;
diff --git a/include/stxxl/bits/containers/hash_map/hash_map.h b/include/stxxl/bits/containers/hash_map/hash_map.h
index 0759bd2..edcc2ac 100644
--- a/include/stxxl/bits/containers/hash_map/hash_map.h
+++ b/include/stxxl/bits/containers/hash_map/hash_map.h
@@ -1258,10 +1258,7 @@ protected:
* lexicographically by <hash-value, key> Note: the hash-value has already
* been computed.
*/
- struct Cmp : public std::binary_function<
- std::pair<internal_size_type, value_type>,
- std::pair<internal_size_type, value_type>, bool
- >
+ struct Cmp
{
self_type& map_;
Cmp(self_type& map) : map_(map) { }
@@ -1520,7 +1517,7 @@ protected:
public:
//! Construct an equality predicate from the comparison operator
- struct equal_to : public std::binary_function<key_type, key_type, bool>
{
self_type& map_;
Cmp(self_type& map) : map_(map) { }
@@ -1520,7 +1517,7 @@ protected:
public:
//! Construct an equality predicate from the comparison operator
- struct equal_to : public std::binary_function<key_type, key_type, bool>
+ struct equal_to
{
//! reference to hash_map
const self_type& m_map;
diff --git a/include/stxxl/bits/io/wbtl_file.h b/include/stxxl/bits/io/wbtl_file.h
index 933a216..30828a0 100644
--- a/include/stxxl/bits/io/wbtl_file.h
+++ b/include/stxxl/bits/io/wbtl_file.h
@@ -65,7 +65,7 @@ class wbtl_file : public disk_queued_file
size_type curpos;
request_ptr backend_request;
- struct FirstFit : public std::binary_function<place, offset_type, bool>
{
//! reference to hash_map
const self_type& m_map;
diff --git a/include/stxxl/bits/io/wbtl_file.h b/include/stxxl/bits/io/wbtl_file.h
index 933a216..d9f0674 100644
--- a/include/stxxl/bits/io/wbtl_file.h
+++ b/include/stxxl/bits/io/wbtl_file.h
@@ -65,7 +65,7 @@ class wbtl_file : public disk_queued_file
size_type curpos;
request_ptr backend_request;
- struct FirstFit : public std::binary_function<place, offset_type, bool>
+ struct FirstFit
{
bool operator () (
const place& entry,
diff --git a/include/stxxl/bits/mng/block_alloc.h b/include/stxxl/bits/mng/block_alloc.h
index 19ade8b..887f0e6 100644
--- a/include/stxxl/bits/mng/block_alloc.h
+++ b/include/stxxl/bits/mng/block_alloc.h
@@ -138,7 +138,7 @@ private:
perm[i] = i;
stxxl::random_number<random_uniform_fast> rnd;
- std::random_shuffle(perm.begin(), perm.end(), rnd _STXXL_FORCE_SEQUENTIAL);
{
bool operator () (
const place& entry,
diff --git a/include/stxxl/bits/mng/block_alloc.h b/include/stxxl/bits/mng/block_alloc.h
index 19ade8b..dac408f 100644
--- a/include/stxxl/bits/mng/block_alloc.h
+++ b/include/stxxl/bits/mng/block_alloc.h
@@ -138,7 +138,7 @@ private:
perm[i] = i;
stxxl::random_number<random_uniform_fast> rnd;
- std::random_shuffle(perm.begin(), perm.end(), rnd _STXXL_FORCE_SEQUENTIAL);
+ std::shuffle(perm.begin(), perm.end(), std::mt19937(std::random_device()()));
}
public:
diff --git a/include/stxxl/bits/mng/block_alloc_interleaved.h b/include/stxxl/bits/mng/block_alloc_interleaved.h
index a82ee34..5aba23a 100644
--- a/include/stxxl/bits/mng/block_alloc_interleaved.h
+++ b/include/stxxl/bits/mng/block_alloc_interleaved.h
@@ -93,7 +93,7 @@ struct interleaved_RC : public interleaved_striping
perms[i][j] = j;
random_number<random_uniform_fast> rnd;
- std::random_shuffle(perms[i].begin(), perms[i].end(), rnd _STXXL_FORCE_SEQUENTIAL);
}
public:
diff --git a/include/stxxl/bits/mng/block_alloc_interleaved.h b/include/stxxl/bits/mng/block_alloc_interleaved.h
index a82ee34..83925a3 100644
--- a/include/stxxl/bits/mng/block_alloc_interleaved.h
+++ b/include/stxxl/bits/mng/block_alloc_interleaved.h
@@ -93,7 +93,7 @@ struct interleaved_RC : public interleaved_striping
perms[i][j] = j;
random_number<random_uniform_fast> rnd;
- std::random_shuffle(perms[i].begin(), perms[i].end(), rnd _STXXL_FORCE_SEQUENTIAL);
+ std::shuffle(perms[i].begin(), perms[i].end(), std::mt19937(std::random_device()()));
}
}
diff --git a/include/stxxl/bits/mng/disk_allocator.h b/include/stxxl/bits/mng/disk_allocator.h
index 59ad085..c1e0f83 100644
--- a/include/stxxl/bits/mng/disk_allocator.h
+++ b/include/stxxl/bits/mng/disk_allocator.h
@@ -44,7 +44,7 @@ class disk_allocator : private noncopyable
{
typedef std::pair<stxxl::int64, stxxl::int64> place;
- struct first_fit : public std::binary_function<place, stxxl::int64, bool>
}
}
diff --git a/include/stxxl/bits/mng/disk_allocator.h b/include/stxxl/bits/mng/disk_allocator.h
index 59ad085..a4e534e 100644
--- a/include/stxxl/bits/mng/disk_allocator.h
+++ b/include/stxxl/bits/mng/disk_allocator.h
@@ -44,7 +44,7 @@ class disk_allocator : private noncopyable
{
typedef std::pair<stxxl::int64, stxxl::int64> place;
- struct first_fit : public std::binary_function<place, stxxl::int64, bool>
+ struct first_fit
{
bool operator () (
const place& entry,
@@ -189,7 +189,7 @@ void disk_allocator::new_blocks(BID<BlockSize>* begin, BID<BlockSize>* end)
sortseq::iterator space;
space = std::find_if(free_space.begin(), free_space.end(),
- bind2nd(first_fit(), requested_size) _STXXL_FORCE_SEQUENTIAL);
{
bool operator () (
const place& entry,
@@ -189,7 +189,7 @@ void disk_allocator::new_blocks(BID<BlockSize>* begin, BID<BlockSize>* end)
sortseq::iterator space;
space = std::find_if(free_space.begin(), free_space.end(),
- bind2nd(first_fit(), requested_size) _STXXL_FORCE_SEQUENTIAL);
+ std::bind(first_fit(), std::placeholders::_1, requested_size) _STXXL_FORCE_SEQUENTIAL);
if (space == free_space.end() && requested_size == BlockSize)
{
@@ -207,7 +207,7 @@ void disk_allocator::new_blocks(BID<BlockSize>* begin, BID<BlockSize>* end)
grow_file(BlockSize);
space = std::find_if(free_space.begin(), free_space.end(),
- bind2nd(first_fit(), requested_size) _STXXL_FORCE_SEQUENTIAL);
if (space == free_space.end() && requested_size == BlockSize)
{
@@ -207,7 +207,7 @@ void disk_allocator::new_blocks(BID<BlockSize>* begin, BID<BlockSize>* end)
grow_file(BlockSize);
space = std::find_if(free_space.begin(), free_space.end(),
- bind2nd(first_fit(), requested_size) _STXXL_FORCE_SEQUENTIAL);
+ std::bind(first_fit(), std::placeholders::_1, requested_size) _STXXL_FORCE_SEQUENTIAL);
}
if (space != free_space.end())
diff --git a/include/stxxl/bits/parallel.h b/include/stxxl/bits/parallel.h
index d973861..c858d87 100644
--- a/include/stxxl/bits/parallel.h
+++ b/include/stxxl/bits/parallel.h
@@ -121,7 +121,6 @@ using __gnu_parallel::random_shuffle;
#elif STXXL_PARALLEL
using std::sort;
-using std::random_shuffle;
#else
diff --git a/include/stxxl/bits/parallel/base.h b/include/stxxl/bits/parallel/base.h
index 141d515..7dae74f 100644
--- a/include/stxxl/bits/parallel/base.h
+++ b/include/stxxl/bits/parallel/base.h
@@ -33,7 +33,6 @@ namespace parallel {
*/
template <class Predicate, typename first_argument_type, typename second_argument_type>
class binary_negate
- : public std::binary_function<first_argument_type, second_argument_type, bool>
{
protected:
Predicate pred;
@@ -80,7 +79,7 @@ static inline void decode2(lcas_t x, int& a, int& b)
* Constructs predicate for equality from strict weak ordering predicate
*/
template <class Comparator, typename T1, typename T2>
-class equal_from_less : public std::binary_function<T1, T2, bool>
}
if (space != free_space.end())
diff --git a/include/stxxl/bits/msvc_compatibility.h b/include/stxxl/bits/msvc_compatibility.h
index c2c937d..0cb22e5 100644
--- a/include/stxxl/bits/msvc_compatibility.h
+++ b/include/stxxl/bits/msvc_compatibility.h
@@ -19,10 +19,12 @@
#include <cmath>
+#if _MSC_VER < 1900
inline double log2(double x)
{
return (log(x) / log(2.));
}
+#endif // ^^^ _MSC_VER < 1900
// http://msdn.microsoft.com/en-us/library/2ts7cx93.aspx
#define snprintf _snprintf
diff --git a/include/stxxl/bits/parallel.h b/include/stxxl/bits/parallel.h
index d973861..c858d87 100644
--- a/include/stxxl/bits/parallel.h
+++ b/include/stxxl/bits/parallel.h
@@ -121,7 +121,6 @@ using __gnu_parallel::random_shuffle;
#elif STXXL_PARALLEL
using std::sort;
-using std::random_shuffle;
#else
diff --git a/include/stxxl/bits/parallel/base.h b/include/stxxl/bits/parallel/base.h
index 141d515..1c970f9 100644
--- a/include/stxxl/bits/parallel/base.h
+++ b/include/stxxl/bits/parallel/base.h
@@ -33,7 +33,6 @@ namespace parallel {
*/
template <class Predicate, typename first_argument_type, typename second_argument_type>
class binary_negate
- : public std::binary_function<first_argument_type, second_argument_type, bool>
{
protected:
Predicate pred;
@@ -80,7 +79,7 @@ static inline void decode2(lcas_t x, int& a, int& b)
* Constructs predicate for equality from strict weak ordering predicate
*/
template <class Comparator, typename T1, typename T2>
-class equal_from_less : public std::binary_function<T1, T2, bool>
+class equal_from_less
{
private:
Comparator& comp;
@@ -126,7 +125,7 @@ median_of_three_iterators(RandomAccessIterator a, RandomAccessIterator b,
/** Similar to std::equal_to, but allows two different types. */
template <typename T1, typename T2>
-struct equal_to : std::binary_function<T1, T2, bool>
{
private:
Comparator& comp;
@@ -126,7 +125,7 @@ median_of_three_iterators(RandomAccessIterator a, RandomAccessIterator b,
/** Similar to std::equal_to, but allows two different types. */
template <typename T1, typename T2>
-struct equal_to : std::binary_function<T1, T2, bool>
+struct equal_to
{
bool operator () (const T1& t1, const T2& t2) const
{
@@ -136,7 +135,7 @@ struct equal_to : std::binary_function<T1, T2, bool>
/** Similar to std::less, but allows two different types. */
template <typename T1, typename T2>
-struct less : std::binary_function<T1, T2, bool>
{
bool operator () (const T1& t1, const T2& t2) const
{
@@ -136,7 +135,7 @@ struct equal_to : std::binary_function<T1, T2, bool>
/** Similar to std::less, but allows two different types. */
template <typename T1, typename T2>
-struct less : std::binary_function<T1, T2, bool>
+struct less
{
bool operator () (const T1& t1, const T2& t2) const
{
diff --git a/include/stxxl/bits/parallel/multiseq_selection.h b/include/stxxl/bits/parallel/multiseq_selection.h
index 57e7599..f41d9aa 100644
--- a/include/stxxl/bits/parallel/multiseq_selection.h
+++ b/include/stxxl/bits/parallel/multiseq_selection.h
@@ -35,7 +35,6 @@ namespace parallel {
//! Compare a pair of types lexcigraphically, ascending.
template <typename T1, typename T2, typename Comparator>
class lexicographic
- : public std::binary_function<std::pair<T1, T2>, std::pair<T1, T2>, bool>
{
protected:
Comparator& m_comp;
@@ -60,7 +59,6 @@ public:
//! Compare a pair of types lexcigraphically, descending.
template <typename T1, typename T2, typename Comparator>
class lexicographic_rev
- : public std::binary_function<std::pair<T1, T2>, std::pair<T1, T2>, bool>
{
protected:
Comparator& m_comp;
diff --git a/lib/io/wbtl_file.cpp b/lib/io/wbtl_file.cpp
index 310d76a..6d52e2e 100644
--- a/lib/io/wbtl_file.cpp
+++ b/lib/io/wbtl_file.cpp
@@ -304,7 +304,7 @@ wbtl_file::offset_type wbtl_file::get_next_write_block()
// mapping_lock has to be aquired by caller
sortseq::iterator space =
std::find_if(free_space.begin(), free_space.end(),
- bind2nd(FirstFit(), write_block_size) _STXXL_FORCE_SEQUENTIAL);
{
bool operator () (const T1& t1, const T2& t2) const
{
diff --git a/include/stxxl/bits/parallel/multiseq_selection.h b/include/stxxl/bits/parallel/multiseq_selection.h
index 57e7599..f41d9aa 100644
--- a/include/stxxl/bits/parallel/multiseq_selection.h
+++ b/include/stxxl/bits/parallel/multiseq_selection.h
@@ -35,7 +35,6 @@ namespace parallel {
//! Compare a pair of types lexcigraphically, ascending.
template <typename T1, typename T2, typename Comparator>
class lexicographic
- : public std::binary_function<std::pair<T1, T2>, std::pair<T1, T2>, bool>
{
protected:
Comparator& m_comp;
@@ -60,7 +59,6 @@ public:
//! Compare a pair of types lexcigraphically, descending.
template <typename T1, typename T2, typename Comparator>
class lexicographic_rev
- : public std::binary_function<std::pair<T1, T2>, std::pair<T1, T2>, bool>
{
protected:
Comparator& m_comp;
diff --git a/lib/io/wbtl_file.cpp b/lib/io/wbtl_file.cpp
index 310d76a..5f1a766 100644
--- a/lib/io/wbtl_file.cpp
+++ b/lib/io/wbtl_file.cpp
@@ -304,7 +304,7 @@ wbtl_file::offset_type wbtl_file::get_next_write_block()
// mapping_lock has to be aquired by caller
sortseq::iterator space =
std::find_if(free_space.begin(), free_space.end(),
- bind2nd(FirstFit(), write_block_size) _STXXL_FORCE_SEQUENTIAL);
+ std::bind(FirstFit(), std::placeholders::_1, write_block_size) _STXXL_FORCE_SEQUENTIAL);
if (space != free_space.end())
{
if (space != free_space.end())
{

4
ports/stxxl/vcpkg.json
View File

@ -1,6 +1,6 @@
{
"name": "stxxl",
"version-string": "2018-11-15",
"port-version": 4,
"version-date": "2018-11-15",
"port-version": 5,
"description": "Standard Template Library for Extra Large Data Sets"
}

4
scripts/azure-pipelines/azure-pipelines.yml
View File

@ -2,8 +2,8 @@
# SPDX-License-Identifier: MIT
#
variables:
windows-pool: 'PrWin-2022-04-13'
linux-pool: 'PrLin-2022-04-13'
windows-pool: 'PrWin-2022-05-16'
linux-pool: 'PrLin-2022-05-16'
osx-pool: 'PrOsx-2022-02-04'
jobs:

18
scripts/azure-pipelines/linux/provision-image.sh
View File

@ -14,7 +14,7 @@ APT_PACKAGES="at curl unzip tar libxt-dev gperf libxaw7-dev cifs-utils \
libxcursor-dev yasm libnuma1 libnuma-dev python-six python3-six python-yaml \
flex libbison-dev autoconf libudev-dev libncurses5-dev libtool libxrandr-dev \
xutils-dev dh-autoreconf autoconf-archive libgles2-mesa-dev ruby-full \
pkg-config meson"
pkg-config meson nasm cmake ninja-build"
# Additionally required by qt5-base
APT_PACKAGES="$APT_PACKAGES libxext-dev libxfixes-dev libxrender-dev \
@ -58,27 +58,17 @@ APT_PACKAGES="$APT_PACKAGES liblttng-ust0 libkrb5-3 zlib1g libicu66"
apt-get -y install $APT_PACKAGES
# Install newer version of nasm than the apt package, required by intel-ipsec
mkdir /tmp/nasm
cd /tmp/nasm
curl -O https://www.nasm.us/pub/nasm/releasebuilds/2.15.05/nasm-2.15.05.tar.gz
tar -xf nasm-2.15.05.tar.gz
cd nasm-2.15.05/
./configure --prefix=/usr && make -j
make install
cd ~
# Install the latest Haskell stack
# Install the latest Haskell stack for bond
curl -sSL https://get.haskellstack.org/ | sh
# Install CUDA
wget https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2004/x86_64/cuda-ubuntu2004.pin
mv cuda-ubuntu2004.pin /etc/apt/preferences.d/cuda-repository-pin-600
apt-key adv --fetch-keys https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2004/x86_64/7fa2af80.pub
apt-key adv --fetch-keys https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2004/x86_64/3bf863cc.pub
add-apt-repository "deb https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2004/x86_64/ /"
apt-get -y update
apt-get install -y --no-install-recommends cuda-compiler-11-6 cuda-libraries-dev-11-6 cuda-driver-dev-11-6 \
cuda-cudart-dev-11-6 libcublas-11-6 libcurand-dev-11-6 libcudnn8-dev libnccl2 libnccl-dev
cuda-cudart-dev-11-6 libcublas-11-6 libcurand-dev-11-6 cuda-nvml-dev-11-6 libcudnn8-dev libnccl2 libnccl-dev
# Install PowerShell
wget -q https://packages.microsoft.com/config/ubuntu/20.04/packages-microsoft-prod.deb

3
scripts/azure-pipelines/windows/azure-pipelines.yml
View File

@ -34,9 +34,6 @@ jobs:
pwsh: true
- script: .\bootstrap-vcpkg.bat
displayName: 'Bootstrap vcpkg'
- script: |
if exist ${{ variables.VCPKG_DOWNLOADS }} rmdir /S /Q ${{ variables.VCPKG_DOWNLOADS }} 2>&1
displayName: 'Clean downloads'
# Note that we run docs checks before PR checks because they are likely to invalidate a whole run anyway
- task: Powershell@2
displayName: 'Generate Documentation'

2
scripts/azure-pipelines/windows/deploy-pwsh.ps1
View File

@ -5,5 +5,5 @@
# REPLACE WITH UTILITY-PREFIX.ps1
$PwshUrl = 'https://github.com/PowerShell/PowerShell/releases/download/v7.2.2/PowerShell-7.2.2-win-x64.msi'
$PwshUrl = 'https://github.com/PowerShell/PowerShell/releases/download/v7.2.3/PowerShell-7.2.3-win-x64.msi'
InstallMSI -Url $PwshUrl -Name 'PowerShell Core'

28
scripts/ci.baseline.txt
View File

@ -172,6 +172,12 @@ cpp-netlib:x64-uwp=fail
cppcoro:x64-linux=fail
cppcoro:arm-uwp=fail
cppcoro:x64-uwp=fail
# VS 2022 17.2 miscompiles this:
cppgraphqlgen:arm64-windows=fail
cppgraphqlgen:x64-windows=fail
cppgraphqlgen:x64-windows-static=fail
cppgraphqlgen:x64-windows-static-md=fail
cppgraphqlgen:x86-windows=fail
# The x64-linux pipeline uses gcc 9.3.0, which lacks C++20 coroutine support.
# This is known to work on x64-linux as of gcc 10.3.0.
cppgraphqlgen:x64-linux=fail
@ -648,7 +654,6 @@ mecab:x64-windows-static-md=skip
mecab:x86-windows = skip
# Due to static crt.
mesa:x64-windows-static=fail
mesa:x64-windows-static-md=fail
# Missing dependent libraries.
mesa:x64-linux=fail
mesa:x64-osx=fail
@ -933,9 +938,8 @@ qt5-webengine:x64-osx=fail
# Succesful built requires protobuf to be installed after qt5-webengine not before. Otherwise the build picks up the wrong headers from inside vcpkg.
qt5-webengine:x64-windows=skip
qt5-webengine:x86-windows=skip
# Static builds of qt5-webengine are not supported by the port itself
qt5-webengine:x64-windows-static=skip
qt5-webengine:x64-windows-static-md=skip
# VS2022 17.2 ICE https://developercommunity.visualstudio.com/t/Visual-Studio-2022-v1720-reports-fata/10039296
qtwebengine:x64-windows=fail
# Missing system libraries
qt5-x11extras:x64-osx=fail
# Missing libraries
@ -1019,6 +1023,10 @@ rsasynccpp:x64-osx=fail
rsm-binary-io:x64-linux=fail
# Requires g++10 but CI compiler only has g++9
rsm-bsa:x64-linux=fail
# VS2022 17.2 ICE https://devdiv.visualstudio.com/DefaultCollection/DevDiv/_workitems/edit/1490389
rsocket:x64-windows=fail
rsocket:x64-windows-static=fail
rsocket:x64-windows-static-md=fail
rtlsdr:x64-uwp=fail
rtlsdr:arm64-windows=fail
rtlsdr:arm-uwp=fail
@ -1247,18 +1255,6 @@ yara:x64-uwp=fail
z3:arm-uwp=fail
z3:x64-uwp=fail
# Official downloading server of CTP library is only guaranteed to be available during trading hours of China futures market
# Skip CI to avoid random failures
ctp:arm64-windows=skip
ctp:arm-uwp=skip
ctp:x64-linux=skip
ctp:x64-osx=skip
ctp:x64-uwp=skip
ctp:x64-windows=skip
ctp:x64-windows-static=skip
ctp:x64-windows-static-md=skip
ctp:x86-windows=skip
# clapack is replaced by lapack-reference on the platforms lapack-reference supports
clapack:x64-linux=skip
clapack:x64-osx=skip

8
scripts/vcpkgTools.xml
View File

@ -187,11 +187,11 @@
<archiveName>ninja-freebsd-1.8.2.zip</archiveName>
</tool>
<tool name="powershell-core" os="windows">
<version>7.2.1</version>
<version>7.2.3</version>
<exeRelativePath>pwsh.exe</exeRelativePath>
<url>https://github.com/PowerShell/PowerShell/releases/download/v7.2.1/PowerShell-7.2.1-win-x86.zip</url>
<sha512>f7a1d7de59c9400ee7d4f988a35daf6f52aef3206a9de9948e5f8d81b7e838301e07491b9cab417fc58f9fd2eb28773175e86a06158ae868c7ef076cc4be7882</sha512>
<archiveName>PowerShell-7.2.1-win-x86.zip</archiveName>
<url>https://github.com/PowerShell/PowerShell/releases/download/v7.2.3/PowerShell-7.2.3-win-x86.zip</url>
<sha512>4b275fd1dc6430e0d7b77d4c34ec54ad47502602592ebc1ec99c88610ec24d3adca27a41896dc4767ac820ad7e000f9c2b1d678b05e9dd76086ff52a11976f80</sha512>
<archiveName>PowerShell-7.2.3-win-x86.zip</archiveName>
</tool>
<tool name="node" os="windows">
<version>16.12.0</version>

2
versions/baseline.json
View File

@ -6830,7 +6830,7 @@
},
"stxxl": {
"baseline": "2018-11-15",
"port-version": 4
"port-version": 5
},
"suitesparse": {
"baseline": "5.8.0",

5
versions/s-/stxxl.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "769f42922523b172d890b697a65096ca47e06ff8",
"version-date": "2018-11-15",
"port-version": 5
},
{
"git-tree": "081a4c6de6290ce05297cc873fa0fde245133a8a",
"version-string": "2018-11-15",