Issue #1741 rr,ss,tt only generated if used

casadi · Mar 10, 2017 · c081ac3 · c081ac3
1 parent a76824b
commit c081ac3
Show file tree

Hide file tree

Showing 9 changed files with 23 additions and 1 deletion.
diff --git a/casadi/core/function/mx_function.cpp b/casadi/core/function/mx_function.cpp
@@ -1068,7 +1068,7 @@ namespace casadi {
   void MXFunction::generateBody(CodeGenerator& g) const {
     // Temporary variables and vectors
     g << "int i, j, k;\n"
-      << "real_t r, s, t, *rr, *ss, *tt;\n"
+      << "real_t r, s, t;\n"
       << "const real_t** arg1=arg+" << n_in() << ";\n"
       << "real_t** res1=res+" << n_out() << ";\n";
 

diff --git a/casadi/core/mx/binary_mx_impl.hpp b/casadi/core/mx/binary_mx_impl.hpp
@@ -128,6 +128,7 @@ namespace casadi {
     // Codegen loop, if needed
     if (nnz()>1) {
       // Iterate over result
+      g.local("rr", "real_t", "*");
       g << "for (i=0, " << "rr=" << g.work(res[0], nnz());
       r = "(*rr++)";
 

diff --git a/casadi/core/mx/concat.cpp b/casadi/core/mx/concat.cpp
@@ -79,6 +79,7 @@ namespace casadi {
 
   void Concat::generate(CodeGenerator& g, const std::string& mem,
                         const std::vector<int>& arg, const std::vector<int>& res) const {
+    g.local("rr", "real_t", "*");
     g << "rr=" << g.work(res[0], nnz()) << ";\n";
     for (int i=0; i<arg.size(); ++i) {
       int nz = dep(i).nnz();

diff --git a/casadi/core/mx/getnonzeros.cpp b/casadi/core/mx/getnonzeros.cpp
@@ -440,6 +440,8 @@ namespace casadi {
 
     // Codegen the assignments
     g.local("cii", "const int", "*");
+    g.local("rr", "real_t", "*");
+    g.local("ss", "real_t", "*");
     g << "for (cii=s" << ind << ", rr=" << g.work(res[0], nnz())
       << ", ss=" << g.work(arg[0], dep(0).nnz())
       << "; cii!=s" << ind << "+" << nz_.size()
@@ -468,13 +470,18 @@ namespace casadi {
 
   void GetNonzerosSlice::generate(CodeGenerator& g, const std::string& mem,
                                   const std::vector<int>& arg, const std::vector<int>& res) const {
+    g.local("rr", "real_t", "*");
+    g.local("ss", "real_t", "*");
     g << "for (rr=" << g.work(res[0], nnz()) << ", ss=" << g.work(arg[0], dep(0).nnz())
       << "+" << s_.start << "; ss!=" << g.work(arg[0], dep(0).nnz()) << "+" << s_.stop
       << "; ss+=" << s_.step << ") *rr++ = *ss;\n";
   }
 
   void GetNonzerosSlice2::generate(CodeGenerator& g, const std::string& mem,
                                    const std::vector<int>& arg, const std::vector<int>& res) const {
+    g.local("rr", "real_t", "*");
+    g.local("ss", "real_t", "*");
+    g.local("tt", "real_t", "*");
     g << "for (rr=" << g.work(res[0], nnz()) << ", ss=" << g.work(arg[0], dep(0).nnz())
       << "+" << outer_.start << "; ss!=" << g.work(arg[0], dep(0).nnz()) << "+"
       << outer_.stop << "; ss+=" << outer_.step << ") "

diff --git a/casadi/core/mx/monitor.cpp b/casadi/core/mx/monitor.cpp
@@ -105,6 +105,7 @@ namespace casadi {
   void Monitor::generate(CodeGenerator& g, const std::string& mem,
                          const std::vector<int>& arg, const std::vector<int>& res) const {
     // Print comment
+    g.local("rr", "real_t", "*");
     g << g.printf(comment_ + "\\n[") << "\n"
       << "  for (i=0, rr=" << g.work(arg[0], dep(0).nnz())
       << "; i!=" << nnz() << "; ++i) {\n"

diff --git a/casadi/core/mx/multiplication.cpp b/casadi/core/mx/multiplication.cpp
@@ -125,6 +125,9 @@ namespace casadi {
     }
 
     int nrow_x = dep(1).size1(), nrow_y = dep(2).size1(), ncol_y = dep(2).size2();
+    g.local("rr", "real_t", "*");
+    g.local("ss", "real_t", "*");
+    g.local("tt", "real_t", "*");
     g << "for (i=0, rr=" << g.work(res[0], nnz()) <<"; i<" << ncol_y << "; ++i)"
       << " for (j=0; j<" << nrow_x << "; ++j, ++rr)"
       << " for (k=0, ss=" << g.work(arg[1], dep(1).nnz()) << "+j, tt="

diff --git a/casadi/core/mx/setnonzeros_impl.hpp b/casadi/core/mx/setnonzeros_impl.hpp
@@ -753,6 +753,8 @@ namespace casadi {
 
     // Perform the operation inplace
     g.local("cii", "const int", "*");
+    g.local("rr", "real_t", "*");
+    g.local("ss", "real_t", "*");
     g << "for (cii=s" << ind << ", rr=" << g.work(res[0], this->nnz()) << ", "
       << "ss=" << g.work(arg[1], this->dep(1).nnz()) << "; cii!=s" << ind
       << "+" << this->nz_.size() << "; ++cii, ++ss)"
@@ -770,6 +772,8 @@ namespace casadi {
     }
 
     // Perform the operation inplace
+    g.local("rr", "real_t", "*");
+    g.local("ss", "real_t", "*");
     g << "for (rr=" << g.work(res[0], this->nnz()) << "+" << s_.start << ", ss="
       << g.work(arg[1], this->dep(1).nnz()) << "; rr!="
       << g.work(res[0], this->nnz()) << "+" << s_.stop
@@ -788,6 +792,9 @@ namespace casadi {
     }
 
     // Perform the operation inplace
+    g.local("rr", "real_t", "*");
+    g.local("ss", "real_t", "*");
+    g.local("tt", "real_t", "*");
     g << "for (rr=" << g.work(res[0], this->nnz()) << "+" << outer_.start
       << ", ss=" << g.work(arg[1], this->dep(1).nnz()) << "; rr!="
       << g.work(res[0], this->nnz()) << "+" << outer_.stop

diff --git a/casadi/core/mx/transpose.cpp b/casadi/core/mx/transpose.cpp
@@ -191,6 +191,7 @@ namespace casadi {
   void DenseTranspose::generate(CodeGenerator& g, const std::string& mem,
                                 const std::vector<int>& arg, const std::vector<int>& res) const {
     g.local("cs", "const real_t", "*");
+    g.local("rr", "real_t", "*");
     g << "for (i=0, rr=" << g.work(res[0], nnz()) << ", "
       << "cs=" << g.work(arg[0], nnz()) << "; i<" << dep().size2() << "; ++i) "
       << "for (j=0; j<" << dep().size1() << "; ++j) "

diff --git a/casadi/core/mx/unary_mx.cpp b/casadi/core/mx/unary_mx.cpp
@@ -106,6 +106,7 @@ namespace casadi {
     } else {
       // Vector assignment
       g.local("cs", "const real_t", "*");
+      g.local("rr", "real_t", "*");
       g << "for (i=0, rr=" << g.work(res[0], nnz()) << ", cs=" << g.work(arg[0], nnz())
         << "; i<" << sparsity().nnz() << "; ++i) ";
       r = "*rr++";