Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/marian-nmt/marian.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomasz Dwojak <t.dwojak@amu.edu.pl>2017-03-29 13:31:49 +0300
committerTomasz Dwojak <t.dwojak@amu.edu.pl>2017-03-29 13:31:49 +0300
commit434ad2453976c0adca429e96bdccd73bc5f16165 (patch)
tree63b0900cfbc35fe1af688da27025b0b391f85479
parentbe29646511b8ffa5647995fd230454a92338b94c (diff)
Remove confusing warnings during loading no-LN model on cpu
-rw-r--r--src/cpu/npz_converter.h36
1 files changed, 19 insertions, 17 deletions
diff --git a/src/cpu/npz_converter.h b/src/cpu/npz_converter.h
index 6bd2f692..7488ead7 100644
--- a/src/cpu/npz_converter.h
+++ b/src/cpu/npz_converter.h
@@ -12,55 +12,55 @@ class NpzConverter {
public:
NpyMatrixWrapper(const cnpy::NpyArray& npy)
: npy_(npy) {}
-
+
size_t size() const {
return size1() * size2();
}
-
+
float* data() const {
return (float*)npy_.data;
}
-
+
float operator()(size_t i, size_t j) const {
return ((float*)npy_.data)[i * size2() + j];
}
-
+
size_t size1() const {
return npy_.shape[0];
}
-
+
size_t size2() const {
if(npy_.shape.size() == 1)
return 1;
else
- return npy_.shape[1];
+ return npy_.shape[1];
}
-
+
private:
const cnpy::NpyArray& npy_;
};
-
+
public:
-
+
typedef blaze::CustomMatrix<float, blaze::unaligned,
blaze::unpadded, blaze::rowMajor> BlazeWrapper;
-
-
+
+
NpzConverter(const std::string& file)
: model_(cnpy::npz_load(file)),
destructed_(false) {
}
-
+
~NpzConverter() {
if(!destructed_)
model_.destruct();
}
-
+
void Destruct() {
model_.destruct();
destructed_ = true;
}
-
+
mblas::Matrix operator[](const std::string& key) const {
BlazeWrapper matrix;
auto it = model_.find(key);
@@ -69,14 +69,16 @@ class NpzConverter {
matrix = BlazeWrapper(np.data(), np.size1(), np.size2());
}
else {
- std::cerr << "Missing " << key << std::endl;
+ if (key.find("gamma") == std::string::npos) {
+ std::cerr << "Missing " << key << std::endl;
+ }
}
mblas::Matrix ret;
ret = matrix;
return std::move(ret);
}
-
+
mblas::Matrix operator()(const std::string& key,
bool transpose) const {
BlazeWrapper matrix;
@@ -91,7 +93,7 @@ class NpzConverter {
ret = matrix2;
return std::move(ret);
}
-
+
private:
cnpy::npz_t model_;
bool destructed_;