From 32f78404c09adf928ab726857ccabc6191f75f33 Mon Sep 17 00:00:00 2001 From: William Hart Date: Sat, 8 Oct 2022 21:17:36 -0400 Subject: [PATCH 1/2] Build docs with relative path --- doc/build_doc.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/build_doc.sh b/doc/build_doc.sh index f4b56a7b..1dd5fc0b 100755 --- a/doc/build_doc.sh +++ b/doc/build_doc.sh @@ -28,9 +28,9 @@ if [[ $1 == "poek" ]]; then echo "Building poek documentation with cmake"; mkdir _build cd _build - conda run -p /home/docs/checkouts/readthedocs.org/user_builds/poek/checkouts/dev/rtd ../rtd/bin/cmake -Dwith_docs=ON -Dwith_python=ON .. - conda run -p /home/docs/checkouts/readthedocs.org/user_builds/poek/checkouts/dev/rtd make install_tpls - conda run -p /home/docs/checkouts/readthedocs.org/user_builds/poek/checkouts/dev/rtd make VERBOSE=1 - conda run -p /home/docs/checkouts/readthedocs.org/user_builds/poek/checkouts/dev/rtd make doc_poek + conda run -p ../rtd ../rtd/bin/cmake -Dwith_docs=ON -Dwith_python=ON .. + conda run -p ../rtd make install_tpls + conda run -p ../rtd make VERBOSE=1 + conda run -p ../rtd make doc_poek mv lib/poek/doc/sphinx ../_readthedocs/html fi From 3e57a7bfe41338451ec2112009fc2d3e628e8751 Mon Sep 17 00:00:00 2001 From: William Hart Date: Sat, 8 Oct 2022 21:32:30 -0400 Subject: [PATCH 2/2] Adding headers to account for missing declarations --- lib/coek/coek/api/constraint.cpp | 1 + lib/coek/coek/api/expression.cpp | 4 ++-- lib/coek/coek/api/expression_visitor.cpp | 1 + lib/coek/coek/ast/constraint_terms.cpp | 3 +-- lib/coek/coek/ast/constraint_terms.hpp | 1 - lib/coek/coek/autograd/cppad_repn.cpp | 1 + lib/coek/coek/model/writer_nl.cpp | 1 + 7 files changed, 7 insertions(+), 5 deletions(-) diff --git a/lib/coek/coek/api/constraint.cpp b/lib/coek/coek/api/constraint.cpp index 74ee32eb..33feaf0a 100644 --- a/lib/coek/coek/api/constraint.cpp +++ b/lib/coek/coek/api/constraint.cpp @@ -1,3 +1,4 @@ +#include "../ast/base_terms.hpp" #include "../ast/constraint_terms.hpp" #include "../ast/expr_terms.hpp" #include "../ast/value_terms.hpp" diff --git a/lib/coek/coek/api/expression.cpp b/lib/coek/coek/api/expression.cpp index 4f3960c7..dd638b77 100644 --- a/lib/coek/coek/api/expression.cpp +++ b/lib/coek/coek/api/expression.cpp @@ -1,10 +1,10 @@ -#include "coek/api/expression.hpp" - +#include "../ast/base_terms.hpp" #include "../ast/constraint_terms.hpp" #include "../ast/expr_terms.hpp" #include "../ast/value_terms.hpp" #include "../ast/visitor_fns.hpp" #include "../ast/ast_operators.hpp" +#include "coek/api/expression.hpp" namespace coek { diff --git a/lib/coek/coek/api/expression_visitor.cpp b/lib/coek/coek/api/expression_visitor.cpp index dfd74b21..7ff6fa26 100644 --- a/lib/coek/coek/api/expression_visitor.cpp +++ b/lib/coek/coek/api/expression_visitor.cpp @@ -1,3 +1,4 @@ +#include "../ast/base_terms.hpp" #include "../ast/constraint_terms.hpp" #include "../ast/value_terms.hpp" #include "../ast/visitor_fns.hpp" diff --git a/lib/coek/coek/ast/constraint_terms.cpp b/lib/coek/coek/ast/constraint_terms.cpp index 064d2d8f..2a4154fd 100644 --- a/lib/coek/coek/ast/constraint_terms.cpp +++ b/lib/coek/coek/ast/constraint_terms.cpp @@ -1,6 +1,5 @@ -#include "constraint_terms.hpp" - #include "base_terms.hpp" +#include "constraint_terms.hpp" namespace coek { diff --git a/lib/coek/coek/ast/constraint_terms.hpp b/lib/coek/coek/ast/constraint_terms.hpp index 1d9fb588..6f1beab9 100644 --- a/lib/coek/coek/ast/constraint_terms.hpp +++ b/lib/coek/coek/ast/constraint_terms.hpp @@ -1,7 +1,6 @@ #pragma once #include - #include "base_terms.hpp" namespace coek { diff --git a/lib/coek/coek/autograd/cppad_repn.cpp b/lib/coek/coek/autograd/cppad_repn.cpp index d735326d..004cce4c 100644 --- a/lib/coek/coek/autograd/cppad_repn.cpp +++ b/lib/coek/coek/autograd/cppad_repn.cpp @@ -1,5 +1,6 @@ #include +#include "../ast/base_terms.hpp" #include "../ast/constraint_terms.hpp" #include "../ast/expr_terms.hpp" #include "../ast/value_terms.hpp" diff --git a/lib/coek/coek/model/writer_nl.cpp b/lib/coek/coek/model/writer_nl.cpp index 750ac938..5e41e180 100644 --- a/lib/coek/coek/model/writer_nl.cpp +++ b/lib/coek/coek/model/writer_nl.cpp @@ -14,6 +14,7 @@ # include #endif +#include "../ast/base_terms.hpp" #include "../ast/constraint_terms.hpp" #include "../ast/expr_terms.hpp" #include "../ast/value_terms.hpp"