experiments/STT-tensorflow
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Unbreak windows build

Browse Source 
flat_hash_set pulls in variant that does not build on MSVC & nvcc.

external/com_google_absl\absl/types/internal/variant.h(1042): error: parameter pack "H" was referenced but not expanded

          detected during instantiation of class "absl::lts_2020_02_25::variant_internal::VariantStateBase<H, T...> [with H=T..., T=<>]"

PiperOrigin-RevId: 335119227
Change-Id: I3a02b96552efa6aab0c5ede36ecb0392db5cf1e9
This commit is contained in:
Sanjoy Das 2020-10-02 16:06:32 -07:00 committed by TensorFlower Gardener
parent 9ce847ed14
commit 36314ba572
2 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tensorflow/stream_executor/BUILD
View File

@ -92,7 +92,6 @@ cc_library(
"//tensorflow/stream_executor/lib",
"//tensorflow/stream_executor/platform",
"@com_google_absl//absl/base:core_headers",
"@com_google_absl//absl/container:flat_hash_set",
"@com_google_absl//absl/memory",
"@com_google_absl//absl/strings",
"@com_google_absl//absl/synchronization",
@ -141,7 +140,6 @@ cc_library(
"//tensorflow/stream_executor/lib",
"//tensorflow/stream_executor/platform",
"@com_google_absl//absl/base:core_headers",
"@com_google_absl//absl/container:flat_hash_set",
"@com_google_absl//absl/memory",
"@com_google_absl//absl/strings",
"@com_google_absl//absl/synchronization",
@ -353,7 +351,6 @@ cc_library(
"//tensorflow/stream_executor/lib",
"//tensorflow/stream_executor/platform",
"@com_google_absl//absl/base:core_headers",
"@com_google_absl//absl/container:flat_hash_set",
"@com_google_absl//absl/memory",
"@com_google_absl//absl/strings",
"@com_google_absl//absl/strings:str_format",
@ -492,7 +489,6 @@ cc_library(
"//tensorflow/stream_executor/lib",
"//tensorflow/stream_executor/platform",
"@com_google_absl//absl/base:core_headers",
"@com_google_absl//absl/container:flat_hash_set",
"@com_google_absl//absl/memory",
"@com_google_absl//absl/strings",
"@com_google_absl//absl/synchronization",
@ -532,7 +528,6 @@ cc_library(
"//tensorflow/stream_executor/platform",
"//third_party/eigen3",
"@com_google_absl//absl/base:core_headers",
"@com_google_absl//absl/container:flat_hash_set",
"@com_google_absl//absl/memory",
"@com_google_absl//absl/strings",
"@com_google_absl//absl/strings:str_format",
@ -584,7 +579,6 @@ cc_library(
"//tensorflow/stream_executor/lib",
"//tensorflow/stream_executor/platform",
"@com_google_absl//absl/base:core_headers",
"@com_google_absl//absl/container:flat_hash_set",
"@com_google_absl//absl/memory",
"@com_google_absl//absl/strings",
"@com_google_absl//absl/synchronization",

7
tensorflow/stream_executor/stream_executor_pimpl.h
View File

@ -23,7 +23,6 @@ limitations under the License.
#include <vector>
#include "absl/base/macros.h"
#include "absl/container/flat_hash_set.h"
#include "absl/memory/memory.h"
#include "absl/synchronization/mutex.h"
#include "absl/types/optional.h"
@ -520,7 +519,9 @@ class StreamExecutor {
std::vector<Stream *> streams;
{
absl::MutexLock lock(&mu_);
absl::c_copy(streams_, std::back_inserter(streams));
for (Stream *stream : streams_) {
streams.push_back(stream);
}
}
for (Stream *stream : streams) {
@ -760,7 +761,7 @@ class StreamExecutor {
StreamExecutorMemoryAllocator allocator_;
// Set of streams associated with this stream executor.
absl::flat_hash_set<Stream *> streams_ TF_GUARDED_BY(mu_);
std::set<Stream *> streams_ TF_GUARDED_BY(mu_);
SE_DISALLOW_COPY_AND_ASSIGN(StreamExecutor);
};