few minor tweaks for recent MSVC update
Signed-off-by: raver119 <raver119@gmail.com>master
parent
9ca679e080
commit
08a77d929b
|
@ -69,7 +69,7 @@ namespace cnpy {
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
struct ND4J_EXPORT npz_t : public std::unordered_map<std::string, NpyArray> {
|
struct ND4J_EXPORT npz_t : public std::map<std::string, NpyArray> {
|
||||||
void destruct() {
|
void destruct() {
|
||||||
npz_t::iterator it = this->begin();
|
npz_t::iterator it = this->begin();
|
||||||
for(; it != this->end(); ++it) (*it).second.destruct();
|
for(; it != this->end(); ++it) (*it).second.destruct();
|
||||||
|
|
|
@ -3963,9 +3963,6 @@ namespace simdOps {
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifndef __clang__
|
|
||||||
#pragma omp declare simd uniform(extraParamsRef)
|
|
||||||
#endif
|
|
||||||
op_def static Y merge(X old, X opOutput, X *extraParamsRef) {
|
op_def static Y merge(X old, X opOutput, X *extraParamsRef) {
|
||||||
return update(old, opOutput, extraParamsRef);
|
return update(old, opOutput, extraParamsRef);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue