merge with master

2 files changed, 2 insertions, 2 deletions

diff --git a/src/graph/expression_graph.h b/src/graph/expression_graph.h
index fe836161..dfd00a9a 100644
--- a/src/graph/expression_graph.h
+++ b/src/graph/expression_graph.h
@@ -400,7 +400,7 @@ public:
     auto e = params_->get(name);
     if(e)
       return e;
-    return Expr();
+    return Expr();  // @TODO: how is this different from just returning 'e'?
   }
 
   Ptr<Parameters>& params() { return params_; }
diff --git a/src/graph/node_initializers.cpp b/src/graph/node_initializers.cpp
index f405102e..b2550c54 100644
--- a/src/graph/node_initializers.cpp
+++ b/src/graph/node_initializers.cpp
@@ -195,7 +195,7 @@ NodeInitializer from_item(const io::Item& item) {
 NodeInitializer sinusoidalPositionEmbeddings(int start) {
   return [start](Tensor t) {
     int dimEmb   = t->shape()[-1];
-    int dimWords = t->size() / dimEmb;
+    int dimWords = (int)t->size() / dimEmb;
 
     float numTimescales = (float)dimEmb / 2;
     float logTimescaleIncrement = std::log(10000.f) / (numTimescales - 1.f);