From 08a77d929b229813abdcb82744d41ac6b8c4c707 Mon Sep 17 00:00:00 2001 From: raver119 Date: Tue, 16 Jun 2020 09:07:20 +0300 Subject: [PATCH] few minor tweaks for recent MSVC update Signed-off-by: raver119 --- libnd4j/include/cnpy/cnpy.h | 2 +- libnd4j/include/ops/ops.h | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/libnd4j/include/cnpy/cnpy.h b/libnd4j/include/cnpy/cnpy.h index ea847c3e7..c84623599 100644 --- a/libnd4j/include/cnpy/cnpy.h +++ b/libnd4j/include/cnpy/cnpy.h @@ -69,7 +69,7 @@ namespace cnpy { } }; - struct ND4J_EXPORT npz_t : public std::unordered_map { + struct ND4J_EXPORT npz_t : public std::map { void destruct() { npz_t::iterator it = this->begin(); for(; it != this->end(); ++it) (*it).second.destruct(); diff --git a/libnd4j/include/ops/ops.h b/libnd4j/include/ops/ops.h index ea52e9ba0..aca6fec6f 100644 --- a/libnd4j/include/ops/ops.h +++ b/libnd4j/include/ops/ops.h @@ -3963,9 +3963,6 @@ namespace simdOps { } #endif -#ifndef __clang__ -#pragma omp declare simd uniform(extraParamsRef) -#endif op_def static Y merge(X old, X opOutput, X *extraParamsRef) { return update(old, opOutput, extraParamsRef); }