Skip to content

Commit 53c4f7e

Browse files
authored
Merge pull request #80 from graemenail/browsermt-quickfix
Quick fix for Windows issues
2 parents 7e67124 + 48dd63e commit 53c4f7e

File tree

1 file changed

+7
-5
lines changed

1 file changed

+7
-5
lines changed

src/tensors/cpu/intgemm_interface.h

+7-5
Original file line numberDiff line numberDiff line change
@@ -44,14 +44,15 @@ bool shifted_;
4444
val_->data<int8_t>() /*output*/);
4545
#else
4646
typedef typename intgemm_<vtype>::type Integer;
47+
auto input = child(0)->val();
4748
if (!shifted_) {
48-
intgemm_<vtype>::width::PrepareA(child(0)->val()->data(), /*input*/
49+
intgemm_<vtype>::width::PrepareA(input->data(), /*input*/
4950
val_->data<Integer>(), /*output*/
5051
*child(1)->val()->data(), /*Quant Mult*/
5152
rows(child(0)->val()),
5253
cols(child(0)->val()));
5354
} else {
54-
intgemm::Int8Shift::PrepareA(child(0)->val()->data(), /*input*/
55+
intgemm::Int8Shift::PrepareA(input->data(), /*input*/
5556
val_->data<int8_t>(), /*output*/
5657
*child(1)->val()->data(), /*Quant Mult*/
5758
rows(child(0)->val()),
@@ -207,8 +208,8 @@ struct SelectColumnsBNodeOp : public UnaryNodeOp {
207208
reinterpret_cast<Integer *>(input->data()),
208209
val_->data<Integer>(),
209210
rows(input),
210-
&*indices_.begin(),
211-
&*indices_.end());
211+
indices_.data(),
212+
indices_.data()+indices_.size());
212213
#endif
213214
}};
214215
#else
@@ -274,7 +275,8 @@ struct QuantMultNodeOp : public UnaryNodeOp {
274275
std::cerr << "Name: " << name() << " MeanAbs: " << meanstd.mean << " stddevAbs: " << meanstd.stddev << " Mean: " << meanstd2.mean << " stddev: "
275276
<< meanstd2.stddev << " MaxAbs: " << intgemm::MaxAbsolute(child(0)->val()->data(), child(0)->val()->data() + child(0)->val()->shape().elements()) << std::endl;
276277
}
277-
*val_->data() = 127.0f / intgemm::MaxAbsolute(child(0)->val()->data(), child(0)->val()->data() + child(0)->val()->shape().elements());
278+
auto input = child(0)->val();
279+
*val_->data() = 127.0f / intgemm::MaxAbsolute(input->data(), input->data() + input->size());
278280
}
279281
)};
280282
#else

0 commit comments

Comments
 (0)